Property hook can be final

Roave · Dec 30, 2024 · 166e4ca · 166e4ca
1 parent 9e682f8
commit 166e4ca
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -166,6 +166,7 @@
       <code><![CDATA[classExists]]></code>
       <code><![CDATA[isAbstract]]></code>
       <code><![CDATA[isFinal]]></code>
+      <code><![CDATA[isFinal]]></code>
       <code><![CDATA[isPrivate]]></code>
       <code><![CDATA[isProtected]]></code>
       <code><![CDATA[isPublic]]></code>

diff --git a/src/Reflection/ReflectionMethod.php b/src/Reflection/ReflectionMethod.php
@@ -53,7 +53,7 @@ private function __construct(
         assert($node instanceof MethodNode || $node instanceof Node\PropertyHook);
 
         $this->name      = $name;
-        $this->modifiers = $node instanceof MethodNode ? $this->computeModifiers($node) : 0;
+        $this->modifiers = $this->computeModifiers($node);
 
         $this->fillFromNode($node);
     }
@@ -305,13 +305,18 @@ public function getModifiers(): int
     }
 
     /** @return int-mask-of<ReflectionMethodAdapter::IS_*> */
-    private function computeModifiers(MethodNode $node): int
+    private function computeModifiers(MethodNode|Node\PropertyHook $node): int
     {
-        $modifiers  = $node->isStatic() ? CoreReflectionMethod::IS_STATIC : 0;
-        $modifiers += $node->isPublic() ? CoreReflectionMethod::IS_PUBLIC : 0;
-        $modifiers += $node->isProtected() ? CoreReflectionMethod::IS_PROTECTED : 0;
-        $modifiers += $node->isPrivate() ? CoreReflectionMethod::IS_PRIVATE : 0;
-        $modifiers += $node->isAbstract() ? CoreReflectionMethod::IS_ABSTRACT : 0;
+        $modifiers = 0;
+
+        if ($node instanceof MethodNode) {
+            $modifiers += $node->isStatic() ? CoreReflectionMethod::IS_STATIC : 0;
+            $modifiers += $node->isPublic() ? CoreReflectionMethod::IS_PUBLIC : 0;
+            $modifiers += $node->isProtected() ? CoreReflectionMethod::IS_PROTECTED : 0;
+            $modifiers += $node->isPrivate() ? CoreReflectionMethod::IS_PRIVATE : 0;
+            $modifiers += $node->isAbstract() ? CoreReflectionMethod::IS_ABSTRACT : 0;
+        }
+
         $modifiers += $node->isFinal() ? CoreReflectionMethod::IS_FINAL : 0;
 
         return $modifiers;

diff --git a/test/unit/Fixture/PropertyHooks.php b/test/unit/Fixture/PropertyHooks.php
@@ -153,3 +153,14 @@ class GetPropertyHooksReturnTypes
     public $hookWithoutType { get => 'string'; }
 
 }
+
+class FinalPropertyHooks
+{
+    public string $notFinalHook {
+        set => strtolower($value);
+    }
+
+    public string $finalHook {
+        final set => strtolower($value);
+    }
+}
diff --git a/test/unit/Reflection/ReflectionMethodTest.php b/test/unit/Reflection/ReflectionMethodTest.php
@@ -882,4 +882,25 @@ public function testGetPropertyHookReturnType(string $propertyName, string|null
         self::assertNotNull($getHookReflection);
         self::assertSame($returnType, $getHookReflection->getReturnType()?->__toString());
     }
+
+    /** @return list<array{0: non-empty-string, 1: bool}> */
+    public static function finalPropertyHookProvider(): array
+    {
+        return [
+            ['notFinalHook', false],
+            ['finalHook', true],
+        ];
+    }
+
+    #[DataProvider('finalPropertyHookProvider')]
+    public function testFinalPropertyHook(string $propertyName, bool $isFinal): void
+    {
+        $reflector = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/PropertyHooks.php', $this->astLocator));
+        $classInfo = $reflector->reflectClass('Roave\BetterReflectionTest\Fixture\FinalPropertyHooks');
+
+        $hookProperty   = $classInfo->getProperty($propertyName);
+        $hookReflection = $hookProperty->getHook(ReflectionPropertyHookType::Set);
+        self::assertNotNull($hookReflection);
+        self::assertSame($isFinal, $hookReflection->isFinal());
+    }
 }