Merge pull request #169 from franmomu/use_psalm_3

Use psalm errorLevel 3

lib/Doctrine/Persistence/AbstractManagerRegistry.php

@@ -162,13 +162,9 @@ public function getManager($name = null)
      */
     public function getManagerForClass($class)
     {
-        // Check for namespace alias
-        if (strpos($class, ':') !== false) {
-            [$namespaceAlias, $simpleClassName] = explode(':', $class, 2);
-            $class                              = $this->getAliasNamespace($namespaceAlias) . '\\' . $simpleClassName;
-        }
+        $className = $this->getRealClassName($class);
 
-        $proxyClass = new ReflectionClass($class);
+        $proxyClass = new ReflectionClass($className);
 
         if ($proxyClass->implementsInterface($this->proxyInterfaceName)) {
             $parentClass = $proxyClass->getParentClass();
@@ -177,13 +173,13 @@ public function getManagerForClass($class)
                 return null;
             }
 
-            $class = $parentClass->getName();
+            $className = $parentClass->getName();
         }
 
         foreach ($this->managers as $id) {
             $manager = $this->getService($id);
 
-            if (! $manager->getMetadataFactory()->isTransient($class)) {
+            if (! $manager->getMetadataFactory()->isTransient($className)) {
                 return $manager;
             }
         }
@@ -250,4 +246,21 @@ private function selectManager(string $persistentObjectName, ?string $persistent
 
         return $this->getManagerForClass($persistentObjectName) ?? $this->getManager();
     }
+
+    /**
+     * @psalm-return class-string
+     */
+    private function getRealClassName(string $classNameOrAlias): string
+    {
+        // Check for namespace alias
+        if (strpos($classNameOrAlias, ':') !== false) {
+            [$namespaceAlias, $simpleClassName] = explode(':', $classNameOrAlias, 2);
+
+            /** @psalm-var class-string */
+            return $this->getAliasNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        }
+
+        /** @psalm-var class-string */
+        return $classNameOrAlias;
+    }
 }

lib/Doctrine/Persistence/Mapping/AbstractClassMetadataFactory.php

@@ -17,6 +17,7 @@
 use function array_map;
 use function array_reverse;
 use function array_unshift;
+use function assert;
 use function explode;
 use function sprintf;
 use function str_replace;
@@ -225,6 +226,7 @@ public function getMetadataFor($className)
 
             $realClassName = $this->getFqcnFromAlias($namespaceAlias, $simpleClassName);
         } else {
+            /** @psalm-var class-string $className */
             $realClassName = $this->getRealClass($className);
         }
 
@@ -449,6 +451,7 @@ public function isTransient($class)
             $class                              = $this->getFqcnFromAlias($namespaceAlias, $simpleClassName);
         }
 
+        /** @psalm-var class-string $class */
         return $this->getDriver()->isTransient($class);
     }
 
@@ -496,6 +499,8 @@ private function getRealClass(string $class): string
             $this->createDefaultProxyClassNameResolver();
         }
 
+        assert($this->proxyClassNameResolver !== null);
+
         return $this->proxyClassNameResolver->resolveClassName($class);
     }
 

lib/Doctrine/Persistence/Mapping/Driver/AnnotationDriver.php

@@ -170,9 +170,7 @@ public function setFileExtension($fileExtension)
      * A class is non-transient if it is annotated with an annotation
      * from the {@see AnnotationDriver::entityAnnotationClasses}.
      *
-     * @param string $className
-     *
-     * @return bool
+     * {@inheritDoc}
      */
     public function isTransient($className)
     {

lib/Doctrine/Persistence/Mapping/Driver/SymfonyFileLocator.php

@@ -227,6 +227,6 @@ public function findMappingFile($className)
             }
         }
 
-        throw MappingException::mappingFileNotFound($className, substr($className, strrpos($className, '\\') + 1) . $this->fileExtension);
+        throw MappingException::mappingFileNotFound($className, substr($className, (int) strrpos($className, '\\') + 1) . $this->fileExtension);
     }
 }

lib/Doctrine/Persistence/Mapping/MappingException.php

@@ -50,7 +50,7 @@ public static function fileMappingDriversRequireConfiguredDirectoryPath($path =
         return new self(sprintf(
             'File mapping drivers must have a valid directory path, ' .
             'however the given path %s seems to be incorrect!',
-            $path
+            (string) $path
         ));
     }
 

lib/Doctrine/Persistence/Mapping/RuntimeReflectionService.php

@@ -61,7 +61,10 @@ public function getClassNamespace($class)
     }
 
     /**
-     * {@inheritDoc}
+     * @param string $class
+     * @psalm-param class-string $class
+     *
+     * @return ReflectionClass
      */
     public function getClass($class)
     {

lib/Doctrine/Persistence/Mapping/StaticReflectionService.php

@@ -25,8 +25,10 @@ public function getParentClasses($class)
      */
     public function getClassShortName($className)
     {
-        if (strpos($className, '\\') !== false) {
-            $className = substr($className, strrpos($className, '\\') + 1);
+        $nsSeparatorLastPosition = strrpos($className, '\\');
+
+        if ($nsSeparatorLastPosition !== false) {
+            $className = substr($className, $nsSeparatorLastPosition + 1);
         }
 
         return $className;
@@ -39,7 +41,7 @@ public function getClassNamespace($className)
     {
         $namespace = '';
         if (strpos($className, '\\') !== false) {
-            $namespace = strrev(substr(strrev($className), strpos(strrev($className), '\\') + 1));
+            $namespace = strrev(substr(strrev($className), (int) strpos(strrev($className), '\\') + 1));
         }
 
         return $namespace;

lib/Doctrine/Persistence/Reflection/TypedNoDefaultReflectionProperty.php

@@ -2,8 +2,11 @@
 
 namespace Doctrine\Persistence\Reflection;
 
+use Closure;
 use ReflectionProperty;
 
+use function assert;
+
 /**
  * PHP Typed No Default Reflection Property - special override for typed properties without a default value.
  */
@@ -38,6 +41,9 @@ public function setValue($object, $value = null)
                 unset($this->$propertyName);
             };
             $unsetter = $unsetter->bindTo($object, $this->getDeclaringClass()->getName());
+
+            assert($unsetter instanceof Closure);
+
             $unsetter();
 
             return;

psalm.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
-    errorLevel="4"
-    resolveFromConfigFile="true"
+    errorLevel="3"
+    findUnusedPsalmSuppress="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"
@@ -39,5 +38,17 @@
                 <file name="tests/Doctrine/Tests/Persistence/Mapping/SymfonyFileLocatorTest.php"/>
             </errorLevel>
         </NullArgument>
+        <ArgumentTypeCoercion>
+            <errorLevel type="suppress">
+                <!-- On purpose to use a non existing class for tests -->
+                <file name="tests/Doctrine/Tests/Persistence/Mapping/RuntimeReflectionServiceTest.php"/>
+            </errorLevel>
+        </ArgumentTypeCoercion>
+        <MoreSpecificReturnType>
+            <errorLevel type="suppress">
+                <!-- FileDriver::loadMappingFile() in tests could have a more specific return, but is not needed -->
+                <file name="tests/Doctrine/Tests/Persistence/Mapping/FileDriverTest.php"/>
+            </errorLevel>
+        </MoreSpecificReturnType>
     </issueHandlers>
 </psalm>

tests/Doctrine/Tests/Persistence/ObjectManagerDecoratorTest.php

@@ -22,7 +22,7 @@ public function __construct(ObjectManager $wrapped)
 
 class ObjectManagerDecoratorTest extends TestCase
 {
-    /** @var MockObject|ObjectManager */
+    /** @var MockObject&ObjectManager */
     private $wrapped;
 
     /** @var NullObjectManagerDecorator */