Fix method signatures for ReflectionProperty

vimeo · Jan 16, 2022 · 96b6e16 · 96b6e16
1 parent 3c726e7
commit 96b6e16
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -11605,16 +11605,16 @@
 'ReflectionProperty::getModifiers' => ['int'],
 'ReflectionProperty::getName' => ['string'],
 'ReflectionProperty::getType' => ['?ReflectionType'],
-'ReflectionProperty::getValue' => ['mixed', 'object='=>'object'],
+'ReflectionProperty::getValue' => ['mixed', 'object='=>'object|null'],
 'ReflectionProperty::hasType' => ['bool'],
 'ReflectionProperty::isDefault' => ['bool'],
 'ReflectionProperty::isPrivate' => ['bool'],
 'ReflectionProperty::isProtected' => ['bool'],
 'ReflectionProperty::isPublic' => ['bool'],
 'ReflectionProperty::isStatic' => ['bool'],
 'ReflectionProperty::setAccessible' => ['void', 'visible'=>'bool'],
-'ReflectionProperty::setValue' => ['void', 'object'=>'null|object', 'value'=>''],
-'ReflectionProperty::setValue\'1' => ['void', 'value'=>''],
+'ReflectionProperty::setValue' => ['void', 'objectOrValue'=>'mixed', 'value='=>'mixed'],
+'ReflectionProperty::setValue\'1' => ['void', 'value'=>'mixed'],
 'ReflectionType::__clone' => ['void'],
 'ReflectionType::__toString' => ['string'],
 'ReflectionType::allowsNull' => ['bool'],

diff --git a/tests/MethodSignatureTest.php b/tests/MethodSignatureTest.php
@@ -310,6 +310,30 @@ public function __soapCall(
         $this->analyzeFile('somefile.php', new Context());
     }
 
+    public function testExtendReflectionPropertyOnPhp8(): void
+    {
+        $this->project_analyzer->setPhpVersion('8.0', 'tests');
+
+        $this->addFile(
+            'MyReflectionProperty.php',
+            '<?php
+                class MyReflectionProperty extends ReflectionProperty
+                {
+                    public function getValue(?object $object = null): mixed
+                    {
+                        return parent::getValue($object);
+                    }
+
+                    public function setValue(mixed $objectOrValue, mixed $value = null): void
+                    {
+                        parent::setValue($objectOrValue, $value);
+                    }
+                }'
+        );
+
+        $this->analyzeFile('MyReflectionProperty.php', new Context());
+    }
+
     /**
      * @return iterable<string,array{string,assertions?:array<string,string>,error_levels?:string[]}>
      */