[+]: fixes found by the project itself v2

Author: voku

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.8.0 (2020-06-16)
+
+- replace PhpReflection with BetterReflection v2
+- fix bugs reported by PhpStan & PhpCodeCheck
+
 ### 0.7.0 (2020-06-02)
 
 - replace PhpReflection with BetterReflection

README.md

@@ -1,5 +1,4 @@
 [![Build Status](https://travis-ci.com/voku/Simple-PHP-Code-Parser.svg?branch=master)](https://travis-ci.com/voku/Simple-PHP-Code-Parser)
-[![Coverage Status](https://coveralls.io/repos/github/voku/Simple-PHP-Code-Parser/badge.svg?branch=master)](https://coveralls.io/github/voku/Simple-PHP-Code-Parser?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2feaf2a179a24a5fac99cbf67e72df2f)](https://www.codacy.com/manual/voku/Simple-PHP-Code-Parser?utm_source=github.com&utm_medium=referral&utm_content=voku/Simple-PHP-Code-Parser&utm_campaign=Badge_Grade)
 [![Latest Stable Version](https://poser.pugx.org/voku/Simple-PHP-Code-Parser/v/stable)](https://packagist.org/packages/voku/simple-php-code-parser) 
 [![Total Downloads](https://poser.pugx.org/voku/simple-php-code-parser/downloads)](https://packagist.org/packages/voku/simple-php-code-parser) 
@@ -21,8 +20,10 @@ This code is forked from [JetBrains/phpstorm-stubs](https://github.com/JetBrains
 because they are in a test namespace and the autoloader is "autoload-dev", so here is a extended version with support for [ondrejmirtes/BetterReflection](https://github.com/ondrejmirtes/BetterReflection).
 
 We will use:
-- "BetterReflection" AND "PHP-Parser"
-- "phpDocumentor" AND "psalm" for phpdocs
+- "PHP-Parser"
+- "BetterReflection"
+- "phpDocumentor"
+- "psalm" (*currently only for phpdocs*)
 
 ### Install via "composer require"
 

composer.json

@@ -26,7 +26,7 @@
         "phpdocumentor/reflection-common": "~2.1",
         "voku/simple-cache": "~4.0",
         "nikic/php-parser": "~4.4",
-        "ondrejmirtes/better-reflection": "~4.2",
+        "ondrejmirtes/better-reflection": "~4.3",
         "vimeo/psalm": "~3.11"
     },
     "require-dev": {

src/voku/SimplePhpParser/CliCommand/PhpCodeCheckerCommand.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 final class PhpCodeCheckerCommand extends Command
@@ -44,6 +45,41 @@ public function configure(): void
                         new InputArgument('autoload-file', InputArgument::OPTIONAL, 'The path to your autoloader'),
                     ]
                 )
+            )
+            ->addOption(
+                'access',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Check for "public|protected|private" methods.',
+                'public|protected|private'
+            )
+            ->addOption(
+                'skip-mixed-types-as-error',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Skip check for mixed types. (false or true)',
+                'false'
+            )
+            ->addOption(
+                'skip-deprecated-functions',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Skip check for deprecated functions / methods. (false or true)',
+                'false'
+            )
+            ->addOption(
+                'skip-functions-with-leading-underscore',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Skip check for functions / methods with leading underscore. (false or true)',
+                'false'
+            )
+            ->addOption(
+                'skip-parse-errors',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Skip parse errors in the output. (false or true)',
+                'true'
             );
     }
 
@@ -63,6 +99,15 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $this->composerAutoloaderProjectPaths[] = $autoloadRealPath;
         }
 
+        $access = $input->getOption('access');
+        \assert(\is_string($access));
+        $access = (array) \explode('|', $access);
+
+        $skipMixedTypesAsError = (bool) $input->getOption('skip-mixed-types-as-error');
+        $skipDeprecatedFunctions = (bool) $input->getOption('skip-deprecated-functions');
+        $skipFunctionsWithLeadingUnderscore = (bool) $input->getOption('skip-functions-with-leading-underscore');
+        $skipParseErrorsAsError = (bool) $input->getOption('skip-parse-errors');
+
         $formatter = $output->getFormatter();
         $formatter->setStyle('file', new OutputFormatterStyle('default', null, ['bold']));
         $formatter->setStyle('error', new OutputFormatterStyle('red', null, []));
@@ -73,22 +118,22 @@ public function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln(\str_repeat('=', \strlen($banner)));
         $output->writeln('');
 
-        $access = ['public', 'protected', 'private'];
-        $skipMixedTypesAsError = false;
-        $skipDeprecatedMethods = false;
-        $skipFunctionsWithLeadingUnderscore = false;
-
         $errors = \voku\SimplePhpParser\Parsers\PhpCodeChecker::checkPhpFiles(
             $realPath,
             $access,
             $skipMixedTypesAsError,
-            $skipDeprecatedMethods,
+            $skipDeprecatedFunctions,
             $skipFunctionsWithLeadingUnderscore,
+            $skipParseErrorsAsError,
             $this->composerAutoloaderProjectPaths
         );
 
+        $errorCount = 0;
         foreach ($errors as $file => $errorsInner) {
-            $output->writeln('<file>' . $file . '</file>');
+            $errorCountFile = \count($errorsInner);
+            $errorCount += $errorCountFile;
+
+            $output->writeln('<file>' . $file . '</file>' . ' (' . $errorCountFile . ' errors)');
 
             foreach ($errorsInner as $errorInner) {
                 $output->writeln('<error>' . $errorInner . '</error>');
@@ -98,6 +143,10 @@ public function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('');
         }
 
+        $output->writeln('-------------------------------');
+        $output->writeln($errorCount . ' errors in ' . \count($errors) . ' files.');
+        $output->writeln('-------------------------------');
+
         return 0;
     }
 }

src/voku/SimplePhpParser/Model/BasePHPElement.php

@@ -57,8 +57,8 @@ public function __construct($parserContainer)
     abstract public function readObjectFromBetterReflection($object);
 
     /**
-     * @param NodeAbstract      $mixed_1
-     * @param NodeAbstract|null $mixed_2
+     * @param \PhpParser\NodeAbstract      $mixed_1
+     * @param \PhpParser\NodeAbstract|null $mixed_2
      *
      * @return $this
      */
@@ -85,7 +85,7 @@ protected function getConstantFQN(NodeAbstract $node, string $nodeName): string
      *
      * @psalm-suppress MoreSpecificReturnType or Less ?
      */
-    protected function getFQN($node): string
+    protected static function getFQN($node): string
     {
         // init
         $fqn = '';
@@ -110,7 +110,7 @@ protected function getFQN($node): string
     }
 
     /**
-     * @param Node $node
+     * @param \PhpParser\Node $node
      *
      * @return void
      */

src/voku/SimplePhpParser/Model/PHPClass.php

@@ -41,9 +41,10 @@ public function readObjectFromPhpNode($node, $dummy = null): self
     {
         $this->prepareNode($node);
 
-        $this->name = $this->getFQN($node);
+        $this->name = static::getFQN($node);
 
         /** @noinspection NotOptimalIfConditionsInspection */
+        /** @noinspection ArgumentEqualsDefaultValueInspection */
         if (\class_exists($this->name, true)) {
             $reflectionClass = ReflectionClass::createFromName($this->name);
             $this->readObjectFromBetterReflection($reflectionClass);
@@ -331,9 +332,7 @@ private function readPhpDocProperties(string $docComment): void
                         }
 
                         $typeTmp = Utils::parseDocTypeObject($type);
-                        if (\is_array($typeTmp) && \count($typeTmp) > 0) {
-                            $propertyPhp->typeFromPhpDocSimple = \implode('|', $typeTmp);
-                        } elseif (\is_string($typeTmp)) {
+                        if ($typeTmp !== '') {
                             $propertyPhp->typeFromPhpDocSimple = $typeTmp;
                         }
 

src/voku/SimplePhpParser/Model/PHPConst.php

@@ -51,7 +51,7 @@ public function readObjectFromPhpNode($node, $dummy = null): self
         $this->collectTags($node);
 
         if ($node->getAttribute('parent') instanceof ClassConst) {
-            $this->parentName = $this->getFQN($node->getAttribute('parent')->getAttribute('parent'));
+            $this->parentName = static::getFQN($node->getAttribute('parent')->getAttribute('parent'));
         }
 
         return $this;

src/voku/SimplePhpParser/Model/PHPDocElement.php

@@ -4,44 +4,43 @@
 
 namespace voku\SimplePhpParser\Model;
 
-use phpDocumentor\Reflection\DocBlock\Tag;
 use PhpParser\Node;
 use voku\SimplePhpParser\Parsers\Helper\DocFactoryProvider;
 
 trait PHPDocElement
 {
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $linkTags = [];
 
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $seeTags = [];
 
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $sinceTags = [];
 
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $deprecatedTags = [];
 
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $metaTags = [];
 
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $internalTags = [];
 
     /**
-     * @var Tag[]
+     * @var \phpDocumentor\Reflection\DocBlock\Tag[]
      */
     public $removedTags = [];
 
@@ -86,7 +85,7 @@ trait PHPDocElement
     public $hasRemovedTag = false;
 
     /**
-     * @param Node $node
+     * @param \PhpParser\Node $node
      *
      * @return void
      */