Merge pull request #1383 from kukulich/final

Support for final modifier in traits
Roave · Mar 10, 2024 · d5cdeb9 · d5cdeb9
2 parents b656bf3 + 483e9d6
commit d5cdeb9
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Better Reflection - an improved code reflection API",
     "license": "MIT",
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.2",
         "ext-json": "*",
         "jetbrains/phpstorm-stubs": "2023.3",
         "nikic/php-parser": "^4.18.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -357,7 +357,13 @@ private function createMethodsFromTrait(ReflectionMethod $method): array
 
         if (array_key_exists($methodHash, $this->traitsData['modifiers'])) {
             // PhpParser modifiers are compatible with PHP reflection modifiers
-            $methodModifiers = ($methodModifiers & ~ Node\Stmt\Class_::VISIBILITY_MODIFIER_MASK) | $this->traitsData['modifiers'][$methodHash];
+            if ($this->traitsData['modifiers'][$methodHash] & Node\Stmt\Class_::VISIBILITY_MODIFIER_MASK) {
+                $methodModifiers = ($methodModifiers & ~ Node\Stmt\Class_::VISIBILITY_MODIFIER_MASK) | $this->traitsData['modifiers'][$methodHash];
+            }
+
+            if ($this->traitsData['modifiers'][$methodHash] & Node\Stmt\Class_::MODIFIER_FINAL) {
+                $methodModifiers |= Node\Stmt\Class_::MODIFIER_FINAL;
+            }
         }
 
         $createMethod = function (string|null $aliasMethodName) use ($method, $methodModifiers): ReflectionMethod {

diff --git a/test/unit/Fixture/TraitFixtureWithFinal.php b/test/unit/Fixture/TraitFixtureWithFinal.php
@@ -0,0 +1,21 @@
+<?php
+
+trait SimpleTrait
+{
+    protected function foo() {}
+    final protected function boo() {}
+}
+
+class TraitFixtureWithFinal
+{
+    use SimpleTrait {
+        foo as final;
+    }
+}
+
+class TraitFixtureWithPublic
+{
+    use SimpleTrait {
+        boo as public;
+    }
+}
diff --git a/test/unit/Reflection/ReflectionClassTest.php b/test/unit/Reflection/ReflectionClassTest.php
@@ -15,6 +15,7 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 use Qux;
 use ReflectionClass as CoreReflectionClass;
@@ -1617,6 +1618,31 @@ public function testMethodsFromTraits(): void
         self::assertSame('TraitFixtureTraitC2', $classInfo->getMethod('d_renamed')->getDeclaringClass()->getName());
     }
 
+    #[RequiresPhp('8.3')]
+    public function testMethodsFromTraitsWithFinal(): void
+    {
+        $reflector = new DefaultReflector(new SingleFileSourceLocator(
+            __DIR__ . '/../Fixture/TraitFixtureWithFinal.php',
+            $this->astLocator,
+        ));
+
+        $classInfo = $reflector->reflectClass('TraitFixtureWithFinal');
+
+        self::assertTrue($classInfo->hasMethod('foo'));
+        self::assertTrue($classInfo->getMethod('foo')->isFinal());
+        self::assertFalse($classInfo->getMethod('foo')->isPrivate());
+        self::assertTrue($classInfo->getMethod('foo')->isProtected());
+        self::assertFalse($classInfo->getMethod('foo')->isPublic());
+
+        $classInfo = $reflector->reflectClass('TraitFixtureWithPublic');
+
+        self::assertTrue($classInfo->hasMethod('boo'));
+        self::assertTrue($classInfo->getMethod('boo')->isFinal());
+        self::assertFalse($classInfo->getMethod('boo')->isPrivate());
+        self::assertFalse($classInfo->getMethod('boo')->isProtected());
+        self::assertTrue($classInfo->getMethod('boo')->isPublic());
+    }
+
     public function testMethodsFromTraitsWithConflicts(): void
     {
         $reflector = new DefaultReflector(new SingleFileSourceLocator(