Merge pull request #234 from plank/fix-createimagevariants-serialization

Fix serialization of CreateImageVariants job

Author: frasmage

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 5.0.4 - 2020-12-02
+- Fixed serialization of `CreateImageVariants` job.
+
+## 5.0.3 - 2020-10-28
+- Fixed docblock of `attachMedia()` and `SyncMedia()` (Thanks @hailwood!)
+
+## 5.0.2 - 2020-10-22
+- Fixed additional bugs with the `MediableCollection::delete()` method
+- Optimized the execution speed of `MediableCollection::delete()`
+
+## 5.0.1 - 2020-10-22
+- fixed notices generated from collection offset access in `MediableCollection::delete()`
+
 ## 5.0.0 - 2020-10-14
 - Added support for creating image variants using the intervention/image library. Variants can be created synchronously in the current process or asychronously as queued jobs. Media records keep track of variants created from them.
 - Fixed Laravel 8+ migration squashing. Database migrations are now loaded from within the package instead of copied to the application's database/migration directory. See UPGRADING.md for steps to avoid conflicts.

src/Jobs/CreateImageVariants.php

@@ -2,19 +2,19 @@
 
 namespace Plank\Mediable\Jobs;
 
-use Carbon\Traits\Serialization;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 use Plank\Mediable\Exceptions\ImageManipulationException;
 use Plank\Mediable\ImageManipulator;
 use Plank\Mediable\Media;
 
 class CreateImageVariants implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, Serialization;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
      * @var string[]

tests/Integration/Jobs/CreateImageVariantsTest.php

@@ -2,6 +2,7 @@
 
 namespace Plank\Mediable\Tests\Integration\Jobs;
 
+use GuzzleHttp\Promise\Create;
 use Illuminate\Database\Eloquent\Collection;
 use Plank\Mediable\ImageManipulation;
 use Plank\Mediable\ImageManipulator;
@@ -89,4 +90,28 @@ public function test_it_will_trigger_image_manipulation_recreate()
         $job = new CreateImageVariants($model, [$variant1, $variant2], true);
         $job->handle();
     }
+
+    public function test_it_will_serialize_models()
+    {
+        $this->useDatabase();
+        $model = $this->createMedia(['aggregate_type' => 'image']);
+        $variant = 'foo';
+
+        $manipulator = $this->createMock(ImageManipulator::class);
+        $manipulator->expects($this->once())
+            ->method('validateMedia')
+            ->with($model);
+        $manipulator->expects($this->any())
+            ->method('getVariantDefinition')
+            ->withConsecutive([$variant])
+            ->willReturn($this->createMock(ImageManipulation::class));
+        app()->instance(ImageManipulator::class, $manipulator);
+
+        $job = new CreateImageVariants($model, [$variant], true);
+        /** @var CreateImageVariants $result */
+        $result = unserialize(serialize($job));
+        $this->assertEquals([$model->getKey()], $result->getModels()->modelKeys());
+        $this->assertEquals([$variant], $result->getVariantNames());
+        $this->assertTrue($result->getForceRecreate());
+    }
 }

tests/Integration/MediableTest.php

@@ -528,29 +528,29 @@ public function test_it_can_lazy_eager_load_media_with_variants_by_tag_matching_
         $this->assertSame($result, $result->loadMedia(['bar', 'foo'], true, true));
         $this->assertTrue($result->relationLoaded('media'));
         $this->assertEquals([2, 2], $result->media->pluck('id')->toArray());
-        $this->asserttrue($result->media[0]->relationLoaded('originalMedia'));
-        $this->asserttrue($result->media[0]->relationLoaded('variants'));
+        $this->assertTrue($result->media[0]->relationLoaded('originalMedia'));
+        $this->assertTrue($result->media[0]->relationLoaded('variants'));
 
         $result = SampleMediable::first();
         $this->assertSame($result, $result->loadMediaWithVariants(['bar', 'foo'], true));
         $this->assertTrue($result->relationLoaded('media'));
         $this->assertEquals([2, 2], $result->media->pluck('id')->toArray());
-        $this->asserttrue($result->media[0]->relationLoaded('originalMedia'));
-        $this->asserttrue($result->media[0]->relationLoaded('variants'));
+        $this->assertTrue($result->media[0]->relationLoaded('originalMedia'));
+        $this->assertTrue($result->media[0]->relationLoaded('variants'));
 
         $result = SampleMediable::first();
         $this->assertSame($result, $result->loadMediaMatchAll(['bar', 'foo'], true));
         $this->assertTrue($result->relationLoaded('media'));
         $this->assertEquals([2, 2], $result->media->pluck('id')->toArray());
-        $this->asserttrue($result->media[0]->relationLoaded('originalMedia'));
-        $this->asserttrue($result->media[0]->relationLoaded('variants'));
+        $this->assertTrue($result->media[0]->relationLoaded('originalMedia'));
+        $this->assertTrue($result->media[0]->relationLoaded('variants'));
 
         $result = SampleMediable::first();
         $this->assertSame($result, $result->loadMediaWithVariantsMatchAll(['bar', 'foo']));
         $this->assertTrue($result->relationLoaded('media'));
         $this->assertEquals([2, 2], $result->media->pluck('id')->toArray());
-        $this->asserttrue($result->media[0]->relationLoaded('originalMedia'));
-        $this->asserttrue($result->media[0]->relationLoaded('variants'));
+        $this->assertTrue($result->media[0]->relationLoaded('originalMedia'));
+        $this->assertTrue($result->media[0]->relationLoaded('variants'));
     }
 
     public function test_it_uses_custom_collection()