Corrected or baselined static analysis issues caused by #58 `@interna…

…l` addition or deletions

Signed-Off-By: Marco Pivetta <[email protected]>

psalm.xml

@@ -15,15 +15,32 @@
     </projectFiles>
 
     <issueHandlers>
+        <InternalClass>
+            <errorLevel type="suppress">
+                <!-- the scanner internal component can be used by package internals -->
+                <referencedClass name="Laminas\Code\Generic\Prototype\PrototypeClassFactory"/>
+                <referencedClass name="Laminas\Code\Scanner\DocBlockScanner"/>
+            </errorLevel>
+        </InternalClass>
+
         <InternalMethod>
             <errorLevel type="suppress">
                 <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::method"/>
+                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
+                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
             </errorLevel>
+
+            <!-- the scanner internal component can be used by package internals -->
             <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
+                <referencedMethod name="Laminas\Code\Generic\Prototype\PrototypeClassFactory::addPrototype"/>
+                <referencedMethod name="Laminas\Code\Generic\Prototype\PrototypeClassFactory::getClonedPrototype"/>
+                <referencedMethod name="Laminas\Code\Generic\Prototype\PrototypeClassFactory::setGenericPrototype"/>
+                <referencedMethod name="Laminas\Code\Generic\Prototype\PrototypeInterface::getName"/>
+                <referencedMethod name="Laminas\Code\Scanner\DocBlockScanner::getLongDescription"/>
+                <referencedMethod name="Laminas\Code\Scanner\DocBlockScanner::getShortDescription"/>
+                <referencedMethod name="Laminas\Code\Scanner\DocBlockScanner::getTags"/>
             </errorLevel>
             <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
             </errorLevel>
         </InternalMethod>
     </issueHandlers>

src/Generator/DocBlockGenerator.php

@@ -49,7 +49,7 @@ class DocBlockGenerator extends AbstractGenerator
     protected $wordwrap = true;
 
     /**
-     * @var TagManager
+     * @var TagManager|null
      */
     protected static $tagManager;
 

src/Generic/Prototype/PrototypeClassFactory.php

@@ -33,7 +33,7 @@ class PrototypeClassFactory
     protected $prototypes = [];
 
     /**
-     * @var PrototypeGenericInterface
+     * @var PrototypeGenericInterface|null
      */
     protected $genericPrototype;
 

src/Reflection/ClassReflection.php

@@ -8,7 +8,6 @@
 
 namespace Laminas\Code\Reflection;
 
-use Laminas\Code\Scanner\FileScanner;
 use ReflectionClass;
 
 use function array_shift;
@@ -23,7 +22,7 @@ class ClassReflection extends ReflectionClass implements ReflectionInterface
 {
 
     /**
-     * @var DocBlockReflection
+     * @var DocBlockReflection|null
      */
     protected $docBlock;
 
@@ -225,19 +224,4 @@ public function __toString()
     {
         return parent::__toString();
     }
-
-    /**
-     * Creates a new FileScanner instance.
-     *
-     * By having this as a separate method it allows the method to be overridden
-     * if a different FileScanner is needed.
-     *
-     * @param  string $filename
-     *
-     * @return FileScanner
-     */
-    protected function createFileScanner($filename)
-    {
-        return new FileScanner($filename);
-    }
 }

src/Reflection/MethodReflection.php

@@ -8,7 +8,6 @@
 
 namespace Laminas\Code\Reflection;
 
-use Laminas\Code\Scanner\CachingFileScanner;
 use ReflectionMethod as PhpReflectionMethod;
 
 use function array_shift;
@@ -459,19 +458,4 @@ public function __toString()
     {
         return parent::__toString();
     }
-
-    /**
-     * Creates a new FileScanner instance.
-     *
-     * By having this as a separate method it allows the method to be overridden
-     * if a different FileScanner is needed.
-     *
-     * @param  string $filename
-     *
-     * @return CachingFileScanner
-     */
-    protected function createFileScanner($filename)
-    {
-        return new CachingFileScanner($filename);
-    }
 }

src/Reflection/PropertyReflection.php

@@ -8,7 +8,6 @@
 
 namespace Laminas\Code\Reflection;
 
-use Laminas\Code\Scanner\CachingFileScanner;
 use ReflectionProperty as PhpReflectionProperty;
 
 /**
@@ -61,19 +60,4 @@ public function toString()
     {
         return $this->__toString();
     }
-
-    /**
-     * Creates a new FileScanner instance.
-     *
-     * By having this as a separate method it allows the method to be overridden
-     * if a different FileScanner is needed.
-     *
-     * @param  string $filename
-     *
-     * @return CachingFileScanner
-     */
-    protected function createFileScanner($filename)
-    {
-        return new CachingFileScanner($filename);
-    }
 }

test/Reflection/MethodReflectionTest.php

@@ -12,7 +12,6 @@
 use Laminas\Code\Reflection\MethodReflection;
 use Laminas\Code\Reflection\ParameterReflection;
 use Laminas\Code\Scanner\CachingFileScanner;
-use LaminasTest\Code\Reflection\TestAsset\InjectableMethodReflection;
 use PHPUnit\Framework\TestCase;
 
 use function array_shift;

test/Reflection/PropertyReflectionTest.php

@@ -11,7 +11,6 @@
 use Laminas\Code\Reflection\ClassReflection;
 use Laminas\Code\Reflection\PropertyReflection;
 use Laminas\Code\Scanner\CachingFileScanner;
-use LaminasTest\Code\Reflection\TestAsset\InjectablePropertyReflection;
 use PHPUnit\Framework\TestCase;
 
 use function get_class;