fix event names

Author: freekmurze

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All Notable changes to `laravel-medialibrary` will be documented in this file
 
+##3.10.1
+- Fixed the event names to make them more readable `CollectionHasBeenCleared`, `ConversionHasBeenCompleted`, `MediaHasBeenAdded`
+
 ##3.10.0
 - Added `CollectionClearedEvent`, `ConverionCompleteEvent`, `MediaAddedEvent`
 

src/Events/CollectionClearedEvent.php renamed to src/Events/CollectionHasBeenCleared.php

@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Spatie\MediaLibrary\HasMedia\Interfaces\HasMedia;
 
-class CollectionClearedEvent
+class CollectionHasBeenCleared
 {
     use SerializesModels;
 

src/Events/ConversionCompleteEvent.php renamed to src/Events/ConversionHasBeenCompleted.php

@@ -6,7 +6,7 @@
 use Spatie\MediaLibrary\Conversion\Conversion;
 use Spatie\MediaLibrary\Media;
 
-class ConversionCompleteEvent
+class ConversionHasBeenCompleted
 {
     use SerializesModels;
 

src/Events/MediaAddedEvent.php renamed to src/Events/MediaHasBeenAdded.php

@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Spatie\MediaLibrary\Media;
 
-class MediaAddedEvent
+class MediaHasBeenAdded
 {
     use SerializesModels;
 

src/FileManipulator.php

@@ -9,7 +9,7 @@
 use Spatie\MediaLibrary\Conversion\Conversion;
 use Spatie\MediaLibrary\Conversion\ConversionCollection;
 use Spatie\MediaLibrary\Conversion\ConversionCollectionFactory;
-use Spatie\MediaLibrary\Events\ConversionCompleteEvent;
+use Spatie\MediaLibrary\Events\ConversionHasBeenCompleted;
 use Spatie\MediaLibrary\Helpers\File as MediaLibraryFileHelper;
 use Spatie\MediaLibrary\Helpers\Gitignore;
 use Spatie\MediaLibrary\Jobs\PerformConversions;
@@ -81,7 +81,7 @@ public function performConversions(ConversionCollection $conversions, Media $med
 
             app(Filesystem::class)->copyToMediaLibrary($renamedFile, $media, true);
 
-            $this->events->fire(new ConversionCompleteEvent($media, $conversion));
+            $this->events->fire(new ConversionHasBeenCompleted($media, $conversion));
         }
 
         File::deleteDirectory($tempDirectory);

src/Filesystem.php

@@ -5,7 +5,7 @@
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Filesystem\Factory;
-use Spatie\MediaLibrary\Events\MediaAddedEvent;
+use Spatie\MediaLibrary\Events\MediaHasBeenAdded;
 use Spatie\MediaLibrary\Helpers\File;
 use Spatie\MediaLibrary\Helpers\Gitignore;
 use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory;
@@ -49,7 +49,7 @@ public function add($file, Media $media, $targetFileName = '')
     {
         $this->copyToMediaLibrary($file, $media, false, $targetFileName);
 
-        $this->events->fire(new MediaAddedEvent($media));
+        $this->events->fire(new MediaHasBeenAdded($media));
 
         app(FileManipulator::class)->createDerivedFiles($media);
     }

src/HasMedia/HasMediaTrait.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Contracts\Events\Dispatcher;
 use Spatie\MediaLibrary\Conversion\Conversion;
-use Spatie\MediaLibrary\Events\CollectionClearedEvent;
+use Spatie\MediaLibrary\Events\CollectionHasBeenCleared;
 use Spatie\MediaLibrary\Exceptions\MediaDoesNotBelongToModel;
 use Spatie\MediaLibrary\Exceptions\MediaIsNotPartOfCollection;
 use Spatie\MediaLibrary\Exceptions\UrlCouldNotBeOpened;
@@ -237,7 +237,7 @@ public function clearMediaCollection($collectionName = 'default')
             $media->delete();
         });
 
-        app(Dispatcher::class)->fire(new CollectionClearedEvent($this, $collectionName));
+        app(Dispatcher::class)->fire(new CollectionHasBeenCleared($this, $collectionName));
 
         return $this;
     }

tests/Events/EventTest.php

@@ -2,9 +2,9 @@
 
 namespace Spatie\MediaLibrary\Test\Events;
 
-use Spatie\MediaLibrary\Events\CollectionClearedEvent;
-use Spatie\MediaLibrary\Events\ConversionCompleteEvent;
-use Spatie\MediaLibrary\Events\MediaAddedEvent;
+use Spatie\MediaLibrary\Events\CollectionHasBeenCleared;
+use Spatie\MediaLibrary\Events\ConversionHasBeenCompleted;
+use Spatie\MediaLibrary\Events\MediaHasBeenAdded;
 use Spatie\MediaLibrary\Test\TestCase;
 
 class EventTest extends TestCase
@@ -14,7 +14,7 @@ class EventTest extends TestCase
      */
     public function it_will_fire_the_media_added_event()
     {
-        $this->expectsEvents([MediaAddedEvent::class]);
+        $this->expectsEvents([MediaHasBeenAdded::class]);
 
         $this->testModel->addMedia($this->getTestJpg())->toMediaLibrary();
     }
@@ -24,7 +24,7 @@ public function it_will_fire_the_media_added_event()
      */
     public function it_will_fire_the_conversion_complete_event()
     {
-        $this->expectsEvents([ConversionCompleteEvent::class]);
+        $this->expectsEvents([ConversionHasBeenCompleted::class]);
 
         $this->testModelWithConversion->addMedia($this->getTestJpg())->toCollection('images');
     }
@@ -39,7 +39,7 @@ public function it_will_fire_the_collection_cleared_event()
             ->preservingOriginal()
             ->toMediaLibrary('images');
 
-        $this->expectsEvents([CollectionClearedEvent::class]);
+        $this->expectsEvents([CollectionHasBeenCleared::class]);
 
         $this->testModel->clearMediaCollection('images');
     }