Use properties instead of payloads

Author: bentleyo

src/Contracts/PropertyMorphableData.php

@@ -4,5 +4,5 @@
 
 interface PropertyMorphableData
 {
-    public static function morph(mixed ...$payloads): ?string;
+    public static function morph(array $properties): ?string;
 }

src/Resolvers/DataFromArrayResolver.php

@@ -4,6 +4,7 @@
 
 use ArgumentCountError;
 use Spatie\LaravelData\Contracts\BaseData;
+use Spatie\LaravelData\Contracts\PropertyMorphableData;
 use Spatie\LaravelData\Exceptions\CannotCreateData;
 use Spatie\LaravelData\Exceptions\CannotSetComputedValue;
 use Spatie\LaravelData\Optional;
@@ -28,6 +29,11 @@ public function execute(string $class, array $properties): BaseData
     {
         $dataClass = $this->dataConfig->getDataClass($class);
 
+        if ($propertyMorphableClass = $this->propertyMorphableClass($dataClass)) {
+            $class = $propertyMorphableClass::morph($properties) ?? $class;
+            $dataClass = $this->dataConfig->getDataClass($class);
+        }
+
         $data = $this->createData($dataClass, $properties);
 
         foreach ($dataClass->properties as $property) {
@@ -101,4 +107,14 @@ protected function createData(
             );
         }
     }
+
+    /**
+     * @return class-string<PropertyMorphableData>
+     */
+    protected function propertyMorphableClass(DataClass $dataClass): ?string
+    {
+        return $dataClass->isAbstract && $dataClass->propertyMorphable
+            ? $dataClass->name
+            : null;
+    }
 }

src/Resolvers/DataFromSomethingResolver.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Spatie\LaravelData\Contracts\BaseData;
-use Spatie\LaravelData\Contracts\PropertyMorphableData;
 use Spatie\LaravelData\Enums\CustomCreationMethodType;
 use Spatie\LaravelData\Optional;
 use Spatie\LaravelData\Support\Creation\CreationContext;
@@ -31,10 +30,6 @@ public function execute(
         CreationContext $creationContext,
         mixed ...$payloads
     ): BaseData {
-        if ($propertyMorphableClass = $this->propertyMorphableClass($class)) {
-            $class = $propertyMorphableClass::morph(...$payloads) ?? $class;
-        }
-
         if ($data = $this->createFromCustomCreationMethod($class, $creationContext, $payloads)) {
             return $data;
         }
@@ -65,18 +60,6 @@ public function execute(
         return $this->dataFromArrayResolver->execute($class, $properties);
     }
 
-    /**
-     * @return class-string<PropertyMorphableData>
-     */
-    protected function propertyMorphableClass(string $class): ?string
-    {
-        $dataClass = $this->dataConfig->getDataClass($class);
-
-        return $dataClass->isAbstract && $dataClass->propertyMorphable
-            ? $class
-            : null;
-    }
-
     protected function createFromCustomCreationMethod(
         string $class,
         CreationContext $creationContext,

tests/Fakes/PropertyMorphableData/AbstractPropertyMorphableData.php

@@ -14,9 +14,9 @@ public function __construct(
     ) {
     }
 
-    public static function morph(...$payloads): ?string
+    public static function morph(array $properties): ?string
     {
-        return match ($payloads[0]['variant'] ?? null) {
+        return match ($properties['variant'] ?? null) {
             'a' => PropertyMorphableDataA::class,
             'b' => PropertyMorphableDataB::class,
             default => null,