Fixes after PHPStan update

phpstan · Oct 4, 2024 · d1e08ac · d1e08ac
1 parent a0572ad
commit d1e08ac
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 27 deletions.
diff --git a/src/Rules/Symfony/ContainerInterfaceUnknownServiceRule.php b/src/Rules/Symfony/ContainerInterfaceUnknownServiceRule.php
@@ -4,8 +4,8 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Symfony\ServiceMap;
@@ -21,9 +21,9 @@ final class ContainerInterfaceUnknownServiceRule implements Rule
 
 	private ServiceMap $serviceMap;
 
-	private Standard $printer;
+	private Printer $printer;
 
-	public function __construct(ServiceMap $symfonyServiceMap, Standard $printer)
+	public function __construct(ServiceMap $symfonyServiceMap, Printer $printer)
 	{
 		$this->serviceMap = $symfonyServiceMap;
 		$this->printer = $printer;

diff --git a/src/Rules/Symfony/UndefinedArgumentRule.php b/src/Rules/Symfony/UndefinedArgumentRule.php
@@ -5,8 +5,8 @@
 use InvalidArgumentException;
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Symfony\ConsoleApplicationResolver;
@@ -23,9 +23,9 @@ final class UndefinedArgumentRule implements Rule
 
 	private ConsoleApplicationResolver $consoleApplicationResolver;
 
-	private Standard $printer;
+	private Printer $printer;
 
-	public function __construct(ConsoleApplicationResolver $consoleApplicationResolver, Standard $printer)
+	public function __construct(ConsoleApplicationResolver $consoleApplicationResolver, Printer $printer)
 	{
 		$this->consoleApplicationResolver = $consoleApplicationResolver;
 		$this->printer = $printer;

diff --git a/src/Rules/Symfony/UndefinedOptionRule.php b/src/Rules/Symfony/UndefinedOptionRule.php
@@ -5,8 +5,8 @@
 use InvalidArgumentException;
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Symfony\ConsoleApplicationResolver;
@@ -23,9 +23,9 @@ final class UndefinedOptionRule implements Rule
 
 	private ConsoleApplicationResolver $consoleApplicationResolver;
 
-	private Standard $printer;
+	private Printer $printer;
 
-	public function __construct(ConsoleApplicationResolver $consoleApplicationResolver, Standard $printer)
+	public function __construct(ConsoleApplicationResolver $consoleApplicationResolver, Printer $printer)
 	{
 		$this->consoleApplicationResolver = $consoleApplicationResolver;
 		$this->printer = $printer;

diff --git a/src/Type/Symfony/ArgumentTypeSpecifyingExtension.php b/src/Type/Symfony/ArgumentTypeSpecifyingExtension.php
@@ -3,23 +3,23 @@
 namespace PHPStan\Type\Symfony;
 
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
 
 final class ArgumentTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
 
-	private Standard $printer;
+	private Printer $printer;
 
 	private TypeSpecifier $typeSpecifier;
 
-	public function __construct(Standard $printer)
+	public function __construct(Printer $printer)
 	{
 		$this->printer = $printer;
 	}

diff --git a/src/Type/Symfony/Config/PassParentObjectDynamicReturnTypeExtension.php b/src/Type/Symfony/Config/PassParentObjectDynamicReturnTypeExtension.php
@@ -15,12 +15,14 @@
 final class PassParentObjectDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string */
 	private string $className;
 
 	/** @var string[] */
 	private array $methods;
 
 	/**
+	 * @param class-string $className
 	 * @param string[] $methods
 	 */
 	public function __construct(string $className, array $methods)

diff --git a/src/Type/Symfony/Config/ReturnParentDynamicReturnTypeExtension.php b/src/Type/Symfony/Config/ReturnParentDynamicReturnTypeExtension.php
@@ -13,12 +13,14 @@
 final class ReturnParentDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string */
 	private string $className;
 
 	/** @var string[] */
 	private array $methods;
 
 	/**
+	 * @param class-string $className
 	 * @param string[] $methods
 	 */
 	public function __construct(string $className, array $methods)

diff --git a/src/Type/Symfony/OptionTypeSpecifyingExtension.php b/src/Type/Symfony/OptionTypeSpecifyingExtension.php
@@ -3,23 +3,23 @@
 namespace PHPStan\Type\Symfony;
 
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
 
 final class OptionTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
 
-	private Standard $printer;
+	private Printer $printer;
 
 	private TypeSpecifier $typeSpecifier;
 
-	public function __construct(Standard $printer)
+	public function __construct(Printer $printer)
 	{
 		$this->printer = $printer;
 	}

diff --git a/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php b/src/Type/Symfony/ParameterDynamicReturnTypeExtension.php
@@ -42,6 +42,7 @@
 final class ParameterDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string */
 	private string $className;
 
 	private ?string $methodGet = null;
@@ -54,6 +55,9 @@ final class ParameterDynamicReturnTypeExtension implements DynamicMethodReturnTy
 
 	private TypeStringResolver $typeStringResolver;
 
+	/**
+	 * @param class-string $className
+	 */
 	public function __construct(
 		string $className,
 		?string $methodGet,

diff --git a/src/Type/Symfony/SerializerDynamicReturnTypeExtension.php b/src/Type/Symfony/SerializerDynamicReturnTypeExtension.php
@@ -17,10 +17,14 @@
 class SerializerDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string */
 	private string $class;
 
 	private string $method;
 
+	/**
+	 * @param class-string $class
+	 */
 	public function __construct(string $class, string $method)
 	{
 		$this->class = $class;

diff --git a/src/Type/Symfony/ServiceDynamicReturnTypeExtension.php b/src/Type/Symfony/ServiceDynamicReturnTypeExtension.php
@@ -22,6 +22,7 @@
 final class ServiceDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var class-string */
 	private string $className;
 
 	private bool $constantHassers;
@@ -32,6 +33,9 @@ final class ServiceDynamicReturnTypeExtension implements DynamicMethodReturnType
 
 	private ?ParameterBag $parameterBag = null;
 
+	/**
+	 * @param class-string $className
+	 */
 	public function __construct(
 		string $className,
 		Configuration $configuration,

diff --git a/src/Type/Symfony/ServiceTypeSpecifyingExtension.php b/src/Type/Symfony/ServiceTypeSpecifyingExtension.php
@@ -3,25 +3,29 @@
 namespace PHPStan\Type\Symfony;
 
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\SpecifiedTypes;
 use PHPStan\Analyser\TypeSpecifier;
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
 
 final class ServiceTypeSpecifyingExtension implements MethodTypeSpecifyingExtension, TypeSpecifierAwareExtension
 {
 
+	/** @var class-string */
 	private string $className;
 
-	private Standard $printer;
+	private Printer $printer;
 
 	private TypeSpecifier $typeSpecifier;
 
-	public function __construct(string $className, Standard $printer)
+	/**
+	 * @param class-string $className
+	 */
+	public function __construct(string $className, Printer $printer)
 	{
 		$this->className = $className;
 		$this->printer = $printer;

diff --git a/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleFakeTest.php b/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleFakeTest.php
@@ -2,13 +2,14 @@
 
 namespace PHPStan\Rules\Symfony;
 
-use PhpParser\PrettyPrinter\Standard;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
 use PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use function class_exists;
 
 /**
@@ -19,7 +20,7 @@ final class ContainerInterfaceUnknownServiceRuleFakeTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration([])))->create(), new Standard());
+		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration([])))->create(), self::getContainer()->getByType(Printer::class));
 	}
 
 	/**
@@ -28,7 +29,7 @@ protected function getRule(): Rule
 	protected function getMethodTypeSpecifyingExtensions(): array
 	{
 		return [
-			new ServiceTypeSpecifyingExtension('Symfony\Bundle\FrameworkBundle\Controller\Controller', new Standard()),
+			new ServiceTypeSpecifyingExtension(AbstractController::class, self::getContainer()->getByType(Printer::class)),
 		];
 	}
 

diff --git a/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php b/tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\Symfony;
 
-use PhpParser\PrettyPrinter\Standard;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\XmlServiceMapFactory;
@@ -18,7 +18,7 @@ final class ContainerInterfaceUnknownServiceRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/container.xml'])))->create(), new Standard());
+		return new ContainerInterfaceUnknownServiceRule((new XmlServiceMapFactory(new Configuration(['containerXmlPath' => __DIR__ . '/container.xml'])))->create(), self::getContainer()->getByType(Printer::class));
 	}
 
 	public function testGetPrivateService(): void

diff --git a/tests/Rules/Symfony/UndefinedArgumentRuleTest.php b/tests/Rules/Symfony/UndefinedArgumentRuleTest.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\Symfony;
 
-use PhpParser\PrettyPrinter\Standard;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\ConsoleApplicationResolver;
@@ -16,7 +16,7 @@ final class UndefinedArgumentRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new UndefinedArgumentRule(new ConsoleApplicationResolver(new Configuration(['consoleApplicationLoader' => __DIR__ . '/console_application_loader.php'])), new Standard());
+		return new UndefinedArgumentRule(new ConsoleApplicationResolver(new Configuration(['consoleApplicationLoader' => __DIR__ . '/console_application_loader.php'])), self::getContainer()->getByType(Printer::class));
 	}
 
 	public function testGetArgument(): void

diff --git a/tests/Rules/Symfony/UndefinedOptionRuleTest.php b/tests/Rules/Symfony/UndefinedOptionRuleTest.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Rules\Symfony;
 
-use PhpParser\PrettyPrinter\Standard;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Symfony\Configuration;
 use PHPStan\Symfony\ConsoleApplicationResolver;
@@ -16,7 +16,7 @@ final class UndefinedOptionRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new UndefinedOptionRule(new ConsoleApplicationResolver(new Configuration(['consoleApplicationLoader' => __DIR__ . '/console_application_loader.php'])), new Standard());
+		return new UndefinedOptionRule(new ConsoleApplicationResolver(new Configuration(['consoleApplicationLoader' => __DIR__ . '/console_application_loader.php'])), self::getContainer()->getByType(Printer::class));
 	}
 
 	public function testGetArgument(): void