Merge pull request #9085 from BenMorel/newInstanceArgs

Fix ReflectionClass::newInstanceArgs() with named parameters
vimeo · Jan 19, 2023 · a4d1b06 · a4d1b06
2 parents d32aca3 + a669c89
commit a4d1b06
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -11385,7 +11385,7 @@
 'ReflectionClass::isTrait' => ['bool'],
 'ReflectionClass::isUserDefined' => ['bool'],
 'ReflectionClass::newInstance' => ['object', '...args='=>'mixed'],
-'ReflectionClass::newInstanceArgs' => ['object', 'args='=>'array<array-key, mixed>'],
+'ReflectionClass::newInstanceArgs' => ['object', 'args='=>'list<mixed>|array<string, mixed>'],
 'ReflectionClass::newInstanceWithoutConstructor' => ['object'],
 'ReflectionClass::setStaticPropertyValue' => ['void', 'name'=>'string', 'value'=>'mixed'],
 'ReflectionClassConstant::__construct' => ['void', 'class'=>'mixed', 'name'=>'string'],
@@ -11588,7 +11588,7 @@
 'ReflectionObject::isTrait' => ['bool'],
 'ReflectionObject::isUserDefined' => ['bool'],
 'ReflectionObject::newInstance' => ['object', 'args='=>'mixed', '...args='=>'array'],
-'ReflectionObject::newInstanceArgs' => ['object', 'args='=>'array'],
+'ReflectionObject::newInstanceArgs' => ['object', 'args='=>'list<mixed>|array<string, mixed>'],
 'ReflectionObject::newInstanceWithoutConstructor' => ['object'],
 'ReflectionObject::setStaticPropertyValue' => ['void', 'name'=>'string', 'value'=>'string'],
 'ReflectionParameter::__clone' => ['void'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -259,12 +259,16 @@
     ],
     'ReflectionClass::newInstanceArgs' => [
       'old' => ['object', 'args='=>'list<mixed>'],
-      'new' => ['object', 'args='=>'array<array-key, mixed>'],
+      'new' => ['object', 'args='=>'list<mixed>|array<string, mixed>'],
     ],
     'ReflectionMethod::getClosure' => [
       'old' => ['?Closure', 'object='=>'object'],
       'new' => ['Closure', 'object='=>'?object'],
     ],
+    'ReflectionObject::newInstanceArgs' => [
+      'old' => ['object', 'args='=>'list<mixed>'],
+      'new' => ['object', 'args='=>'list<mixed>|array<string, mixed>'],
+    ],
     'ReflectionProperty::getValue' => [
       'old' => ['mixed', 'object='=>'object'],
       'new' => ['mixed', 'object='=>'null|object'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -6215,7 +6215,7 @@
     'ReflectionObject::isTrait' => ['bool'],
     'ReflectionObject::isUserDefined' => ['bool'],
     'ReflectionObject::newInstance' => ['object', 'args='=>'mixed', '...args='=>'array'],
-    'ReflectionObject::newInstanceArgs' => ['object', 'args='=>'array'],
+    'ReflectionObject::newInstanceArgs' => ['object', 'args='=>'list<mixed>'],
     'ReflectionObject::newInstanceWithoutConstructor' => ['object'],
     'ReflectionObject::setStaticPropertyValue' => ['void', 'name'=>'string', 'value'=>'string'],
     'ReflectionParameter::__clone' => ['void'],

diff --git a/stubs/Php80.phpstub b/stubs/Php80.phpstub
@@ -110,6 +110,13 @@ class ReflectionClass implements Reflector {
      * @psalm-pure
      */
     public function getExtensionName(): string|false {}
+
+    /**
+     * @param list<mixed>|array<string, mixed> $args
+     *
+     * @return T
+     */
+    public function newInstanceArgs(array $args): object {}
 }
 
 /** @psalm-immutable */

diff --git a/stubs/Reflection.phpstub b/stubs/Reflection.phpstub
@@ -196,7 +196,7 @@ class ReflectionClass implements Reflector {
     public function newInstance(...$args): object {}
 
     /**
-     * @param array<int, mixed> $args
+     * @param list<mixed> $args
      *
      * @return T
      */