Updated Rector to commit a0d324465a4cbccb9236bc69f41069da89d01baf

rectorphp/rector-src@a0d3244 [Php74][Php81] Allow mixed key on ArraySpreadInsteadOfArrayMergeRector on php 8.1 version feature enabled (#5190)
rectorphp · Oct 22, 2023 · c6f4005 · c6f4005
1 parent 440cc19
commit c6f4005
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php b/rules/Php74/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
@@ -96,6 +96,9 @@ public function provideMinPhpVersion() : int
     }
     private function refactorArray(FuncCall $funcCall) : ?Array_
     {
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
         $array = new Array_();
         foreach ($funcCall->args as $arg) {
             if (!$arg instanceof Arg) {
@@ -135,10 +138,8 @@ private function isArrayKeyTypeAllowed(ArrayType $arrayType) : bool
         if ($arrayType->getKeyType()->isInteger()->yes()) {
             return \true;
         }
-        if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ARRAY_SPREAD_STRING_KEYS)) {
-            return \false;
-        }
-        return $arrayType->getKeyType()->isString()->yes();
+        // php 8.1+ allow mixed key: int, string, and null
+        return $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ARRAY_SPREAD_STRING_KEYS);
     }
     private function resolveValue(Expr $expr) : Expr
     {

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '5ac3cb377abf968396c23573d8562e6ab6967f2a';
+    public const PACKAGE_VERSION = 'a0d324465a4cbccb9236bc69f41069da89d01baf';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-10-19 20:44:46';
+    public const RELEASE_DATE = '2023-10-22 12:09:33';
     /**
      * @var int
      */