Using the abstract entity class and using its helper methods in tests

Modules/Media/Events/FileIsCreating.php

@@ -2,48 +2,9 @@
 
 namespace Modules\Media\Events;
 
+use Modules\Core\Abstracts\AbstractEntityHook;
 use Modules\Core\Contracts\EntityIsChanging;
 
-final class FileIsCreating implements EntityIsChanging
+final class FileIsCreating extends AbstractEntityHook implements EntityIsChanging
 {
-    /**
-     * Contains the attributes which can be changed by other listeners
-     * @var array
-     */
-    private $attributes;
-    /**
-     * Contains the original attributes which cannot be changed
-     * @var array
-     */
-    private $original;
-
-    public function __construct(array $attributes)
-    {
-        $this->attributes = $attributes;
-        $this->original = $attributes;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = array_replace_recursive($this->attributes, $attributes);
-    }
-
-    /**
-     * @return array
-     */
-    public function getOriginal()
-    {
-        return $this->original;
-    }
 }

Modules/Media/Events/FileIsUpdating.php

@@ -2,53 +2,21 @@
 
 namespace Modules\Media\Events;
 
+use Modules\Core\Abstracts\AbstractEntityHook;
 use Modules\Core\Contracts\EntityIsChanging;
 use Modules\Media\Entities\File;
 
-final class FileIsUpdating implements EntityIsChanging
+final class FileIsUpdating extends AbstractEntityHook implements EntityIsChanging
 {
     /**
      * @var File
      */
     private $file;
-    /**
-     * @var array
-     */
-    private $attributes;
-    /**
-     * @var array
-     */
-    private $original;
 
-    public function __construct(File $file, array $data)
+    public function __construct(File $file, array $attributes)
     {
         $this->file = $file;
-        $this->attributes = $data;
-        $this->original = $data;
-    }
-
-    /**
-     * @return array
-     */
-    public function getOriginal()
-    {
-        return $this->original;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = array_replace_recursive($this->attributes, $attributes);
+        parent::__construct($attributes);
     }
 
     /**

Modules/Media/Tests/EloquentFileRepositoryTest.php

@@ -138,7 +138,7 @@ class EloquentFileRepositoryTest extends MediaTestCase
         $file = $this->file->createFromFile(\Illuminate\Http\UploadedFile::fake()->image('myfile.jpg'));
 
         Event::assertDispatched(FileIsCreating::class, function ($e) use ($file) {
-            return $e->getAttributes()['filename'] === $file->filename;
+            return $e->getAttribute('filename') === $file->filename;
         });
     }
 
@@ -183,7 +183,7 @@ class EloquentFileRepositoryTest extends MediaTestCase
 
         Event::assertDispatched(FileIsUpdating::class, function ($e) use ($file) {
             return $e->getFile()->id === $file->id &&
-                $e->getAttributes()['en']['description'] === 'My cool file!';
+                $e->getAttribute('en.description') === 'My cool file!';
         });
     }
 

Modules/Page/Events/PageIsCreating.php

@@ -2,48 +2,9 @@
 
 namespace Modules\Page\Events;
 
+use Modules\Core\Abstracts\AbstractEntityHook;
 use Modules\Core\Contracts\EntityIsChanging;
 
-class PageIsCreating implements EntityIsChanging
+class PageIsCreating extends AbstractEntityHook implements EntityIsChanging
 {
-    /**
-     * Contains the attributes which can be changed by other listeners
-     * @var array
-     */
-    private $attributes;
-    /**
-     * Contains the original attributes which cannot be changed
-     * @var array
-     */
-    private $original;
-
-    public function __construct(array $attributes)
-    {
-        $this->attributes = $attributes;
-        $this->original = $attributes;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = array_replace_recursive($this->attributes, $attributes);
-    }
-
-    /**
-     * @return array
-     */
-    public function getOriginal()
-    {
-        return $this->original;
-    }
 }

Modules/Page/Events/PageIsUpdating.php

@@ -2,21 +2,12 @@
 
 namespace Modules\Page\Events;
 
+use Modules\Core\Abstracts\AbstractEntityHook;
 use Modules\Core\Contracts\EntityIsChanging;
 use Modules\Page\Entities\Page;
 
-class PageIsUpdating implements EntityIsChanging
+class PageIsUpdating extends AbstractEntityHook implements EntityIsChanging
 {
-    /**
-     * Contains the attributes which can be changed by other listeners
-     * @var array
-     */
-    private $attributes;
-    /**
-     * Contains the original attributes which cannot be changed
-     * @var array
-     */
-    private $original;
     /**
      * @var Page
      */
@@ -24,33 +15,8 @@ class PageIsUpdating implements EntityIsChanging
 
     public function __construct(Page $page, array $attributes)
     {
-        $this->attributes = $attributes;
-        $this->original = $attributes;
         $this->page = $page;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = array_replace_recursive($this->attributes, $attributes);
-    }
-
-    /**
-     * @return array
-     */
-    public function getOriginal()
-    {
-        return $this->original;
+        parent::__construct($attributes);
     }
 
     /**

Modules/Page/Tests/EloquentPageRepositoryTest.php

@@ -103,7 +103,7 @@ class EloquentPageRepositoryTest extends BasePageTest
         $page = $this->createPage();
 
         Event::assertDispatched(PageIsCreating::class, function ($e) use ($page) {
-            return $e->getAttributes()['template'] === $page->template;
+            return $e->getAttribute('template') === $page->template;
         });
     }