Check all properties for visibility change

Author: mikeymike

composer.lock

@@ -91,15 +91,23 @@ public function check(Input $input): ResultInterface
             return Failure::fromNameAndReason($this->getName(), 'Property "config" should not be promoted');
         }
 
+        $expectedProperties = [
+            'basePath' => 'protected',
+            'key' => 'private',
+            'visitor' => 'private',
+        ];
+
         $properties = collect($reflectionClass->getProperties());
-        $properties = $properties->flatMap(fn (\ReflectionProperty $prop) => [$prop->getName() => $prop]);
-        $private = $properties->filter(fn (\ReflectionProperty $prop) => $prop->isPrivate());
+        $properties = $properties->flatMap(fn (\ReflectionProperty $prop) => [
+            $prop->getName() => $this->getPropertyVisibility($prop)
+        ])->getArrayCopy();
+        ksort($properties);
 
-        if ($notPrivate = array_diff(['visitor', 'key'], $private->keys()->getArrayCopy())) {
+        if ($changedVisibility = array_keys(array_diff_assoc($expectedProperties, $properties))) {
             return Failure::fromNameAndReason($this->getName(), pluralise(
-                'Visibility changed for property %s',
-                $notPrivate,
-                implode('" & "', $notPrivate)
+                'Visibility changed for property "%s"',
+                $changedVisibility,
+                implode('" & "', $changedVisibility)
             ));
         }
 
@@ -143,4 +151,13 @@ public function check(Input $input): ResultInterface
 
         return new Success($this->getName());
     }
+
+    private function getPropertyVisibility(\ReflectionProperty $prop): string
+    {
+        return match (true) {
+            $prop->isPrivate() => 'private',
+            $prop->isProtected() => 'protected',
+        default => 'public',
+        };
+    }
 }

src/Exercise/PhpPromotion.php

@@ -72,7 +72,7 @@ public function testFailureWhenPropertyVisibilityChanges()
 
         $this->assertVerifyWasNotSuccessful();
 
-        $this->assertResultsHasFailure(Failure::class, 'Visibility changed for properties "key" & "basePath"');
+        $this->assertResultsHasFailure(Failure::class, 'Visibility changed for properties "basePath" & "key"');
     }
 
     public function testBadPropertyPromotion()