Rewrite in backward compatibility compliant way

phpstan · Jun 9, 2021 · bca5b04 · bca5b04
1 parent 748eaac
commit bca5b04
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "^7.1 || ^8.0",
-		"phpstan/phpstan": "^0.12.89"
+		"phpstan/phpstan": "^0.12.85"
 	},
 	"conflict": {
 		"doctrine/collections": "<1.0",

diff --git a/src/Reflection/Doctrine/DummyParameter.php b/src/Reflection/Doctrine/DummyParameter.php
@@ -0,0 +1,69 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Reflection\Doctrine;
+
+use PHPStan\Reflection\ParameterReflection;
+use PHPStan\Reflection\PassedByReference;
+use PHPStan\Type\Type;
+
+class DummyParameter implements ParameterReflection
+{
+
+	/** @var string */
+	private $name;
+
+	/** @var Type */
+	private $type;
+
+	/** @var bool */
+	private $optional;
+
+	/** @var PassedByReference */
+	private $passedByReference;
+
+	/** @var bool */
+	private $variadic;
+
+	private ?\PHPStan\Type\Type $defaultValue;
+
+	public function __construct(string $name, Type $type, bool $optional, ?PassedByReference $passedByReference, bool $variadic, ?Type $defaultValue)
+	{
+		$this->name = $name;
+		$this->type = $type;
+		$this->optional = $optional;
+		$this->passedByReference = $passedByReference ?? PassedByReference::createNo();
+		$this->variadic = $variadic;
+		$this->defaultValue = $defaultValue;
+	}
+
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+	public function isOptional(): bool
+	{
+		return $this->optional;
+	}
+
+	public function getType(): Type
+	{
+		return $this->type;
+	}
+
+	public function passedByReference(): PassedByReference
+	{
+		return $this->passedByReference;
+	}
+
+	public function isVariadic(): bool
+	{
+		return $this->variadic;
+	}
+
+	public function getDefaultValue(): ?Type
+	{
+		return $this->defaultValue;
+	}
+
+}
diff --git a/src/Reflection/Doctrine/MagicRepositoryMethodReflection.php b/src/Reflection/Doctrine/MagicRepositoryMethodReflection.php
@@ -5,7 +5,6 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\FunctionVariant;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\Php\DummyParameter;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\MixedType;

diff --git a/tests/Rules/Doctrine/ORM/MagicRepositoryMethodCallRuleTest.php b/tests/Rules/Doctrine/ORM/MagicRepositoryMethodCallRuleTest.php
@@ -2,13 +2,8 @@
 
 namespace PHPStan\Rules\Doctrine\ORM;
 
-use PHPStan\Php\PhpVersion;
-use PHPStan\Rules\FunctionCallParametersCheck;
 use PHPStan\Rules\Methods\CallMethodsRule;
-use PHPStan\Rules\NullsafeCheck;
-use PHPStan\Rules\PhpDoc\UnresolvableTypeHelper;
 use PHPStan\Rules\Rule;
-use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
 
 /**
@@ -19,15 +14,7 @@ class MagicRepositoryMethodCallRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		$broker = $this->createBroker();
-		$ruleLevelHelper = new RuleLevelHelper($broker, true, false, true);
-		return new CallMethodsRule(
-			$broker,
-			new FunctionCallParametersCheck($ruleLevelHelper, new NullsafeCheck(), new PhpVersion(PHP_VERSION_ID), new UnresolvableTypeHelper(true), true, true, true, true, true),
-			$ruleLevelHelper,
-			true,
-			true
-		);
+		return self::getContainer()->getByType(CallMethodsRule::class);
 	}
 
 	/**