Fixed compatibility with latest PHPStan

ondrejmirtes · ondrejmirtes · commit 2ca96eef43e4 · 2019-11-17T23:25:55.000+01:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,7 @@ includes:
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
-	- vendor/phpstan/phpstan/conf/bleedingEdge.neon
+	- phar://phpstan.phar/conf/bleedingEdge.neon
 
 parameters:
 	excludes_analyse:
diff --git a/src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php b/src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php
@@ -11,6 +11,9 @@
 use PHPStan\Type\ObjectType;
 use function sprintf;
 
+/**
+ * @implements Rule<MethodCall>
+ */
 final class ContainerInterfacePrivateServiceRule implements Rule
 {
 
diff --git a/src/Rules/Symfony/ContainerInterfaceUnknownServiceRule.php b/src/Rules/Symfony/ContainerInterfaceUnknownServiceRule.php
@@ -12,6 +12,9 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Symfony\Helper;
 
+/**
+ * @implements Rule<MethodCall>
+ */
 final class ContainerInterfaceUnknownServiceRule implements Rule
 {
 
diff --git a/src/Rules/Symfony/InvalidArgumentDefaultValueRule.php b/src/Rules/Symfony/InvalidArgumentDefaultValueRule.php
@@ -18,6 +18,9 @@
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
 
+/**
+ * @implements Rule<MethodCall>
+ */
 final class InvalidArgumentDefaultValueRule implements Rule
 {
 
diff --git a/src/Rules/Symfony/InvalidOptionDefaultValueRule.php b/src/Rules/Symfony/InvalidOptionDefaultValueRule.php
@@ -21,6 +21,9 @@
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
 
+/**
+ * @implements Rule<MethodCall>
+ */
 final class InvalidOptionDefaultValueRule implements Rule
 {
 
diff --git a/src/Rules/Symfony/UndefinedArgumentRule.php b/src/Rules/Symfony/UndefinedArgumentRule.php
@@ -16,6 +16,9 @@
 use function count;
 use function sprintf;
 
+/**
+ * @implements Rule<MethodCall>
+ */
 final class UndefinedArgumentRule implements Rule
 {
 
diff --git a/src/Rules/Symfony/UndefinedOptionRule.php b/src/Rules/Symfony/UndefinedOptionRule.php
@@ -16,6 +16,9 @@
 use function count;
 use function sprintf;
 
+/**
+ * @implements Rule<MethodCall>
+ */
 final class UndefinedOptionRule implements Rule
 {
 
diff --git a/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleFakeTest.php b/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleFakeTest.php
@@ -6,6 +6,9 @@
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 
+/**
+ * @extends RuleTestCase<ContainerInterfacePrivateServiceRule>
+ */
 final class ContainerInterfacePrivateServiceRuleFakeTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php b/tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php
@@ -6,6 +6,9 @@
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 
+/**
+ * @extends RuleTestCase<ContainerInterfacePrivateServiceRule>
+ */
 final class ContainerInterfacePrivateServiceRuleTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleFakeTest.php b/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleFakeTest.php
@@ -9,6 +9,9 @@
 use PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
+/**
+ * @extends RuleTestCase<ContainerInterfaceUnknownServiceRule>
+ */
 final class ContainerInterfaceUnknownServiceRuleFakeTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php b/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php
@@ -9,6 +9,9 @@
 use PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
+/**
+ * @extends RuleTestCase<ContainerInterfaceUnknownServiceRule>
+ */
 final class ContainerInterfaceUnknownServiceRuleTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/InvalidArgumentDefaultValueRuleTest.php b/tests/Rules/Symfony/InvalidArgumentDefaultValueRuleTest.php
@@ -5,6 +5,9 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
+/**
+ * @extends RuleTestCase<InvalidArgumentDefaultValueRule>
+ */
 final class InvalidArgumentDefaultValueRuleTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/InvalidOptionDefaultValueRuleTest.php b/tests/Rules/Symfony/InvalidOptionDefaultValueRuleTest.php
@@ -5,6 +5,9 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
+/**
+ * @extends RuleTestCase<InvalidOptionDefaultValueRule>
+ */
 final class InvalidOptionDefaultValueRuleTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/UndefinedArgumentRuleTest.php b/tests/Rules/Symfony/UndefinedArgumentRuleTest.php
@@ -8,6 +8,9 @@
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\Symfony\ArgumentTypeSpecifyingExtension;
 
+/**
+ * @extends RuleTestCase<UndefinedArgumentRule>
+ */
 final class UndefinedArgumentRuleTest extends RuleTestCase
 {
 
diff --git a/tests/Rules/Symfony/UndefinedOptionRuleTest.php b/tests/Rules/Symfony/UndefinedOptionRuleTest.php
@@ -8,6 +8,9 @@
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\Symfony\OptionTypeSpecifyingExtension;
 
+/**
+ * @extends RuleTestCase<UndefinedOptionRule>
+ */
 final class UndefinedOptionRuleTest extends RuleTestCase
 {
 
diff --git a/tests/Symfony/DefaultServiceMapTest.php b/tests/Symfony/DefaultServiceMapTest.php
@@ -25,6 +25,9 @@ public function testGetContainerEscapedPath(): void
 		self::assertNotNull($serviceMap->getService('withClass'));
 	}
 
+	/**
+	 * @return \Iterator<mixed>
+	 */
 	public function getServiceProvider(): Iterator
 	{
 		yield [
diff --git a/tests/Type/Symfony/EnvelopeReturnTypeExtensionTest.php b/tests/Type/Symfony/EnvelopeReturnTypeExtensionTest.php
@@ -22,6 +22,9 @@ public function testAll(string $expression, string $type): void
 		);
 	}
 
+	/**
+	 * @return \Iterator<mixed>
+	 */
 	public function getProvider(): Iterator
 	{
 		yield ['$test1', 'array<' . ReceivedStamp::class . '>'];
diff --git a/tests/Type/Symfony/ExtensionTestCase.php b/tests/Type/Symfony/ExtensionTestCase.php
@@ -46,8 +46,7 @@ protected function processFile(
 				$phpDocStringResolver,
 				self::getContainer()->getByType(PhpDocNodeResolver::class),
 				$this->createMock(Cache::class),
-				$this->createMock(AnonymousClassNameHelper::class),
-				$typeNodeResolver
+				$this->createMock(AnonymousClassNameHelper::class)
 			),
 			$fileHelper,
 			$typeSpecifier,
diff --git a/tests/Type/Symfony/HeaderBagDynamicReturnTypeExtensionTest.php b/tests/Type/Symfony/HeaderBagDynamicReturnTypeExtensionTest.php
@@ -20,6 +20,9 @@ public function testGet(string $expression, string $type): void
 		);
 	}
 
+	/**
+	 * @return \Iterator<array{string, string}>
+	 */
 	public function getProvider(): Iterator
 	{
 		yield ['$test1', 'string|null'];
diff --git a/tests/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtensionTest.php b/tests/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtensionTest.php
@@ -21,6 +21,9 @@ public function testArgumentTypes(string $expression, string $type): void
 		);
 	}
 
+	/**
+	 * @return \Iterator<array{string, string}>
+	 */
 	public function argumentTypesProvider(): Iterator
 	{
 		yield ['$base', 'string|null'];
diff --git a/tests/Type/Symfony/InputInterfaceGetOptionDynamicReturnTypeExtensionTest.php b/tests/Type/Symfony/InputInterfaceGetOptionDynamicReturnTypeExtensionTest.php
@@ -21,6 +21,9 @@ public function testArgumentTypes(string $expression, string $type): void
 		);
 	}
 
+	/**
+	 * @return \Iterator<array{string, string}>
+	 */
 	public function argumentTypesProvider(): Iterator
 	{
 		yield ['$a', 'bool'];
diff --git a/tests/Type/Symfony/RequestTypeSpecifyingExtensionTest.php b/tests/Type/Symfony/RequestTypeSpecifyingExtensionTest.php
@@ -7,6 +7,9 @@
 use PHPStan\Type\MethodTypeSpecifyingExtension;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
+/**
+ * @extends RuleTestCase<VariableTypeReportingRule>
+ */
 final class RequestTypeSpecifyingExtensionTest extends RuleTestCase
 {
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`use PHPStan\Type\ObjectType;`
`12`	`12`	`use function sprintf;`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * @implements Rule<MethodCall>`
	`16`	`+ */`
`14`	`17`	`final class ContainerInterfacePrivateServiceRule implements Rule`
`15`	`18`	`{`
`16`	`19`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@`
`12`	`12`	`use PHPStan\Type\ObjectType;`
`13`	`13`	`use PHPStan\Type\Symfony\Helper;`
`14`	`14`
	`15`	`+/**`
	`16`	`+ * @implements Rule<MethodCall>`
	`17`	`+ */`
`15`	`18`	`final class ContainerInterfaceUnknownServiceRule implements Rule`
`16`	`19`	`{`
`17`	`20`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`use PHPStan\Type\VerbosityLevel;`
`19`	`19`	`use function sprintf;`
`20`	`20`
	`21`	`+/**`
	`22`	`+ * @implements Rule<MethodCall>`
	`23`	`+ */`
`21`	`24`	`final class InvalidArgumentDefaultValueRule implements Rule`
`22`	`25`	`{`
`23`	`26`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@`
`21`	`21`	`use PHPStan\Type\VerbosityLevel;`
`22`	`22`	`use function sprintf;`
`23`	`23`
	`24`	`+/**`
	`25`	`+ * @implements Rule<MethodCall>`
	`26`	`+ */`
`24`	`27`	`final class InvalidOptionDefaultValueRule implements Rule`
`25`	`28`	`{`
`26`	`29`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`	`use function count;`
`17`	`17`	`use function sprintf;`
`18`	`18`
	`19`	`+/**`
	`20`	`+ * @implements Rule<MethodCall>`
	`21`	`+ */`
`19`	`22`	`final class UndefinedArgumentRule implements Rule`
`20`	`23`	`{`
`21`	`24`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`use PHPStan\Symfony\XmlServiceMapFactory;`
`7`	`7`	`use PHPStan\Testing\RuleTestCase;`
`8`	`8`
	`9`	`+/**`
	`10`	`+ * @extends RuleTestCase<ContainerInterfacePrivateServiceRule>`
	`11`	`+ */`
`9`	`12`	`final class ContainerInterfacePrivateServiceRuleFakeTest extends RuleTestCase`
`10`	`13`	`{`
`11`	`14`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`use PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension;`
`10`	`10`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @extends RuleTestCase<ContainerInterfaceUnknownServiceRule>`
	`14`	`+ */`
`12`	`15`	`final class ContainerInterfaceUnknownServiceRuleFakeTest extends RuleTestCase`
`13`	`16`	`{`
`14`	`17`