Reduce reused logic

bentleyo · Jan 29, 2025 · 8d61583 · 8d61583
1 parent 1c8b231
commit 8d61583
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/src/Resolvers/DataFromSomethingResolver.php b/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,14 +127,13 @@ 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)
+                $morphableProperties && $morph = $class::morph($morphableProperties)
             ) {
                 return $this->execute($morph, $creationContext, ...$payloads);
             }

diff --git a/src/Resolvers/DataValidationRulesResolver.php b/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;
         }
 

diff --git a/src/Support/DataClass.php b/src/Support/DataClass.php
@@ -35,8 +35,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 +58,20 @@ public function prepareForCache(): void
             }
         }
     }
+
+    public function propertiesForMorph(array $properties): ?array
+    {
+        $requiredPropertyNames = $this->properties->filter(fn (DataProperty $property) => $property->isForMorph)
+            ->pluck('name');
+
+        $forMorph = collect($properties)
+            ->only($requiredPropertyNames);
+
+        // If all required properties are not present, return null
+        if ($forMorph->count() !== $requiredPropertyNames->count()) {
+            return null;
+        }
+
+        return $forMorph->all();
+    }
 }
diff --git a/src/Support/Factories/DataClassFactory.php b/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)
         );
     }