Fixup PHP Promotion reflection issues

Author: mikeymike

src/Exercise/PhpPromotion.php

@@ -98,20 +98,21 @@ public function check(Input $input): ResultInterface
         ];
 
         $properties = collect($reflectionClass->getProperties());
-        $properties = $properties->flatMap(fn (\ReflectionProperty $prop) => [
+        $visibilities = $properties->flatMap(fn (\ReflectionProperty $prop) => [
             $prop->getName() => $this->getPropertyVisibility($prop)
-        ])->getArrayCopy();
-        ksort($properties);
+        ])->ksort();
 
-        if ($changedVisibility = array_keys(array_diff_assoc($expectedProperties, $properties))) {
+        if ($changedVisibility = array_keys(array_diff_assoc($expectedProperties, $visibilities->getArrayCopy()))) {
             return Failure::fromNameAndReason($this->getName(), pluralise(
                 'Visibility changed for property "%s"',
                 $changedVisibility,
                 implode('" & "', $changedVisibility)
             ));
         }
 
-        $types = $properties->map(fn (\ReflectionProperty $prop) => $prop->getType()?->getName());
+        $types = $properties->flatMap(fn (\ReflectionProperty $prop) => [
+            $prop->getName() => $this->getPropertyType($prop)
+        ]);
         $expected = ['visitor' => 'Closure', 'key' => 'string', 'basePath' => 'string'];
         if ([] !== $typeDiff = array_diff_assoc($expected, $types->getArrayCopy())) {
             return Failure::fromNameAndReason($this->getName(), pluralise(
@@ -132,7 +133,9 @@ public function check(Input $input): ResultInterface
 
         $actual = $properties
             ->each(fn (\ReflectionProperty $prop) => $prop->setAccessible(true))
-            ->map(fn (\ReflectionProperty $prop) => $prop->isInitialized($obj) ? $prop->getValue($obj) : null)
+            ->flatMap(fn (\ReflectionProperty $prop) => [
+                $prop->getName() => $prop->isInitialized($obj) ? $prop->getValue($obj) : null
+            ])
             ->getArrayCopy();
 
         $dataFailures = array_filter([
@@ -160,4 +163,15 @@ private function getPropertyVisibility(\ReflectionProperty $prop): string
         default => 'public',
         };
     }
+
+    private function getPropertyType(\ReflectionProperty $prop): string
+    {
+        $type = $prop->getType();
+
+        if (null === $type || !$type instanceof \ReflectionNamedType) {
+            throw new \RuntimeException('Invalid property "%s"', $prop->getName());
+        }
+        /** @var \ReflectionNamedType $type */
+        return $type->getName();
+    }
 }