Updated Rector to commit 8627ee851f09406dd25c32230f00d4ae367ee4e9

rectorphp/rector-src@8627ee8 Support array_values in ArrayFirstLastRector (#7830)

Author: TomasVotruba

rules/Php85/Rector/ArrayDimFetch/ArrayFirstLastRector.php

@@ -5,7 +5,9 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\BinaryOp\Minus;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Scalar\Int_;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
@@ -32,10 +34,14 @@ public function getRuleDefinition(): RuleDefinition
         return new RuleDefinition('Make use of array_first() and array_last()', [new CodeSample(<<<'CODE_SAMPLE'
 echo $array[array_key_first($array)];
 echo $array[array_key_last($array)];
+echo array_values($array)[0];
+echo array_values($array)[count($array) - 1];
 CODE_SAMPLE
 , <<<'CODE_SAMPLE'
 echo array_first($array);
 echo array_last($array);
+echo array_first($array);
+echo array_last($array);
 CODE_SAMPLE
 )]);
     }
@@ -50,6 +56,20 @@ public function getNodeTypes(): array
      * @param ArrayDimFetch $node
      */
     public function refactor(Node $node): ?FuncCall
+    {
+        if ($node->dim instanceof FuncCall) {
+            return $this->refactorArrayKeyPattern($node);
+        }
+        if ($node->var instanceof FuncCall && ($node->dim instanceof Int_ || $node->dim instanceof Minus)) {
+            return $this->refactorArrayValuesPattern($node);
+        }
+        return null;
+    }
+    public function provideMinPhpVersion(): int
+    {
+        return PhpVersionFeature::ARRAY_FIRST_LAST;
+    }
+    private function refactorArrayKeyPattern(ArrayDimFetch $node): ?FuncCall
     {
         if (!$node->dim instanceof FuncCall) {
             return null;
@@ -66,18 +86,65 @@ public function refactor(Node $node): ?FuncCall
         if (!$this->nodeComparator->areNodesEqual($node->var, $node->dim->getArgs()[0]->value)) {
             return null;
         }
-        $scope = ScopeFetcher::fetch($node->var);
-        if ($scope->isInExpressionAssign($node)) {
-            return null;
-        }
-        if ($node->getAttribute(AttributeKey::IS_UNSET_VAR)) {
+        if ($this->shouldSkip($node, $node->var)) {
             return null;
         }
         $functionName = $this->isName($node->dim, self::ARRAY_KEY_FIRST) ? 'array_first' : 'array_last';
         return $this->nodeFactory->createFuncCall($functionName, [$node->var]);
     }
-    public function provideMinPhpVersion(): int
+    private function refactorArrayValuesPattern(ArrayDimFetch $node): ?FuncCall
     {
-        return PhpVersionFeature::ARRAY_FIRST_LAST;
+        if (!$node->var instanceof FuncCall) {
+            return null;
+        }
+        if (!$this->isName($node->var, 'array_values')) {
+            return null;
+        }
+        if ($node->var->isFirstClassCallable()) {
+            return null;
+        }
+        if (count($node->var->getArgs()) !== 1) {
+            return null;
+        }
+        if ($this->shouldSkip($node, $node)) {
+            return null;
+        }
+        $arrayArg = $node->var->getArgs()[0]->value;
+        if ($node->dim instanceof Int_ && $node->dim->value === 0) {
+            return $this->nodeFactory->createFuncCall('array_first', [$arrayArg]);
+        }
+        if ($node->dim instanceof Minus) {
+            if (!$node->dim->left instanceof FuncCall) {
+                return null;
+            }
+            if (!$this->isName($node->dim->left, 'count')) {
+                return null;
+            }
+            if ($node->dim->left->isFirstClassCallable()) {
+                return null;
+            }
+            if (count($node->dim->left->getArgs()) !== 1) {
+                return null;
+            }
+            if (!$node->dim->right instanceof Int_ || $node->dim->right->value !== 1) {
+                return null;
+            }
+            if (!$this->nodeComparator->areNodesEqual($arrayArg, $node->dim->left->getArgs()[0]->value)) {
+                return null;
+            }
+            return $this->nodeFactory->createFuncCall('array_last', [$arrayArg]);
+        }
+        return null;
+    }
+    private function shouldSkip(ArrayDimFetch $node, Node $scopeNode): bool
+    {
+        $scope = ScopeFetcher::fetch($scopeNode);
+        if ($scope->isInExpressionAssign($node)) {
+            return \true;
+        }
+        if ($node->getAttribute(AttributeKey::IS_UNSET_VAR)) {
+            return \true;
+        }
+        return \false;
     }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'cb73a3ab268c6ee5d988568d4b424c3c51dcbef1';
+    public const PACKAGE_VERSION = '8627ee851f09406dd25c32230f00d4ae367ee4e9';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-01-18 16:49:23';
+    public const RELEASE_DATE = '2026-01-18 20:50:15';
     /**
      * @var int
      */