Merge pull request #674 from ondrejmirtes/fix-name

Ocramius · web-flow · commit b8f8acb423e0 · 2020-07-06T12:11:25.000+02:00
Fix `Adapter\ReflectionClass::$name` to be read from the reflection class adapter rather than the parent `ReflectionClass::$name`
diff --git a/src/Reflection/Adapter/ReflectionClass.php b/src/Reflection/Adapter/ReflectionClass.php
@@ -33,6 +33,8 @@ class ReflectionClass extends CoreReflectionClass
     public function __construct(BetterReflectionClass $betterReflectionClass)
     {
         $this->betterReflectionClass = $betterReflectionClass;
+
+        unset($this->name);
     }
 
     /**
@@ -69,6 +71,22 @@ public function __toString()
         return $this->betterReflectionClass->__toString();
     }
 
+    /**
+     * @param string $name
+     *
+     * @return mixed
+     *
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
+     */
+    public function __get($name)
+    {
+        if ($name === 'name') {
+            return $this->betterReflectionClass->getName();
+        }
+
+        throw new OutOfBoundsException(sprintf('Property %s::$%s does not exist.', self::class, $name));
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/test/unit/Reflection/Adapter/ReflectionClassTest.php b/test/unit/Reflection/Adapter/ReflectionClassTest.php
@@ -512,4 +512,24 @@ public function testGetReflectionConstantReturnsFalseWhenConstantDoesNotExist():
 
         self::assertFalse($reflectionClassAdapter->getReflectionConstant('FOO'));
     }
+
+    public function testPropertyName(): void
+    {
+        $betterReflectionClass = $this->createMock(BetterReflectionClass::class);
+        $betterReflectionClass
+            ->method('getName')
+            ->willReturn('Foo');
+
+        $reflectionClassAdapter = new ReflectionClassAdapter($betterReflectionClass);
+        self::assertSame('Foo', $reflectionClassAdapter->name);
+    }
+
+    public function testUnknownProperty(): void
+    {
+        $betterReflectionClass  = $this->createMock(BetterReflectionClass::class);
+        $reflectionClassAdapter = new ReflectionClassAdapter($betterReflectionClass);
+        $this->expectException(OutOfBoundsException::class);
+        $this->expectExceptionMessage('Property Roave\BetterReflection\Reflection\Adapter\ReflectionClass::$foo does not exist.');
+        $reflectionClassAdapter->foo;
+    }
 }
