Merge pull request #10091 from vudaltsov/improve-refelection-stubs

vimeo · Feb 8, 2024 · fa5f150 · fa5f150
2 parents f9a2314 + f9ff9d3
commit fa5f150
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -10631,7 +10631,7 @@
 'ReflectionParameter::getDefaultValue' => ['mixed'],
 'ReflectionParameter::getDefaultValueConstantName' => ['?string'],
 'ReflectionParameter::getName' => ['string'],
-'ReflectionParameter::getPosition' => ['int'],
+'ReflectionParameter::getPosition' => ['int<0, max>'],
 'ReflectionParameter::getType' => ['?ReflectionType'],
 'ReflectionParameter::hasType' => ['bool'],
 'ReflectionParameter::isArray' => ['bool'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -5969,7 +5969,7 @@
     'ReflectionParameter::getDefaultValue' => ['mixed'],
     'ReflectionParameter::getDefaultValueConstantName' => ['?string'],
     'ReflectionParameter::getName' => ['string'],
-    'ReflectionParameter::getPosition' => ['int'],
+    'ReflectionParameter::getPosition' => ['int<0, max>'],
     'ReflectionParameter::getType' => ['?ReflectionType'],
     'ReflectionParameter::hasType' => ['bool'],
     'ReflectionParameter::isArray' => ['bool'],

diff --git a/stubs/Php80.phpstub b/stubs/Php80.phpstub
@@ -28,7 +28,7 @@ class ReflectionAttribute
 
     /**
      * @psalm-pure
-     * @return int-mask-of<Attribute::TARGET_*>
+     * @return Attribute::TARGET_*
      */
     public function getTarget() : int
     {

diff --git a/stubs/Reflection.phpstub b/stubs/Reflection.phpstub
@@ -416,7 +416,7 @@ abstract class ReflectionFunctionAbstract implements Reflector
      * @since 8.0
      * @template TClass as object
      * @param class-string<TClass>|null $name
-     * @return ($name is null ? array<ReflectionAttribute<object>> : array<ReflectionAttribute<TClass>>)
+     * @return ($name is null ? list<ReflectionAttribute<object>> : list<ReflectionAttribute<TClass>>)
      */
     public function getAttributes(?string $name = null, int $flags = 0): array {}
 }
@@ -463,7 +463,7 @@ class ReflectionProperty implements Reflector
      * @since 8.0
      * @template TClass as object
      * @param class-string<TClass>|null $name
-     * @return ($name is null ? array<ReflectionAttribute<object>> : array<ReflectionAttribute<TClass>>)
+     * @return ($name is null ? list<ReflectionAttribute<object>> : list<ReflectionAttribute<TClass>>)
      */
     public function getAttributes(?string $name = null, int $flags = 0): array {}
 
@@ -540,7 +540,7 @@ class ReflectionProperty implements Reflector
 class ReflectionMethod extends ReflectionFunctionAbstract
 {
     /**
-     * @var string
+     * @var non-empty-string
      * @readonly
      */
     public $name;
@@ -599,7 +599,7 @@ class ReflectionClassConstant implements Reflector
      * @since 8.0
      * @template TClass as object
      * @param class-string<TClass>|null $name
-     * @return ($name is null ? array<ReflectionAttribute<object>> : array<ReflectionAttribute<TClass>>)
+     * @return ($name is null ? list<ReflectionAttribute<object>> : list<ReflectionAttribute<TClass>>)
      */
     public function getAttributes(?string $name = null, int $flags = 0): array {}
 
@@ -635,7 +635,7 @@ class ReflectionParameter implements Reflector {
      * @since 8.0
      * @template TClass as object
      * @param class-string<TClass>|null $name
-     * @return ($name is null ? array<ReflectionAttribute<object>> : array<ReflectionAttribute<TClass>>)
+     * @return ($name is null ? list<ReflectionAttribute<object>> : list<ReflectionAttribute<TClass>>)
      */
     public function getAttributes(?string $name = null, int $flags = 0): array {}