Reduce reused logic

Author: bentleyo

src/Resolvers/DataFromSomethingResolver.php

@@ -3,7 +3,6 @@
 namespace Spatie\LaravelData\Resolvers;
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Spatie\LaravelData\Contracts\BaseData;
 use Spatie\LaravelData\Contracts\PropertyMorphableData;
 use Spatie\LaravelData\Enums\CustomCreationMethodType;
@@ -128,15 +127,12 @@ protected function dataFromArray(
         $dataClass = $this->dataConfig->getDataClass($class);
 
         if ($dataClass->isAbstract && $dataClass->propertyMorphable) {
-            $morphableProperties = Arr::only($properties, $dataClass->propertyMorphablePropertyNames);
+            $morphableProperties = $dataClass->propertiesForMorph($properties);
 
             /**
              * @var class-string<PropertyMorphableData> $class
              */
-            if (
-                count($morphableProperties) === count($dataClass->propertyMorphablePropertyNames)
-                && $morph = $class::morph($morphableProperties)
-            ) {
+            if ($morphableProperties && $morph = $class::morph($morphableProperties)) {
                 return $this->execute($morph, $creationContext, ...$payloads);
             }
         }

src/Resolvers/DataValidationRulesResolver.php

@@ -119,10 +119,8 @@ protected function propertyMorphableDataClass(
         }
 
         // Restrict to only morphable properties
-        $properties = Arr::only($properties, $dataClass->propertyMorphablePropertyNames);
-
-        // Only morph if all properties are present
-        if (count($properties) !== count($dataClass->propertyMorphablePropertyNames)) {
+        $properties = $dataClass->propertiesForMorph($properties);
+        if ($properties === null) {
             return null;
         }
 

src/Support/DataClass.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\LaravelData\Support;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 /**
@@ -35,8 +36,7 @@ public function __construct(
         public DataStructureProperty $allowedRequestOnly,
         public DataStructureProperty $allowedRequestExcept,
         public DataStructureProperty $outputMappedProperties,
-        public DataStructureProperty $transformationFields,
-        public readonly array $propertyMorphablePropertyNames
+        public DataStructureProperty $transformationFields
     ) {
     }
 
@@ -59,4 +59,17 @@ public function prepareForCache(): void
             }
         }
     }
+
+    public function propertiesForMorph(array $properties): ?array
+    {
+        $requiredProperties = $this->properties->filter(fn (DataProperty $property) => $property->isForMorph)->pluck('name');
+        $forMorph = Arr::only($properties, $requiredProperties->all());
+
+        // If all required properties are not present, return null
+        if (count($forMorph) !== $requiredProperties->count()) {
+            return null;
+        }
+
+        return $forMorph;
+    }
 }

src/Support/Factories/DataClassFactory.php

@@ -103,11 +103,7 @@ public function build(ReflectionClass $reflectionClass): DataClass
             allowedRequestOnly: new LazyDataStructureProperty(fn (): ?array => $responsable ? $name::allowedRequestOnly() : null),
             allowedRequestExcept: new LazyDataStructureProperty(fn (): ?array => $responsable ? $name::allowedRequestExcept() : null),
             outputMappedProperties: $outputMappedProperties,
-            transformationFields: static::resolveTransformationFields($properties),
-            propertyMorphablePropertyNames: $properties->filter(fn (DataProperty $property) => $property->isForMorph)
-                ->map(fn (DataProperty $property) => $property->name)
-                ->values()
-                ->all(),
+            transformationFields: static::resolveTransformationFields($properties)
         );
     }