Merge pull request #17 from liip/look-in-parent-class-for-imports

Look for imports also in parent classes and traits

Author: Tobion

composer.json

@@ -19,11 +19,11 @@
         "psr/log": "^1"
     },
     "require-dev": {
-        "phpstan/phpstan-shim": "^0.11.0",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpunit/phpunit": "^7.5",
+        "friendsofphp/php-cs-fixer": "v2.14.1",
         "jms/serializer": "^1.13 || ^2",
-        "friendsofphp/php-cs-fixer": "v2.14.1"
+        "phpstan/phpstan": "^0.12.71",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpunit/phpunit": "^7.5"
     },
     "suggest": {
         "jms/serializer": "^1.13 || ^2"
@@ -41,8 +41,8 @@
     "scripts": {
         "fix-cs": "vendor/bin/php-cs-fixer fix -v",
         "cs-fixer": "vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format udiff -v",
-        "phpstan": "vendor/bin/phpstan analyse --no-progress --level 5 src/",
-        "phpstan-tests": "vendor/bin/phpstan analyse --no-progress --level 1 -c phpstan.tests.neon tests/",
+        "phpstan": "vendor/bin/phpstan analyse",
+        "phpstan-tests": "vendor/bin/phpstan analyse -c phpstan.tests.neon",
         "phpstan-all": [
             "@phpstan",
             "@phpstan-tests"

phpstan.neon

@@ -1,4 +1,7 @@
 parameters:
+    level: 5
+    paths:
+        - src/
     ignoreErrors:
         # Allow JMS parser version 1
         - '#has unknown class JMS\\Serializer\\TypeParser as its type#'

phpstan.tests.neon

@@ -1 +1,4 @@
-# empty file to not use config for src that has ignore statements
+parameters:
+    level: 1
+    paths:
+        - tests/

src/TypeParser/PhpTypeParser.php

@@ -71,7 +71,11 @@ public function parseAnnotationType(string $rawType, \ReflectionClass $reflClass
      */
     public function parseReflectionType(\ReflectionType $reflType): PropertyType
     {
-        return $this->createType($reflType->getName(), $reflType->allowsNull());
+        if ($reflType instanceof \ReflectionNamedType) {
+            return $this->createType($reflType->getName(), $reflType->allowsNull());
+        }
+
+        throw new InvalidTypeException(sprintf('No type information found, got %s but expected %s', \ReflectionType::class, \ReflectionNamedType::class));
     }
 
     private function createType(string $rawType, bool $nullable, \ReflectionClass $reflClass = null): PropertyType
@@ -118,9 +122,20 @@ private function resolveClass(string $className, \ReflectionClass $reflClass = n
         if (null !== $reflClass) {
             // resolve use statements of the class with the type information
             $lowerClassName = strtolower($className);
-            $imports = $this->useStatementsParser->parseClass($reflClass);
-            if (isset($imports[$lowerClassName])) {
-                return $imports[$lowerClassName];
+
+            $reflCurrentClass = $reflClass;
+            do {
+              $imports = $this->useStatementsParser->parseClass($reflCurrentClass);
+              if (isset($imports[$lowerClassName])) {
+                  return $imports[$lowerClassName];
+              }
+            } while (false !== ($reflCurrentClass = $reflCurrentClass->getParentClass()));
+
+            foreach ($reflClass->getTraits() as $reflTrait) {
+                $imports = $this->useStatementsParser->parseClass($reflTrait);
+                if (isset($imports[$lowerClassName])) {
+                    return $imports[$lowerClassName];
+                }
             }
 
             // the referenced class is expected to be in the same namespace

tests/ModelParser/JMSParserTest.php

@@ -953,6 +953,7 @@ public function testVirtualPropertyTypeExtendingPrimitive(): void
              */
             public function foo(): ?string
             {
+                return 'foo';
             }
         };
 
@@ -977,6 +978,7 @@ public function testVirtualPropertyTypeExtendingDateTime(): void
              */
             public function foo(): ?\DateTime
             {
+                return new \DateTime();
             }
         };
 

tests/TypeParser/PhpTypeParserTest.php

@@ -192,14 +192,17 @@ public function provideReflectionTypes(): iterable
         $c = new class() {
             private function method1(): string
             {
+                return '1';
             }
 
             private function method2(): ?int
             {
+                return 1;
             }
 
             private function method3(): array
             {
+                return [1];
             }
         };
         $reflClass = new \ReflectionClass(\get_class($c));