Improve compatibility with PHPStan 1.0

Author: ondrejmirtes

phpstan.neon

@@ -7,7 +7,7 @@ includes:
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 
 parameters:
-	excludes_analyse:
+	excludePaths:
 		- tests/tmp/*
 		- tests/*/Example*.php
 		- tests/*/console_application_loader.php

tests/Rules/Symfony/UndefinedArgumentRuleTest.php

@@ -6,7 +6,6 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Testing\RuleTestCase;
-use PHPStan\Type\Symfony\ArgumentTypeSpecifyingExtension;
 
 /**
  * @extends RuleTestCase<UndefinedArgumentRule>
@@ -19,16 +18,6 @@ protected function getRule(): Rule
 		return new UndefinedArgumentRule(new ConsoleApplicationResolver(__DIR__ . '/console_application_loader.php'), new Standard());
 	}
 
-	/**
-	 * @return \PHPStan\Type\MethodTypeSpecifyingExtension[]
-	 */
-	protected function getMethodTypeSpecifyingExtensions(): array
-	{
-		return [
-			new ArgumentTypeSpecifyingExtension(new Standard()),
-		];
-	}
-
 	public function testGetArgument(): void
 	{
 		$this->analyse(
@@ -44,4 +33,11 @@ public function testGetArgument(): void
 		);
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/argument.neon',
+		];
+	}
+
 }

tests/Rules/Symfony/UndefinedOptionRuleTest.php

@@ -6,7 +6,6 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Testing\RuleTestCase;
-use PHPStan\Type\Symfony\OptionTypeSpecifyingExtension;
 
 /**
  * @extends RuleTestCase<UndefinedOptionRule>
@@ -19,16 +18,6 @@ protected function getRule(): Rule
 		return new UndefinedOptionRule(new ConsoleApplicationResolver(__DIR__ . '/console_application_loader.php'), new Standard());
 	}
 
-	/**
-	 * @return \PHPStan\Type\MethodTypeSpecifyingExtension[]
-	 */
-	protected function getMethodTypeSpecifyingExtensions(): array
-	{
-		return [
-			new OptionTypeSpecifyingExtension(new Standard()),
-		];
-	}
-
 	public function testGetArgument(): void
 	{
 		$this->analyse(
@@ -44,4 +33,11 @@ public function testGetArgument(): void
 		);
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/option.neon',
+		];
+	}
+
 }

tests/Rules/Symfony/argument.neon

@@ -0,0 +1,5 @@
+services:
+	-
+		class: PHPStan\Type\Symfony\ArgumentTypeSpecifyingExtension
+		tags:
+			- phpstan.typeSpecifier.methodTypeSpecifyingExtension

tests/Rules/Symfony/option.neon

@@ -0,0 +1,5 @@
+services:
+	-
+		class: PHPStan\Type\Symfony\OptionTypeSpecifyingExtension
+		tags:
+			- phpstan.typeSpecifier.methodTypeSpecifyingExtension