feat: use type from annotation if exists instead of extension

larastan · Apr 12, 2020 · ec22906 · ec22906
1 parent a3e1fc8
commit ec22906
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/Properties/ModelPropertyExtension.php b/src/Properties/ModelPropertyExtension.php
@@ -9,6 +9,7 @@
 use Iterator;
 use PHPStan\Parser\CachedParser;
 use PHPStan\PhpDoc\TypeStringResolver;
+use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
@@ -35,10 +36,14 @@ final class ModelPropertyExtension implements PropertiesClassReflectionExtension
     /** @var string */
     private $dateClass;
 
-    public function __construct(CachedParser $parser, TypeStringResolver $stringResolver)
+    /** @var AnnotationsPropertiesClassReflectionExtension */
+    private $annotationExtension;
+
+    public function __construct(CachedParser $parser, TypeStringResolver $stringResolver, AnnotationsPropertiesClassReflectionExtension $annotationExtension)
     {
         $this->parser = $parser;
         $this->stringResolver = $stringResolver;
+        $this->annotationExtension = $annotationExtension;
     }
 
     public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
@@ -55,6 +60,10 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             return false;
         }
 
+        if ($this->annotationExtension->hasProperty($classReflection, $propertyName)) {
+            return false;
+        }
+
         if (count($this->tables) === 0) {
             $this->initializeTables();
         }

diff --git a/src/Properties/ModelRelationsExtension.php b/src/Properties/ModelRelationsExtension.php
@@ -10,6 +10,8 @@
 use Illuminate\Support\Str;
 use NunoMaduro\Larastan\Concerns;
 use NunoMaduro\Larastan\Types\RelationParserHelper;
+use PHPStan\Analyser\OutOfClassScope;
+use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
 use PHPStan\Reflection\BrokerAwareExtension;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\Dummy\DummyPropertyReflection;
@@ -33,9 +35,13 @@ final class ModelRelationsExtension implements PropertiesClassReflectionExtensio
     /** @var RelationParserHelper */
     private $relationParserHelper;
 
-    public function __construct(RelationParserHelper $relationParserHelper)
+    /** @var AnnotationsPropertiesClassReflectionExtension */
+    private $annotationExtension;
+
+    public function __construct(RelationParserHelper $relationParserHelper, AnnotationsPropertiesClassReflectionExtension $annotationExtension)
     {
         $this->relationParserHelper = $relationParserHelper;
+        $this->annotationExtension = $annotationExtension;
     }
 
     public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
@@ -44,6 +50,10 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             return false;
         }
 
+        if ($this->annotationExtension->hasProperty($classReflection, $propertyName)) {
+            return false;
+        }
+
         return $classReflection->hasNativeMethod($propertyName);
     }
 

diff --git a/tests/Features/Properties/ModelRelationsExtension.php b/tests/Features/Properties/ModelRelationsExtension.php
@@ -86,6 +86,11 @@ public function testModelWithRelationDefinedInTrait(Account $account): ?User
     {
         return $account->ownerRelation;
     }
+
+    public function testRelationCanbeOverridenWithAnnotation(OtherDummyModel $dummyModel): DummyModel
+    {
+        return $dummyModel->belongsToRelation;
+    }
 }
 
 class DummyModel extends Model
@@ -107,6 +112,9 @@ public function relationWithoutReturnType()
     }
 }
 
+/**
+ * @property DummyModel $belongsToRelation
+ */
 class OtherDummyModel extends Model
 {
     public function belongsToRelation(): BelongsTo