Public readonly property is implicitly protected(set)

Roave · Dec 30, 2024 · b3dc8b1 · b3dc8b1
1 parent edf93e1
commit b3dc8b1
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -219,6 +219,8 @@
       <code><![CDATA[isProtected]]></code>
       <code><![CDATA[isProtectedSet]]></code>
       <code><![CDATA[isPublic]]></code>
+      <code><![CDATA[isPublic]]></code>
+      <code><![CDATA[isPublicSet]]></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
@@ -666,7 +666,7 @@ private function assertObject(mixed $object): object
     /** @return int-mask-of<ReflectionPropertyAdapter::IS_*> */
     private function computeModifiers(PropertyNode $node): int
     {
-        $modifiers  = $node->isReadonly() ? ReflectionPropertyAdapter::IS_READONLY : 0;
+        $modifiers  = $node->isReadonly() ? CoreReflectionProperty::IS_READONLY : 0;
         $modifiers += $node->isStatic() ? CoreReflectionProperty::IS_STATIC : 0;
         $modifiers += $node->isPrivate() ? CoreReflectionProperty::IS_PRIVATE : 0;
         $modifiers += ! $node->isPrivate() && $node->isPrivateSet() ? ReflectionPropertyAdapter::IS_PRIVATE_SET_COMPATIBILITY : 0;
@@ -683,6 +683,15 @@ private function computeModifiers(PropertyNode $node): int
             $modifiers += ReflectionPropertyAdapter::IS_FINAL_COMPATIBILITY;
         }
 
+        if (
+            ! ($modifiers & (ReflectionPropertyAdapter::IS_PROTECTED_SET_COMPATIBILITY | ReflectionPropertyAdapter::IS_PRIVATE_SET_COMPATIBILITY))
+            && ! $node->isPublicSet()
+            && $node->isPublic()
+            && ($modifiers & CoreReflectionProperty::IS_READONLY)
+        ) {
+            $modifiers += ReflectionPropertyAdapter::IS_PROTECTED_SET_COMPATIBILITY;
+        }
+
         /** @phpstan-ignore return.type */
         return $modifiers;
     }

diff --git a/test/unit/Fixture/AsymmetricVisibilityImplicitProtectedSet.php b/test/unit/Fixture/AsymmetricVisibilityImplicitProtectedSet.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Roave\BetterReflectionTest\Fixture;
+
+class AsymmetricVisibilityImplicitProtectedSet
+{
+    public public(set) readonly bool $publicPublicSet;
+    public protected(set) readonly bool $publicProtectedSet;
+    public private(set) readonly bool $publicPrivateSet;
+
+    protected readonly bool $protected;
+    private readonly bool $private;
+
+    public readonly bool $publicImplicitProtectedSet;
+}
diff --git a/test/unit/Reflection/ReflectionPropertyTest.php b/test/unit/Reflection/ReflectionPropertyTest.php
@@ -272,7 +272,7 @@ public static function modifierProvider(): array
             ['protectedProperty', CoreReflectionProperty::IS_PROTECTED],
             ['privateProperty', CoreReflectionProperty::IS_PRIVATE],
             ['publicStaticProperty', CoreReflectionProperty::IS_PUBLIC | CoreReflectionProperty::IS_STATIC],
-            ['readOnlyProperty', CoreReflectionProperty::IS_PUBLIC | ReflectionPropertyAdapter::IS_READONLY],
+            ['readOnlyProperty', CoreReflectionProperty::IS_PUBLIC | ReflectionPropertyAdapter::IS_READONLY | ReflectionPropertyAdapter::IS_PROTECTED_SET_COMPATIBILITY],
             ['finalPublicProperty', CoreReflectionProperty::IS_PUBLIC | ReflectionPropertyAdapter::IS_FINAL_COMPATIBILITY],
         ];
     }
@@ -989,6 +989,29 @@ public function testAsymmetricVisibilityImplicitFinal(string $propertyName, bool
         self::assertSame($isFinal, $property->isFinal());
     }
 
+    /** @return list<array{0: non-empty-string, 1: bool}> */
+    public static function asymmetricVisibilityImplicitProtectedSetProvider(): array
+    {
+        return [
+            ['publicPublicSet', false],
+            ['publicProtectedSet', true],
+            ['publicPrivateSet', false],
+            ['protected', false],
+            ['publicImplicitProtectedSet', true],
+        ];
+    }
+
+    /** @param non-empty-string $propertyName */
+    #[DataProvider('asymmetricVisibilityImplicitProtectedSetProvider')]
+    public function testAsymmetricVisibilityImplicitProtectedSet(string $propertyName, bool $isProtectedSet): void
+    {
+        $reflector = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/AsymmetricVisibilityImplicitProtectedSet.php', $this->astLocator));
+        $classInfo = $reflector->reflectClass('Roave\BetterReflectionTest\Fixture\AsymmetricVisibilityImplicitProtectedSet');
+        $property  = $classInfo->getProperty($propertyName);
+
+        self::assertSame($isProtectedSet, $property->isProtectedSet());
+    }
+
     public function testIsAbstract(): void
     {
         $reflector = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/PropertyHooks.php', $this->astLocator));