Updated Rector to commit fe319d74bc9242099c980b8665e50976825edb73

rectorphp/rector-src@fe319d7 Rectify (#7084)

Author: TomasVotruba

rules/CodingStyle/Rector/FuncCall/ClosureFromCallableToFirstClassCallableRector.php

@@ -4,6 +4,19 @@
 namespace Rector\CodingStyle\Rector\FuncCall;
 
 use PhpParser\Node;
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\VariadicPlaceholder;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -14,86 +27,80 @@
  */
 final class ClosureFromCallableToFirstClassCallableRector extends AbstractRector implements MinPhpVersionInterface
 {
-    public function __construct()
-    {
-    }
     public function getRuleDefinition() : RuleDefinition
     {
-        return new RuleDefinition('Change `Closure::fromCallable()` to first class callable syntax', [new CodeSample('Closure::fromCallable([$obj, \'method\']);', '$obj->method(...);'), new CodeSample('Closure::fromCallable(\'trim\');', 'trim(...);'), new CodeSample('Closure::fromCallable([\'SomeClass\', \'staticMethod\']);', 'SomeClass::staticMethod(...);')]);
+        return new RuleDefinition('Change `Closure::fromCallable()` to first class callable syntax', [new CodeSample('Closure::fromCallable([$obj, \'method\']);', '$obj->method(...);'), new CodeSample("Closure::fromCallable('trim');", 'trim(...);'), new CodeSample("Closure::fromCallable(['SomeClass', 'staticMethod']);", 'SomeClass::staticMethod(...);')]);
     }
     /**
      * @return array<class-string<Node>>
      */
     public function getNodeTypes() : array
     {
-        return [Node\Expr\StaticCall::class];
+        return [StaticCall::class];
     }
     /**
-     * @param Node\Expr\StaticCall $node
+     * @param StaticCall $node
      */
     public function refactor(Node $node) : ?Node
     {
         if ($this->shouldSkip($node)) {
             return null;
         }
         $arg = $node->args[0];
-        if (!$arg instanceof Node\Arg) {
+        if (!$arg instanceof Arg) {
             return null;
         }
-        if ($arg->value instanceof Node\Scalar\String_) {
-            return new Node\Expr\FuncCall($this->toFullyQualified($arg->value->value), [new Node\VariadicPlaceholder()]);
+        if ($arg->value instanceof String_) {
+            return new FuncCall($this->toFullyQualified($arg->value->value), [new VariadicPlaceholder()]);
         }
-        if ($arg->value instanceof Node\Expr\Array_) {
-            if (!\array_key_exists(0, $arg->value->items) || !\array_key_exists(1, $arg->value->items) || !$arg->value->items[1]->value instanceof Node\Scalar\String_) {
+        if ($arg->value instanceof Array_) {
+            if (!\array_key_exists(0, $arg->value->items) || !\array_key_exists(1, $arg->value->items) || !$arg->value->items[1]->value instanceof String_) {
                 return null;
             }
-            if ($arg->value->items[0]->value instanceof Node\Expr\Variable) {
-                return new Node\Expr\MethodCall($arg->value->items[0]->value, $arg->value->items[1]->value->value, [new Node\VariadicPlaceholder()]);
+            if ($arg->value->items[0]->value instanceof Variable) {
+                return new MethodCall($arg->value->items[0]->value, $arg->value->items[1]->value->value, [new VariadicPlaceholder()]);
             }
-            if ($arg->value->items[0]->value instanceof Node\Scalar\String_) {
-                $classNode = new Node\Name\FullyQualified($arg->value->items[0]->value->value);
-            } elseif ($arg->value->items[0]->value instanceof Node\Expr\ClassConstFetch) {
-                if ($arg->value->items[0]->value->class instanceof Node\Expr) {
+            if ($arg->value->items[0]->value instanceof String_) {
+                $classNode = new FullyQualified($arg->value->items[0]->value->value);
+            } elseif ($arg->value->items[0]->value instanceof ClassConstFetch) {
+                if ($arg->value->items[0]->value->class instanceof Expr) {
                     return null;
                 }
-                $classNode = new Node\Name\FullyQualified($arg->value->items[0]->value->class->name);
-            } elseif ($arg->value->items[0]->value instanceof Node\Name\FullyQualified) {
-                $classNode = new Node\Name\FullyQualified($arg->value->items[0]->value->name);
+                $classNode = new FullyQualified($arg->value->items[0]->value->class->name);
+            } elseif ($arg->value->items[0]->value instanceof FullyQualified) {
+                $classNode = new FullyQualified($arg->value->items[0]->value->name);
             } else {
                 return null;
             }
-            return new Node\Expr\StaticCall($classNode, $arg->value->items[1]->value->value, [new Node\VariadicPlaceholder()]);
+            return new StaticCall($classNode, $arg->value->items[1]->value->value, [new VariadicPlaceholder()]);
         }
         return $node;
     }
     public function provideMinPhpVersion() : int
     {
         return PhpVersionFeature::FIRST_CLASS_CALLABLE_SYNTAX;
     }
-    public function shouldSkip(Node\Expr\StaticCall $node) : bool
+    public function shouldSkip(StaticCall $staticCall) : bool
     {
-        if (!$node->class instanceof Node\Name) {
-            return \true;
-        }
-        if (!$this->isName($node->class, 'Closure')) {
+        if (!$staticCall->class instanceof Name) {
             return \true;
         }
-        if (!$node->name instanceof Node\Identifier || $node->name->name !== 'fromCallable') {
+        if (!$this->isName($staticCall->class, 'Closure')) {
             return \true;
         }
-        if ($node->isFirstClassCallable()) {
+        if (!$staticCall->name instanceof Identifier || $staticCall->name->name !== 'fromCallable') {
             return \true;
         }
-        $args = $node->getArgs();
-        if (\count($args) !== 1) {
+        if ($staticCall->isFirstClassCallable()) {
             return \true;
         }
-        return \false;
+        $args = $staticCall->getArgs();
+        return \count($args) !== 1;
     }
-    public function toFullyQualified(string $functionName) : Node\Name\FullyQualified
+    public function toFullyQualified(string $functionName) : FullyQualified
     {
         // in case there's already a \ prefix, remove it
         $functionName = \ltrim($functionName, '\\');
-        return new Node\Name\FullyQualified($functionName);
+        return new FullyQualified($functionName);
     }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'eb07bffc89331e6fa6df521eeb48c5b27e1df531';
+    public const PACKAGE_VERSION = 'fe319d74bc9242099c980b8665e50976825edb73';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-07-22 22:00:50';
+    public const RELEASE_DATE = '2025-07-23 07:06:07';
     /**
      * @var int
      */