Merge pull request #5 from orklah/misc-improvements

Misc code improvements

Author: voku

psalm.xml

@@ -3,8 +3,8 @@
     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"
-    totallyTyped="false"
-    allowPhpStormGenerics="true"
+    totallyTyped="true"
+    errorLevel="1"
 >
     <projectFiles>
         <directory name="src" />
@@ -14,14 +14,8 @@
     </projectFiles>
 
     <issueHandlers>
-        <InternalClass errorLevel="suppress" />
         <MoreSpecificReturnType errorLevel="suppress" />
         <LessSpecificReturnStatement errorLevel="suppress" />
-        <MoreSpecificImplementedParamType errorLevel="suppress" />
-        <UnresolvableInclude errorLevel="suppress" />
-        <ParamNameMismatch errorLevel="suppress" />
-        <ForbiddenCode errorLevel="suppress" />
-        <RedundantCondition errorLevel="suppress" />
     </issueHandlers>
 
 </psalm>

src/voku/PhpDocFixer/CliCommand/PhpDocFixerCommand.php

@@ -68,7 +68,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
             if ($phpStormStubsInfo[$functionName_or_classAndMethodName] !== $types) {
                 $errors[$functionName_or_classAndMethodName] = [
                     'phpStubTypes' => $phpStormStubsInfo[$functionName_or_classAndMethodName],
-                    'phpDocTypes' => $types,
+                    'phpDocTypes'  => $types,
                 ];
             }
         }

src/voku/PhpDocFixer/ReadPhpStormStubs/PhpStormStubsReader.php

@@ -33,10 +33,11 @@ public function parse(): array
 
         foreach ($phpCode->getClasses() as $class) {
             $methodInfo = $class->getMethodsInfo();
+            $className = (string) $class->name;
             foreach ($methodInfo as $methodName => $info) {
-                $return[$class->name . '::' . $methodName]['return'] = \ltrim($info['returnTypes']['typeFromPhpDocSimple'] ?? '', '\\');
+                $return[$className . '::' . $methodName]['return'] = \ltrim($info['returnTypes']['typeFromPhpDocSimple'] ?? '', '\\');
                 foreach ($info['paramsTypes'] as $paramName => $paramTypes) {
-                    $return[$class->name . '::' . $methodName]['params'][$paramName] = \ltrim($paramTypes['typeFromPhpDocSimple'] ?? '', '\\');
+                    $return[$className . '::' . $methodName]['params'][$paramName] = \ltrim($paramTypes['typeFromPhpDocSimple'] ?? '', '\\');
                 }
             }
         }

src/voku/PhpDocFixer/ReadXmlDocs/XmlReader.php

@@ -27,6 +27,7 @@ public function parse(): array
         $finder->files()->in($this->xml_path);
 
         $data = [[]];
+        /** @var \Symfony\Component\Finder\SplFileInfo $file */
         foreach ($finder as $file) {
             if (\strpos($file->getFilename(), '.xml') === false) {
                 continue;
@@ -52,7 +53,7 @@ public function parse(): array
             }
         }
 
-        return \array_merge([], ...$data);
+        return \array_merge(...$data);
     }
 
     /**

tests/CheckerTest.php

@@ -9,7 +9,7 @@
  */
 final class CheckerTest extends \PHPUnit\Framework\TestCase
 {
-    public static function testPhpStormStubsReader()
+    public static function testPhpStormStubsReader(): void
     {
         $phpStormStubsPath = __DIR__ . '/../vendor/jetbrains/phpstorm-stubs/mbstring/';
         $phpTypesFromPhpStormStubs = new \voku\PhpDocFixer\ReadPhpStormStubs\PhpStormStubsReader($phpStormStubsPath);