From 4b339bd12f83c2927ba4055db2583db1b624e4aa Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Wed, 9 Jun 2021 15:58:50 +0200 Subject: [PATCH] Rewrite in backward compatibility compliant way --- .../ImpossibleCheckTypeMethodCallRuleTest.php | 41 ++++--------------- ...sibleCheckTypeStaticMethodCallRuleTest.php | 22 ++++------ 2 files changed, 18 insertions(+), 45 deletions(-) diff --git a/tests/Type/BeberleiAssert/ImpossibleCheckTypeMethodCallRuleTest.php b/tests/Type/BeberleiAssert/ImpossibleCheckTypeMethodCallRuleTest.php index 0e22baa..333d7da 100644 --- a/tests/Type/BeberleiAssert/ImpossibleCheckTypeMethodCallRuleTest.php +++ b/tests/Type/BeberleiAssert/ImpossibleCheckTypeMethodCallRuleTest.php @@ -2,7 +2,6 @@ namespace PHPStan\Type\BeberleiAssert; -use PHPStan\Rules\Comparison\ImpossibleCheckTypeHelper; use PHPStan\Rules\Comparison\ImpossibleCheckTypeMethodCallRule; use PHPStan\Rules\Rule; @@ -14,37 +13,7 @@ class ImpossibleCheckTypeMethodCallRuleTest extends \PHPStan\Testing\RuleTestCas protected function getRule(): Rule { - return new ImpossibleCheckTypeMethodCallRule(new ImpossibleCheckTypeHelper($this->createBroker(), $this->getTypeSpecifier(), [], true), true, true); - } - - /** - * @return \PHPStan\Type\MethodTypeSpecifyingExtension[] - */ - protected function getMethodTypeSpecifyingExtensions(): array - { - return [ - new AssertionChainTypeSpecifyingExtension(), - ]; - } - - /** - * @return \PHPStan\Type\DynamicMethodReturnTypeExtension[] - */ - public function getDynamicMethodReturnTypeExtensions(): array - { - return [ - new AssertionChainDynamicReturnTypeExtension(), - ]; - } - - /** - * @return \PHPStan\Type\DynamicStaticMethodReturnTypeExtension[] - */ - public function getDynamicStaticMethodReturnTypeExtensions(): array - { - return [ - new AssertThatDynamicMethodReturnTypeExtension(), - ]; + return self::getContainer()->getByType(ImpossibleCheckTypeMethodCallRule::class); } public function testExtension(): void @@ -61,4 +30,12 @@ public function testExtension(): void ]); } + public static function getAdditionalConfigFiles(): array + { + return [ + __DIR__ . '/../../../extension.neon', + __DIR__ . '/../../../vendor/phpstan/phpstan-strict-rules/rules.neon', + ]; + } + } diff --git a/tests/Type/BeberleiAssert/ImpossibleCheckTypeStaticMethodCallRuleTest.php b/tests/Type/BeberleiAssert/ImpossibleCheckTypeStaticMethodCallRuleTest.php index c46c7e2..bf1041a 100644 --- a/tests/Type/BeberleiAssert/ImpossibleCheckTypeStaticMethodCallRuleTest.php +++ b/tests/Type/BeberleiAssert/ImpossibleCheckTypeStaticMethodCallRuleTest.php @@ -2,7 +2,6 @@ namespace PHPStan\Type\BeberleiAssert; -use PHPStan\Rules\Comparison\ImpossibleCheckTypeHelper; use PHPStan\Rules\Comparison\ImpossibleCheckTypeStaticMethodCallRule; use PHPStan\Rules\Rule; @@ -14,18 +13,7 @@ class ImpossibleCheckTypeStaticMethodCallRuleTest extends \PHPStan\Testing\RuleT protected function getRule(): Rule { - return new ImpossibleCheckTypeStaticMethodCallRule(new ImpossibleCheckTypeHelper($this->createBroker(), $this->getTypeSpecifier(), [], true), true, true); - } - - - /** - * @return \PHPStan\Type\StaticMethodTypeSpecifyingExtension[] - */ - protected function getStaticMethodTypeSpecifyingExtensions(): array - { - return [ - new AssertTypeSpecifyingExtension(), - ]; + return self::getContainer()->getByType(ImpossibleCheckTypeStaticMethodCallRule::class); } public function testExtension(): void @@ -43,4 +31,12 @@ public function testExtension(): void ]); } + public static function getAdditionalConfigFiles(): array + { + return [ + __DIR__ . '/../../../extension.neon', + __DIR__ . '/../../../vendor/phpstan/phpstan-strict-rules/rules.neon', + ]; + } + }