Merge pull request #5 from MyOnlineStore/kernel-name

Author: Fred-Jan van der Eijken

composer.json

@@ -29,7 +29,8 @@
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^8.5",
+        "vimeo/psalm": "^4.13"
     },
     "autoload": {
         "psr-4": {

psalm.xml.dist

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <ParamNameMismatch errorLevel="info"/>
+    </issueHandlers>
+</psalm>

src/Decoda/Decoda.php

@@ -201,7 +201,7 @@ public function hasFilter($id)
      *
      * @param string $id
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      *
      * @return \Decoda\Filter[]
      */
@@ -264,7 +264,7 @@ public function hasHook($id)
      *
      * @param string $id
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      *
      * @return \Decoda\Hook[]
      */

src/Decoda/DecodaManager.php

@@ -461,7 +461,7 @@ private function set($filterSet, Decoda $decoda = null)
     /**
      * Gets a DecodaPhpEngine.
      *
-     * @return DecodaPhpEngine
+     * @return PhpEngine
      */
     private function getPhpEngine()
     {

src/DependencyInjection/FMBbcodeExtension.php

@@ -30,13 +30,13 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('filters.xml');
         $loader->load('hooks.xml');
 
-        $hooksConfig = isset($config['config']['hooks']) ? $config['config']['hooks'] : array();
+        $hooksConfig = $config['config']['hooks'] ?? [];
         $hooks       = array();
         foreach ($hooksConfig as $hook) {
             $hooks[$hook['classname']] = $hook['class'];
         }
 
-        $filtersConfig = isset($config['config']['filters']) ? $config['config']['filters'] : array();
+        $filtersConfig = $config['config']['filters'] ?? [];
         $filters       = array();
         foreach ($filtersConfig as $filter) {
             $filters[$filter['classname']] = $filter['class'];
@@ -45,8 +45,8 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('fm_bbcode.filter_sets', $config['filter_sets']);
         $container->setParameter('fm_bbcode.config.filters', $filters);
         $container->setParameter('fm_bbcode.config.hooks', $hooks);
-        $container->setParameter('fm_bbcode.config.messages', isset($config['config']['messages']) ? $config['config']['messages'] : null);
-        $container->setParameter('fm_bbcode.config.templates', isset($config['config']['templates']) ? $config['config']['templates'] : array());
+        $container->setParameter('fm_bbcode.config.messages', $config['config']['messages'] ?? null);
+        $container->setParameter('fm_bbcode.config.templates', $config['config']['templates'] ?? []);
 
         if (isset($config['emoticon'])) {
             $this->registerEmoticonConfiguration($config['emoticon'], $container, $loader);
@@ -62,7 +62,7 @@ public function load(array $configs, ContainerBuilder $container)
      */
     private function registerEmoticonConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
-        $container->setParameter('fm_bbcode.emoticon.cache_class_prefix', $container->getParameter('kernel.name').ucfirst($container->getParameter('kernel.environment')));
+        $container->setParameter('fm_bbcode.emoticon.cache_class_prefix', $container->getParameter('kernel.container_class').ucfirst($container->getParameter('kernel.environment')));
         $container->setParameter('fm_bbcode.emoticon.folder', $config['folder']);
 
         $hook     = $container->findDefinition('fm_bbcode.decoda.hook.emoticon');

src/Emoticon/EmoticonCollection.php

@@ -103,7 +103,7 @@ public function has($name)
      *
      * @param string $name The emoticon name
      *
-     * @return Emoticons|null A Emoticons instance or null when not found
+     * @return Emoticon|null A Emoticons instance or null when not found
      */
     public function get($name)
     {