fix tests and types

ElegantEngineeringTech · Oct 12, 2024 · 1a43b92 · 1a43b92
1 parent 0ed7736
commit 1a43b92
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -230,30 +230,30 @@ public function getConversionDefinition(string $name): ?MediaConversionDefinitio
         return $value;
     }
 
-    public function dispatchConversion(string $conversion): ?PendingDispatch
+    /**
+     * @return array<string, MediaConversionDefinition>
+     */
+    public function getChildrenConversionsDefinitions(string $name): array
     {
+        return $this->getConversionDefinition($name)?->conversions ?? [];
+    }
 
-        $definition = $this->getConversionDefinition($conversion);
-
-        if (! $definition) {
-            return null;
+    public function dispatchConversion(string $conversion): ?PendingDispatch
+    {
+        if ($definition = $this->getConversionDefinition($conversion)) {
+            return $definition->dispatch($this, $this->getParentConversion($conversion));
         }
 
-        return $definition->dispatch($this, $this->getParentConversion($conversion));
-
+        return null;
     }
 
     public function executeConversion(string $conversion): ?MediaConversion
     {
-
-        $definition = $this->getConversionDefinition($conversion);
-
-        if (! $definition) {
-            return null;
+        if ($definition = $this->getConversionDefinition($conversion)) {
+            return $definition->execute($this, $this->getParentConversion($conversion));
         }
 
-        return $definition->execute($this, $this->getParentConversion($conversion));
-
+        return null;
     }
 
     public function getConversion(string $name): ?MediaConversion
@@ -321,7 +321,7 @@ public function addConversion(
         if ($existingConversion) {
             $existingConversion->deleteFile();
             $this->deleteChildrenConversion($conversionName);
-        } elseif ($this->relationLoaded('conversions')) {
+        } else {
             $this->conversions->push($conversion);
         }
 
@@ -339,7 +339,7 @@ public function dispatchConversions(
         ?MediaConversion $parent = null
     ): static {
         if ($parent) {
-            $definitions = $this->getConversionDefinition($parent->conversion_name)?->conversions ?? [];
+            $definitions = $this->getChildrenConversionsDefinitions($parent->conversion_name);
         } else {
             $definitions = $this->getConversionsDefinitions();
         }
@@ -426,7 +426,8 @@ public function makeFreshPath(
         ?string $conversion = null,
         ?string $fileName = null
     ): string {
-        $prefix = config()->string('media.generated_path_prefix', '');
+        /** @var string $prefix */
+        $prefix = config('media.generated_path_prefix') ?? '';
 
         $root = Str::of($prefix)
             ->when($prefix, fn ($string) => $string->finish('/'))