Fix phpstan issues

Author: bentleyo

src/Resolvers/DataFromSomethingResolver.php

@@ -4,6 +4,7 @@
 
 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;
@@ -30,8 +31,8 @@ public function execute(
         CreationContext $creationContext,
         mixed ...$payloads
     ): BaseData {
-        if ($this->isPropertyMorphable($class)) {
-            $class = $class::morph(...$payloads) ?? $class;
+        if ($propertyMorphableClass = $this->propertyMorphableClass($class)) {
+            $class = $propertyMorphableClass::morph(...$payloads) ?? $class;
         }
 
         if ($data = $this->createFromCustomCreationMethod($class, $creationContext, $payloads)) {
@@ -64,12 +65,16 @@ public function execute(
         return $this->dataFromArrayResolver->execute($class, $properties);
     }
 
-    protected function isPropertyMorphable(string $class): bool
+    /**
+     * @return class-string<PropertyMorphableData>
+     */
+    protected function propertyMorphableClass(string $class): ?string
     {
-        $dataClass = $this->dataConfig
-            ->getDataClass($class);
+        $dataClass = $this->dataConfig->getDataClass($class);
 
-        return $dataClass->isAbstract && $dataClass->propertyMorphable;
+        return $dataClass->isAbstract && $dataClass->propertyMorphable
+            ? $class
+            : null;
     }
 
     protected function createFromCustomCreationMethod(

src/Resolvers/DataValidationRulesResolver.php

@@ -7,6 +7,7 @@
 use Illuminate\Validation\Rule;
 use Spatie\LaravelData\Attributes\Validation\ArrayType;
 use Spatie\LaravelData\Attributes\Validation\Present;
+use Spatie\LaravelData\Contracts\PropertyMorphableData;
 use Spatie\LaravelData\Support\DataClass;
 use Spatie\LaravelData\Support\DataConfig;
 use Spatie\LaravelData\Support\DataProperty;
@@ -34,9 +35,9 @@ public function execute(
     ): array {
         $dataClass = $this->dataConfig->getDataClass($class);
 
-        if ($dataClass->isAbstract && $dataClass->propertyMorphable) {
+        if ($propertyMorphableClass = $this->propertyMorphableClass($dataClass)) {
             $payload = $path->isRoot() ? $fullPayload : Arr::get($fullPayload, $path->get(), []);
-            $class = $class::morph($payload) ?? $class;
+            $class = $propertyMorphableClass::morph($payload) ?? $class;
             $dataClass = $this->dataConfig->getDataClass($class);
         }
 
@@ -284,4 +285,14 @@ protected function inferRulesForDataProperty(
             $path
         );
     }
+
+    /**
+     * @return class-string<PropertyMorphableData>
+     */
+    protected function propertyMorphableClass(DataClass $dataClass): ?string
+    {
+        return $dataClass->isAbstract && $dataClass->propertyMorphable
+            ? $dataClass->name
+            : null;
+    }
 }