Merge pull request #499 from canvural/patch-2

Always infer return type of id property on models

src/Properties/ModelPropertyExtension.php

@@ -12,6 +12,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Type\IntegerType;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RegexIterator;
@@ -58,6 +59,10 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             $this->initializeTables();
         }
 
+        if ($propertyName === 'id') {
+            return true;
+        }
+
         /** @var Model $modelInstance */
         $modelInstance = $classReflection->getNativeReflection()->newInstance();
         $tableName = $modelInstance->getTable();
@@ -70,22 +75,32 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             return false;
         }
 
+        $this->castPropertiesType($modelInstance);
+
         $column = $this->tables[$tableName]->columns[$propertyName];
 
         [$readableType, $writableType] = $this->getReadableAndWritableTypes($column, $modelInstance);
 
-        $this->castPropertiesType($modelInstance);
-
         $column->readableType = $readableType;
         $column->writeableType = $writableType;
 
+        $this->tables[$tableName]->columns[$propertyName] = $column;
+
         return true;
     }
 
     public function getProperty(
         ClassReflection $classReflection,
         string $propertyName
     ): PropertyReflection {
+        if ($propertyName === 'id') {
+            return new ModelProperty(
+                $classReflection,
+                new IntegerType(),
+                new IntegerType()
+            );
+        }
+
         /** @var Model $modelInstance */
         $modelInstance = $classReflection->getNativeReflection()->newInstance();
         $tableName = $modelInstance->getTable();