Refactoring

bentleyo · Jan 3, 2025 · 17be5be · 17be5be
1 parent b978297
commit 17be5be
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/src/Resolvers/DataFromSomethingResolver.php b/src/Resolvers/DataFromSomethingResolver.php
@@ -41,22 +41,23 @@ public function execute(
 
         if ($payloadCount === 0 || $payloadCount === 1) {
             $properties = $pipeline->execute($payloads[0] ?? [], $creationContext);
-        } else {
-            $properties = [];
 
-            foreach ($payloads as $payload) {
-                foreach ($pipeline->execute($payload, $creationContext) as $key => $value) {
-                    if (array_key_exists($key, $properties) && ($value === null || $value instanceof Optional)) {
-                        continue;
-                    }
+            return $this->dataFromArray($class, $creationContext, $payloads, $properties);
+        }
+
+        $properties = [];
 
-                    $properties[$key] = $value;
+        foreach ($payloads as $payload) {
+            foreach ($pipeline->execute($payload, $creationContext) as $key => $value) {
+                if (array_key_exists($key, $properties) && ($value === null || $value instanceof Optional)) {
+                    continue;
                 }
+
+                $properties[$key] = $value;
             }
         }
 
-        return $this->propertyMorphedData($class, $creationContext, $payloads, $properties)
-            ?? $this->dataFromArrayResolver->execute($class, $properties);
+        return $this->dataFromArray($class, $creationContext, $payloads, $properties);
     }
 
     protected function createFromCustomCreationMethod(
@@ -117,12 +118,12 @@ protected function createFromCustomCreationMethod(
         return $class::$methodName(...$payloads);
     }
 
-    protected function propertyMorphedData(
+    protected function dataFromArray(
         string $class,
         CreationContext $creationContext,
         array $payloads,
         array $properties,
-    ): ?BaseData {
+    ): BaseData {
         $dataClass = $this->dataConfig->getDataClass($class);
 
         if ($dataClass->isAbstract && $dataClass->propertyMorphable) {
@@ -134,6 +135,6 @@ protected function propertyMorphedData(
             }
         }
 
-        return null;
+        return $this->dataFromArrayResolver->execute($class, $properties);
     }
 }
diff --git a/src/Resolvers/DataValidationRulesResolver.php b/src/Resolvers/DataValidationRulesResolver.php
@@ -35,9 +35,12 @@ public function execute(
     ): array {
         $dataClass = $this->dataConfig->getDataClass($class);
 
-        if ($propertyMorphableClass = $this->propertyMorphableClass($dataClass)) {
+        if ($this->isPropertyMorphable($dataClass)) {
+            /**
+             * @var class-string<PropertyMorphableData> $class
+             */
             $payload = $path->isRoot() ? $fullPayload : Arr::get($fullPayload, $path->get(), []);
-            $class = $propertyMorphableClass::morph($payload) ?? $class;
+            $class = $class::morph($payload) ?? $class;
             $dataClass = $this->dataConfig->getDataClass($class);
         }
 
@@ -286,13 +289,8 @@ protected function inferRulesForDataProperty(
         );
     }
 
-    /**
-     * @return class-string<PropertyMorphableData>
-     */
-    protected function propertyMorphableClass(DataClass $dataClass): ?string
+    protected function isPropertyMorphable(DataClass $dataClass): bool
     {
-        return $dataClass->isAbstract && $dataClass->propertyMorphable
-            ? $dataClass->name
-            : null;
+        return $dataClass->isAbstract && $dataClass->propertyMorphable;
     }
 }