Bump to PHP 8.4, re-apply, upgrade

.github/workflows/code_analysis.yaml

@@ -52,7 +52,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.3
+                    php-version: 8.4
                     coverage: none
 
             -   uses: "ramsey/composer-install@v2"

.github/workflows/rector.yaml.yml

@@ -23,7 +23,7 @@ jobs:
             -
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.3
+                    php-version: 8.4
                     coverage: none
 
             -   uses: "ramsey/composer-install@v2"

composer.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "description": "Rector upgrades rules for Symfony Framework",
     "require": {
-        "php": ">=8.3",
+        "php": ">=8.4",
         "ext-xml": "*"
     },
     "require-dev": {

config/sets/symfony/symfony8/symfony81/symfony81-validator.php

@@ -6,7 +6,5 @@
 use Rector\Symfony\Symfony81\Rector\MethodCall\ConstraintValidatorValidateToValidateInContextRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rules([
-        ConstraintValidatorValidateToValidateInContextRector::class,
-    ]);
+    $rectorConfig->rules([ConstraintValidatorValidateToValidateInContextRector::class]);
 };

rules/Configs/Rector/Class_/ParameterBagToAutowireAttributeRector.php

@@ -157,13 +157,7 @@ public function provideMinPhpVersion(): int
 
     private function hasParameterBagInterfaceDependency(ClassMethod $classMethod): bool
     {
-        foreach ($classMethod->getParams() as $param) {
-            if ($this->isParameterBagParam($param)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any($classMethod->getParams(), fn (Param $param): bool => $this->isParameterBagParam($param));
     }
 
     /**

rules/Symfony73/Rector/Class_/ConstraintOptionsToNamedArgumentsRector.php

@@ -55,12 +55,11 @@ public function getNodeTypes(): array
         return [New_::class];
     }
 
+    /**
+     * @param New_ $node
+     */
     public function refactor(Node $node): ?Node
     {
-        if (! $node instanceof New_) {
-            return null;
-        }
-
         if ($node->isFirstClassCallable()) {
             return null;
         }

rules/Symfony80/Rector/Class_/RemoveEraseCredentialsRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Modifiers;
 use PhpParser\Node;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\Rector\AbstractRector;
@@ -107,13 +108,10 @@ public function refactor(Node $node): ?Class_
 
     private function doesImplementUserInterface(Class_ $class): bool
     {
-        foreach ($class->implements as $implementedInterface) {
-            if ($this->isName($implementedInterface, SymfonyClass::USER_INTERFACE)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any(
+            $class->implements,
+            fn (Name $name): bool => $this->isName($name, SymfonyClass::USER_INTERFACE)
+        );
     }
 
     private function createSserializeClassMethod(mixed $classMethodStmts): ClassMethod

rules/Symfony81/Rector/MethodCall/ConstraintValidatorValidateToValidateInContextRector.php

@@ -107,78 +107,70 @@ public function refactor(Node $node): ?Node
         return $this->refactorConstraintValidatorCall($node);
     }
 
-    private function refactorConstraintValidatorTestCaseCall(MethodCall $node): ?Node
+    private function refactorConstraintValidatorTestCaseCall(MethodCall $methodCall): ?Node
     {
-        if ($this->isName($node->name, 'validate') && \count($node->args) === 2) {
-            return $this->createThisValidateMethodCall($node->args[0], $node->args[1]);
+        if ($this->isName($methodCall->name, 'validate') && \count($methodCall->args) === 2) {
+            return $this->createThisValidateMethodCall($methodCall->args[0], $methodCall->args[1]);
         }
 
-        if ($this->isName($node->name, 'validateInContext') && \count($node->args) === 3) {
-            return $this->createThisValidateMethodCall($node->args[0], $node->args[1]);
+        if ($this->isName($methodCall->name, 'validateInContext') && \count($methodCall->args) === 3) {
+            return $this->createThisValidateMethodCall($methodCall->args[0], $methodCall->args[1]);
         }
 
         return null;
     }
 
-    private function refactorConstraintValidatorCall(MethodCall $node): ?Node
+    private function refactorConstraintValidatorCall(MethodCall $methodCall): ?Node
     {
-        if (! $this->isName($node->name, 'validate')) {
+        if (! $this->isName($methodCall->name, 'validate')) {
             return null;
         }
 
-        if (\count($node->args) !== 2) {
+        if (\count($methodCall->args) !== 2) {
             return null;
         }
 
-        if (! $this->isInsideConstraintValidator($node)) {
+        if (! $this->isInsideConstraintValidator($methodCall)) {
             return null;
         }
 
-        $node->name = new Identifier('validateInContext');
-        $node->args[] = new Arg($this->nodeFactory->createPropertyFetch(new Variable('this'), 'context'));
+        $methodCall->name = new Identifier('validateInContext');
+        $methodCall->args[] = new Arg($this->nodeFactory->createPropertyFetch(new Variable('this'), 'context'));
 
-        return $node;
+        return $methodCall;
     }
 
-    /**
-     * @param Arg $firstArg
-     * @param Arg $secondArg
-     */
     private function createThisValidateMethodCall(Arg $firstArg, Arg $secondArg): MethodCall
     {
-        return new MethodCall(
-            new Variable('this'),
-            new Identifier('validate'),
-            [$firstArg, $secondArg],
-        );
+        return new MethodCall(new Variable('this'), new Identifier('validate'), [$firstArg, $secondArg]);
     }
 
-    private function isThisValidatorPropertyFetch(Expr $node): bool
+    private function isThisValidatorPropertyFetch(Expr $expr): bool
     {
-        if (! $node instanceof PropertyFetch) {
+        if (! $expr instanceof PropertyFetch) {
             return false;
         }
 
-        if (! $this->isName($node->name, 'validator')) {
+        if (! $this->isName($expr->name, 'validator')) {
             return false;
         }
 
-        return $node->var instanceof Variable && $this->isName($node->var, 'this');
+        return $expr->var instanceof Variable && $this->isName($expr->var, 'this');
     }
 
-    private function isInsideConstraintValidatorTestCase(MethodCall $node): bool
+    private function isInsideConstraintValidatorTestCase(MethodCall $methodCall): bool
     {
-        return $this->isInsideClassSubclassOf($node, ConstraintValidatorTestCase::class);
+        return $this->isInsideClassSubclassOf($methodCall, ConstraintValidatorTestCase::class);
     }
 
-    private function isInsideConstraintValidator(MethodCall $node): bool
+    private function isInsideConstraintValidator(MethodCall $methodCall): bool
     {
-        return $this->isInsideClassSubclassOf($node, ConstraintValidator::class);
+        return $this->isInsideClassSubclassOf($methodCall, ConstraintValidator::class);
     }
 
-    private function isInsideClassSubclassOf(MethodCall $node, string $className): bool
+    private function isInsideClassSubclassOf(MethodCall $methodCall, string $className): bool
     {
-        $scope = ScopeFetcher::fetch($node);
+        $scope = ScopeFetcher::fetch($methodCall);
         $classReflection = $scope->getClassReflection();
         if (! $classReflection instanceof ClassReflection) {
             return false;

rules/Symfony81/Rector/New_/RemoveEraseCredentialsFromAuthenticatorManagerRector.php

@@ -80,10 +80,6 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $node instanceof New_) {
-            return null;
-        }
-
         if (! $this->isName($node->class, 'Symfony\Component\Security\Http\Authentication\AuthenticatorManager')) {
             return null;
         }

src/Annotation/AnnotationAnalyzer.php

@@ -5,6 +5,7 @@
 namespace Rector\Symfony\Annotation;
 
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
 use Rector\Doctrine\NodeAnalyzer\AttrinationFinder;
 use Rector\Symfony\Enum\SymfonyAnnotation;
 
@@ -21,12 +22,12 @@ public function hasClassMethodWithTemplateAnnotation(Class_ $class): bool
             return true;
         }
 
-        foreach ($class->getMethods() as $classMethod) {
-            if ($this->attrinationFinder->hasByOne($classMethod, SymfonyAnnotation::TEMPLATE)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any(
+            $class->getMethods(),
+            fn (ClassMethod $classMethod): bool => $this->attrinationFinder->hasByOne(
+                $classMethod,
+                SymfonyAnnotation::TEMPLATE
+            )
+        );
     }
 }

src/Bridge/Symfony/ContainerServiceProvider.php

@@ -11,6 +11,9 @@
 use Symfony\Component\DependencyInjection\Container;
 use Webmozart\Assert\Assert;
 
+/**
+ * @see \Rector\Symfony\Tests\Bridge\Symfony\ContainerServiceProviderTest
+ */
 final class ContainerServiceProvider
 {
     private ?object $container = null;

src/NodeAnalyzer/ClassAnalyzer.php

@@ -4,6 +4,7 @@
 
 namespace Rector\Symfony\NodeAnalyzer;
 
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Class_;
 use Rector\NodeNameResolver\NodeNameResolver;
 
@@ -16,12 +17,9 @@ public function __construct(
 
     public function hasImplements(Class_ $class, string $interfaceFQN): bool
     {
-        foreach ($class->implements as $implement) {
-            if ($this->nodeNameResolver->isName($implement, $interfaceFQN)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any(
+            $class->implements,
+            fn (Name $name): bool => $this->nodeNameResolver->isName($name, $interfaceFQN)
+        );
     }
 }