Added support for phpstan 0.12

Author: adaamz

.travis.yml

@@ -21,6 +21,7 @@ before_script:
 
 script:
  - ./vendor/bin/tester ./tests/test.php
+ - ./vendor/bin/phpstan analyse
 
 after_failure:
  # Print *.actual content & log content

composer.json

@@ -7,7 +7,7 @@
 ],
 "require": {
 "php": "~7.1",
-"phpstan/phpstan": "^0.11.9"
+"phpstan/phpstan": "^0.12"
 },
 "require-dev": {
 "nette/tester": "~2.0",

phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+ level: max
+ paths:
+ - src

src/Reflection/Annotations/AnnotationPropertyReflection.php

@@ -2,13 +2,13 @@
 
 namespace Nextras\OrmPhpStan\Reflection\Annotations;
 
+use PHPStan\Reflection\Annotations\AnnotationPropertyReflection as PHPStanAnnotationPropertyReflection;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ExtendedPropertyReflection;
+use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Type\Type;
 
 
-class AnnotationPropertyReflection extends \PHPStan\Reflection\Annotations\AnnotationPropertyReflection
-implements ExtendedPropertyReflection
+class AnnotationPropertyReflection extends PHPStanAnnotationPropertyReflection implements PropertyReflection
 {
 /** @var Type */
 private $writableType;

src/Reflection/EntityPropertyReflectionExtension.php

@@ -50,8 +50,8 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
 $property = $this->annotationsExtension->getProperty($classReflection, $propertyName);
 return new AnnotationPropertyReflection(
 $property->getDeclaringClass(),
-$property->getType(),
-TypeCombinator::union($property->getType(), new IntegerType()),
+$property->getReadableType(),
+TypeCombinator::union($property->getWritableType(), new IntegerType()),
 $property->isReadable(),
 $property->isWritable()
 );

src/Rules/SetValueMethodRule.php

@@ -8,12 +8,13 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\Broker;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\VerbosityLevel;
 
-
+/**
+ * @phpstan-implements Rule<MethodCall>
+ */
 class SetValueMethodRule implements Rule
 {
 /** @var Broker */
@@ -34,6 +35,8 @@ public function getNodeType(): string
 
 /**
  * @param MethodCall $node
+ *
+ * @return string[]
  */
 public function processNode(Node $node, Scope $scope): array
 {
@@ -74,11 +77,7 @@ public function processNode(Node $node, Scope $scope): array
 )];
 }
 $property = $class->getProperty($fieldName, $scope);
-if ($property instanceof ExtendedPropertyReflection) {
-$propertyType = $property->getWritableType();
-} else {
-$propertyType = $property->getType();
-}
+$propertyType = $property->getWritableType();
 if (!$propertyType->accepts($valueType, true)->yes()) {
 return [sprintf(
 'Entity %s: property $%s (%s) does not accept %s.',

src/Types/Helpers/RepositoryEntityTypeHelper.php

@@ -8,7 +8,7 @@
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NameResolver;
 use PHPStan\Analyser\Scope;
-use PhpStan\Parser\Parser;
+use PHPStan\Parser\Parser;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ObjectType;
@@ -26,7 +26,9 @@ public function __construct(Parser $parser)
 $this->parser = $parser;
 }
 
-
+/**
+ * @phpstan-param \ReflectionClass<\Nextras\Orm\Repository\Repository> $repositoryReflection
+ */
 public function resolveFirst(\ReflectionClass $repositoryReflection, Scope $scope): Type
 {
 $entityClassNameTypes = $this->parseEntityClassNameTypes($repositoryReflection, $scope);
@@ -43,12 +45,16 @@ public function resolveFirst(\ReflectionClass $repositoryReflection, Scope $scop
 }
 }
 
-
+/**
+ * @phpstan-param \ReflectionClass<\Nextras\Orm\Repository\Repository> $repositoryReflection
+ */
 private function parseEntityClassNameTypes(\ReflectionClass $repositoryReflection, Scope $scope): ?Type
 {
 $className = $repositoryReflection->getName();
 $fileName = $repositoryReflection->getFileName();
 
+assert($fileName !== false, sprintf('File for clsas "%s" does not exists.', $className));
+
 $ast = $this->parser->parseFile($fileName);
 
 $nodeTraverser = new NodeTraverser();
@@ -78,7 +84,7 @@ private function parseEntityClassNameTypes(\ReflectionClass $repositoryReflectio
 return $node instanceof Node\Stmt\Return_;
 });
 
-if ($return instanceof Node\Stmt\Return_) {
+if ($return instanceof Node\Stmt\Return_ && $return->expr !== null) {
 return $scope->getType($return->expr);
 } else {
 return null;

src/Types/MapperMethodReturnTypeExtension.php

@@ -64,8 +64,10 @@ public function getTypeFromMethodCall(
 
 $mapperClass = $mapper->getClassName();
 do {
+/** @phpstan-var class-string<\Nextras\Orm\Repository\Repository> $repositoryClass */
 $repositoryClass = \str_replace('Mapper', 'Repository', $mapperClass);
 $mapperClass = \get_parent_class($mapperClass);
+assert(is_string($mapperClass));
 } while (!\class_exists($repositoryClass) && $mapperClass !== DbalMapper::class);
 
 try {

src/Types/RepositoryReturnTypeExtension.php

@@ -69,7 +69,10 @@ public function getTypeFromMethodCall(
 return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 }
 
-$repositoryReflection = new \ReflectionClass($repository->getClassName());
+/** @phpstan-var class-string<Repository> $repositoryClassName */
+$repositoryClassName = $repository->getClassName();
+assert(class_exists($repositoryClassName));
+$repositoryReflection = new \ReflectionClass($repositoryClassName);
 $entityType = $this->repositoryEntityTypeHelper->resolveFirst(
 $repositoryReflection,
 $scope