[+]: fixes found by the project itself

Author: voku

src/voku/SimplePhpParser/Model/PHPClass.php

@@ -64,10 +64,7 @@ public function readObjectFromPhpNode($node, $dummy = null): self
 
         $docComment = $node->getDocComment();
         if ($docComment) {
-            $propertiesPhp = $this->readPhpDocProperties($docComment->getText());
-            foreach ($propertiesPhp as $propertyPhp) {
-                $this->properties[$propertyPhp->name] = $propertyPhp;
-            }
+            $this->readPhpDocProperties($docComment->getText());
         }
 
         foreach ($node->getProperties() as $property) {
@@ -284,13 +281,13 @@ public function getMethodsInfo(
     /**
      * @param string $docComment
      *
-     * @return PHPProperty[]
+     * @return void
      */
-    private function readPhpDocProperties(string $docComment): array
+    private function readPhpDocProperties(string $docComment): void
     {
-        // init
-        /** @var PHPProperty[] $classPhpDocProperties */
-        $classPhpDocProperties = [];
+        if ($docComment === '') {
+            return;
+        }
 
         try {
             $phpDoc = Utils::createDocBlockInstance()->create($docComment);
@@ -345,15 +342,13 @@ private function readPhpDocProperties(string $docComment): array
                             $propertyPhp->typeFromPhpDocPslam = (string) @\Psalm\Type::parseString($propertyPhp->typeFromPhpDoc);
                         }
 
-                        $classPhpDocProperties[$propertyPhp->name] = $propertyPhp;
+                        $this->properties[$propertyPhp->name] = $propertyPhp;
                     }
                 }
             }
         } catch (\Exception $e) {
             $tmpErrorMessage = $this->name . ':' . ($this->line ?? '') . ' | ' . \print_r($e->getMessage(), true);
             $this->parseError[\md5($tmpErrorMessage)] = $tmpErrorMessage;
         }
-
-        return $classPhpDocProperties;
     }
 }

src/voku/SimplePhpParser/Model/PHPFunction.php

@@ -195,6 +195,10 @@ protected function readObjectFromBetterReflectionReturnHelper($function): ?strin
 
     protected function readPhpDoc(string $docComment): void
     {
+        if ($docComment === '') {
+            return;
+        }
+
         try {
             $phpDoc = Utils::createDocBlockInstance()->create($docComment);
 

src/voku/SimplePhpParser/Model/PHPParameter.php

@@ -230,6 +230,10 @@ private function readObjectFromBetterReflectionParamHelper($parameter): ?string
 
     private function readPhpDoc(string $docComment, string $parameterName): void
     {
+        if ($docComment === '') {
+            return;
+        }
+
         try {
             $phpDoc = Utils::createDocBlockInstance()->create($docComment);
 

src/voku/SimplePhpParser/Model/PHPProperty.php

@@ -235,6 +235,10 @@ private function readObjectFromBetterReflectionVarHelper(ReflectionProperty $pro
 
     private function readPhpDoc(string $docComment): void
     {
+        if ($docComment === '') {
+            return;
+        }
+
         try {
             $phpDoc = Utils::createDocBlockInstance()->create($docComment);
 

src/voku/SimplePhpParser/Parsers/Helper/Utils.php

@@ -26,7 +26,9 @@ public static function flattenArray(array $arr, bool $group): array
     /**
      * @param \phpDocumentor\Reflection\DocBlock\Tags\BaseTag $parsedParamTag
      *
-     * @return array{parsedParamTagStr: string, variableName: null|string}
+     * @return array
+     *
+     * @paalm-return array{parsedParamTagStr: string, variableName: null|string}
      */
     public static function splitTypeAndVariable(
         \phpDocumentor\Reflection\DocBlock\Tags\BaseTag $parsedParamTag

src/voku/SimplePhpParser/Parsers/PhpCodeChecker.php

@@ -28,7 +28,7 @@ public static function checkFromString(
      * @param string[] $access
      * @param bool     $skipDeprecatedMethods
      * @param bool     $skipFunctionsWithLeadingUnderscore
-     * @pram string[]  $composerAutoloaderProjectPaths
+     * @param string[] $composerAutoloaderProjectPaths
      *
      * @return string[][]
      */
@@ -40,7 +40,10 @@ public static function checkPhpFiles(
         bool $skipFunctionsWithLeadingUnderscore = false,
         array $composerAutoloaderProjectPaths = []
     ): array {
-        $phpInfo = PhpCodeParser::getPhpFiles($path, $composerAutoloaderProjectPaths);
+        $phpInfo = PhpCodeParser::getPhpFiles(
+            $path,
+            $composerAutoloaderProjectPaths
+        );
 
         $errors = $phpInfo->getParseErrors();
 

src/voku/SimplePhpParser/Parsers/PhpCodeParser.php

@@ -84,8 +84,25 @@ public static function getPhpFiles(
             $interface->parentInterfaces = $visitor->combineParentInterfaces($interface);
         }
 
+        $pathTmp = null;
+        if (\is_file($pathOrCode)) {
+            $pathTmp = \realpath(\pathinfo($pathOrCode, \PATHINFO_DIRNAME));
+        } elseif (\is_dir($pathOrCode)) {
+            $pathTmp = \realpath($pathOrCode);
+        }
+
         $classes = $parserContainer->getClasses();
         foreach ($classes as &$class) {
+
+            // remove methods from outside of the current file-path-scope
+            if ($pathTmp) {
+                foreach ($class->methods as $methodKey => $method) {
+                    if (strpos($method->file, $pathTmp) === false) {
+                        unset($class->methods[$methodKey]);
+                    }
+                }
+            }
+
             $class->interfaces = Utils::flattenArray(
                 $visitor->combineImplementedInterfaces($class),
                 false
@@ -190,7 +207,9 @@ public static function process(
      * @param string $fileName
      * @param Cache  $cache
      *
-     * @return array{content: string, fileName: string, cacheKey: string}
+     * @return array
+     *
+     * @psalm-return array{content: string, fileName: string, cacheKey: string}
      *
      * @internal
      */