Merge pull request #16 from sascha-egerer/feature/phpstan-0-12-compatibility

Add phpstan 0.12 compatibility

Author: sascha-egerer

.gitignore

@@ -3,3 +3,4 @@
 /typo3
 /.idea
 /index.php
+/public

composer.json

@@ -7,16 +7,16 @@
     "prefer-stable": true,
     "require": {
         "php": "~7.1",
-        "phpstan/phpstan": "^0.10 || ^0.11",
-        "typo3/cms-core": "^8.7 || ^9.5 || ^10.0",
-        "typo3/cms-extbase": "^8.7 || ^9.5 || ^10.0"
+        "phpstan/phpstan": "^0.12",
+        "typo3/cms-core": "^8.7 || ^9.5 || ^10.2",
+        "typo3/cms-extbase": "^8.7 || ^9.5 || ^10.2"
     },
     "require-dev": {
         "consistence/coding-standard": "^3.8",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
         "jakub-onderka/php-parallel-lint": "^1.0",
         "phing/phing": "^2.16.0",
-        "phpstan/phpstan-strict-rules": "^0.11"
+        "phpstan/phpstan-strict-rules": "^0.12"
     },
     "suggest": {
         "typo3/testing-framework": "Testing framework is used in the bootstrap (src/PhpStanTypo3Bootstrap.php). In most cases you need this package but you may also use your custom bootstrap (e.g. if you use nimut/testing-framework)"
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.10-dev"
+            "dev-master": "0.12-dev"
         },
         "phpstan": {
             "includes": ["extension.neon"]

src/Reflection/RepositoryFindByMethodReflection.php

@@ -7,6 +7,8 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\FunctionVariant;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\TrinaryLogic;
+use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use TYPO3\CMS\Core\Utility\ClassNamingUtility;
@@ -80,7 +82,7 @@ public function getParameters(): array
 	{
 		$modelReflection = $this->broker->getClass($this->getModelName());
 
-		$type = $modelReflection->getNativeProperty($this->getPropertyName())->getType();
+		$type = $modelReflection->getNativeProperty($this->getPropertyName())->getReadableType();
 
 		return [
 			new RepositoryFindByParameterReflection('arg', $type),
@@ -104,11 +106,48 @@ public function getVariants(): array
 	{
 		return [
 			new FunctionVariant(
+				TemplateTypeMap::createEmpty(),
+				null,
 				$this->getParameters(),
 				$this->isVariadic(),
 				$this->getReturnType()
 			),
 		];
 	}
 
+	public function getDocComment(): ?string
+	{
+		return null;
+	}
+
+	public function isDeprecated(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function getDeprecatedDescription(): ?string
+	{
+		return null;
+	}
+
+	public function isFinal(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function isInternal(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function getThrowType(): ?\PHPStan\Type\Type
+	{
+		return null;
+	}
+
+	public function hasSideEffects(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 }

src/Reflection/RepositoryFindByParameterReflection.php

@@ -14,7 +14,7 @@ class RepositoryFindByParameterReflection implements ParameterReflection
 	/** @var string */
 	private $name;
 
-	/** @var \PHPStan\Type\Type */
+	/** @var Type */
 	private $type;
 
 	public function __construct(string $name, Type $type)
@@ -53,4 +53,9 @@ public function passedByReference(): PassedByReference
 		return PassedByReference::createNo();
 	}
 
+	public function getDefaultValue(): ?Type
+	{
+		return null;
+	}
+
 }

src/Reflection/RepositoryFindOneByMethodReflection.php

@@ -7,6 +7,8 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\FunctionVariant;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\TrinaryLogic;
+use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -80,7 +82,7 @@ public function getParameters(): array
 	{
 		$modelReflection = $this->broker->getClass($this->getModelName());
 
-		$type = $modelReflection->getNativeProperty($this->getPropertyName())->getType();
+		$type = $modelReflection->getNativeProperty($this->getPropertyName())->getReadableType();
 
 		return [
 			new RepositoryFindByParameterReflection('arg', $type),
@@ -104,11 +106,48 @@ public function getVariants(): array
 	{
 		return [
 			new FunctionVariant(
+				TemplateTypeMap::createEmpty(),
+				null,
 				$this->getParameters(),
 				$this->isVariadic(),
 				$this->getReturnType()
 			),
 		];
 	}
 
+	public function getDocComment(): ?string
+	{
+		return null;
+	}
+
+	public function isDeprecated(): \PHPStan\TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function getDeprecatedDescription(): ?string
+	{
+		return null;
+	}
+
+	public function isFinal(): \PHPStan\TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function isInternal(): \PHPStan\TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
+	public function getThrowType(): ?\PHPStan\Type\Type
+	{
+		return null;
+	}
+
+	public function hasSideEffects(): \PHPStan\TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 }