Merge pull request #1470 from kukulich/hooks

Property visibility is not relevant for virtuality
Roave · Dec 18, 2024 · 9733d52 · 9733d52
2 parents a8b1cd7 + f39caf1
commit 9733d52
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -215,7 +215,6 @@
       <code><![CDATA[isProtected]]></code>
       <code><![CDATA[isProtectedSet]]></code>
       <code><![CDATA[isPublic]]></code>
-      <code><![CDATA[isPublic]]></code>
       <code><![CDATA[isReadonly]]></code>
       <code><![CDATA[isStatic]]></code>
       <code><![CDATA[traitExists]]></code>

diff --git a/src/Reflection/ReflectionProperty.php b/src/Reflection/ReflectionProperty.php
@@ -707,10 +707,10 @@ private function computeImmediateVirtual(PropertyNode $node): bool
             return true;
         }
 
-        return $this->computeImmediateVirtualBasedOnGetHook($node, $getHook);
+        return $this->computeImmediateVirtualBasedOnGetHook($getHook);
     }
 
-    private function computeImmediateVirtualBasedOnGetHook(PropertyNode $node, Node\PropertyHook $getHook): bool
+    private function computeImmediateVirtualBasedOnGetHook(Node\PropertyHook $getHook): bool
     {
         $getHookBody = $getHook->getStmts();
 
@@ -719,10 +719,6 @@ private function computeImmediateVirtualBasedOnGetHook(PropertyNode $node, Node\
             return true;
         }
 
-        if (! $node->isPublic()) {
-            return true;
-        }
-
         return ! $this->isHookUsingThisProperty($getHook);
     }
 

diff --git a/test/unit/Fixture/PropertyHooks.php b/test/unit/Fixture/PropertyHooks.php
@@ -35,15 +35,9 @@ abstract class ToBeVirtualOrNotToBeVirtualThatIsTheQuestion
 {
     public string $notVirtualBecauseNoHooks = 'string';
 
-    public string $notVirtualBecauseOfPublicVisibilityAndThePropertyIsUsedInGet {
+    public string $notVirtualBecauseThePropertyIsUsedInGet {
         get {
-            return strtoupper($this->notVirtualBecauseOfPublicVisibilityAndThePropertyIsUsedInGet);
-        }
-    }
-
-    protected string $virtualBecauseOfNotPublicVisibilityAndNoSet {
-        get {
-            return strtoupper($this->virtualBecauseOfNotPublicVisibilityAndNoSet);
+            return strtoupper($this->notVirtualBecauseThePropertyIsUsedInGet);
         }
     }
 

diff --git a/test/unit/Reflection/ReflectionPropertyTest.php b/test/unit/Reflection/ReflectionPropertyTest.php
@@ -1094,8 +1094,7 @@ public static function virtualProvider(): array
     {
         return [
             ['notVirtualBecauseNoHooks', false],
-            ['notVirtualBecauseOfPublicVisibilityAndThePropertyIsUsedInGet', false],
-            ['virtualBecauseOfNotPublicVisibilityAndNoSet', true],
+            ['notVirtualBecauseThePropertyIsUsedInGet', false],
             ['notVirtualBecauseOfShortSyntax', false],
             ['virtualBecauseThePropertyIsNotUsedInGet', true],
             ['virtualBecauseSetWorksWithDifferentProperty', true],