v4 tests

Author: QuentinGab

src/Converters/MediaConverter.php

@@ -4,6 +4,7 @@
 
 namespace Elegantly\Media\Converters;
 
+use Elegantly\Media\Events\MediaConverterExecutedEvent;
 use Elegantly\Media\MediaConversionDefinition;
 use Elegantly\Media\Models\Media;
 use Elegantly\Media\Models\MediaConversion;
@@ -63,8 +64,11 @@ public function handle(): ?MediaConversion
 
         if (str_contains($this->conversion, '.')) {
 
+            $parentConversion = str($this->conversion)->beforeLast('.')->value();
+
             $parent = $this->media->getOrExecuteConversion(
-                str($this->conversion)->beforeLast('.')->value()
+                $parentConversion,
+                withChildren: false
             );
 
             /**
@@ -73,6 +77,7 @@ public function handle(): ?MediaConversion
             if ($parent === null) {
                 return null;
             }
+
         } else {
             $parent = null;
         }
@@ -87,7 +92,7 @@ public function handle(): ?MediaConversion
             return null;
         }
 
-        $value = TemporaryDirectory::callback(function ($temporaryDirectory) use ($parent) {
+        $mediaConversion = TemporaryDirectory::callback(function ($temporaryDirectory) use ($parent) {
 
             $storage = TemporaryDirectory::storage($temporaryDirectory);
 
@@ -101,6 +106,16 @@ public function handle(): ?MediaConversion
             return $this->convert($this->media, $parent, $copy, $storage, $temporaryDirectory);
         });
 
-        return $value;
+        if ($this->withChildren) {
+            $this->media->generateConversions(
+                parent: $mediaConversion,
+                filter: fn ($definition) => $definition->immediate,
+                force: false,
+            );
+        }
+
+        event(new MediaConverterExecutedEvent($this));
+
+        return $mediaConversion;
     }
 }

src/Events/MediaConverterExecutedEvent.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elegantly\Media\Events;
+
+use Elegantly\Media\Converters\MediaConverter;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class MediaConverterExecutedEvent
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * @return void
+     */
+    public function __construct(public MediaConverter $converter)
+    {
+        //
+    }
+}

src/Models/Media.php

@@ -281,6 +281,7 @@ public function dispatchConversion(
     public function executeConversion(
         string $conversion,
         bool $force = true,
+        bool $withChildren = true,
     ): ?MediaConversion {
 
         if (
@@ -290,25 +291,28 @@ public function executeConversion(
             return null;
         }
 
-        dump('executeConversion: '.$conversion);
-
         if ($definition = $this->getConversionDefinition($conversion)) {
 
             $converter = ($definition->converter)($this);
 
-            return $converter->conversion($conversion)->handle();
+            return $converter
+                ->conversion($conversion)
+                ->withChildren($withChildren)
+                ->handle();
         }
 
         return null;
     }
 
-    public function getOrExecuteConversion(string $name): ?MediaConversion
-    {
+    public function getOrExecuteConversion(
+        string $name,
+        bool $withChildren = true,
+    ): ?MediaConversion {
         if ($conversion = $this->getConversion($name)) {
             return $conversion;
         }
 
-        return $this->executeConversion($name);
+        return $this->executeConversion($name, withChildren: $withChildren);
     }
 
     /**
@@ -362,13 +366,8 @@ public function getChildrenConversions(string $name): EloquentCollection
             ->filter(fn ($conversion) => str_starts_with($conversion->conversion_name, "{$name}."));
     }
 
-    /**
-     * Save a conversion and dispatch children conversions
-     */
-    public function replaceConversion(
-        MediaConversion $conversion,
-        bool $regenerateChildren = true
-    ): MediaConversion {
+    public function replaceConversion(MediaConversion $conversion): MediaConversion
+    {
 
         $existingConversion = $this->getConversion($conversion->conversion_name);
 
@@ -390,12 +389,6 @@ public function replaceConversion(
             );
         }
 
-        $this->generateConversions(
-            parent: $conversion,
-            filter: fn ($definition) => $definition->immediate,
-            force: $regenerateChildren,
-        );
-
         return $conversion;
     }
 
@@ -420,8 +413,6 @@ public function addConversion(
             $conversionName = "{$parent->conversion_name}.{$conversionName}";
         }
 
-        dump('addConversion: '.$conversionName);
-
         /**
          * If the conversion already exists, we are going to overwrite it
          */
@@ -470,12 +461,6 @@ public function addConversion(
             $this->conversions->push($conversion);
         }
 
-        $this->generateConversions(
-            parent: $conversion,
-            filter: fn ($definition) => $definition->immediate,
-            force: $regenerateChildren,
-        );
-
         $definition = $this->getConversionDefinition($conversionName);
 
         if ($onCompleted = $definition?->onCompleted) {
@@ -500,7 +485,6 @@ public function generateConversions(
         ?bool $queued = null,
         bool $force = false,
     ): static {
-        dump('generateConversions');
 
         if ($parent) {
             $definitions = $this->getChildrenConversionsDefinitions($parent->conversion_name);