Merge pull request #82 from cnizzardini/passing-entity-to-events-fixes

Set entity property in BaseEvent
lorenzo · Feb 18, 2024 · 5817566 · 5817566
2 parents f098114 + 8d18809
commit 5817566
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="tests/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+>
     <coverage/>
     <php>
         <ini name="memory_limit" value="-1"/>

diff --git a/src/Event/BaseEvent.php b/src/Event/BaseEvent.php
@@ -55,6 +55,7 @@ public function __construct(
         $this->changed = $changed;
         $this->original = $original;
         $this->timestamp = (new DateTime())->format(DateTime::ATOM);
+        $this->entity = $entity;
     }
 
     /**

diff --git a/src/EventFactory.php b/src/EventFactory.php
@@ -6,6 +6,7 @@
 use AuditStash\Event\AuditCreateEvent;
 use AuditStash\Event\AuditDeleteEvent;
 use AuditStash\Event\AuditUpdateEvent;
+use Cake\ORM\Entity;
 use ReflectionObject;
 
 /**
@@ -35,15 +36,16 @@ public function create(array $data): EventInterface
                 $data['transaction'],
                 $data['primary_key'],
                 $data['source'],
-                $data['changed'],
-                $data['original'],
-                null
+                array_key_exists('changed', $data) ? $data['changed'] : [],
+                array_key_exists('original', $data) ? $data['original'] : [],
+                new Entity()
             );
         } else {
             $event = new $map[$data['type']](
                 $data['transaction'],
                 $data['primary_key'],
-                $data['source']
+                $data['source'],
+                null
             );
         }
 

diff --git a/tests/TestCase/Event/SerializeTest.php b/tests/TestCase/Event/SerializeTest.php
@@ -59,7 +59,14 @@ public function testSerializeDelete()
     public function testJsonSerializeCreate()
     {
         $factory = new EventFactory();
-        $event = new AuditCreateEvent('123', 50, 'articles', ['title' => 'foo'], ['title' => 'bar'], new Entity());
+        $event = new AuditCreateEvent(
+            '123',
+            50,
+            'articles',
+            ['title' => 'foo'],
+            null,
+            new Entity()
+        );
         $event->setMetaInfo(['extra' => 'info']);
         $serialized = json_encode($event);
         $result = $factory->create(json_decode($serialized, true));
@@ -74,7 +81,14 @@ public function testJsonSerializeCreate()
     public function testJsonSerializeUpdate()
     {
         $factory = new EventFactory();
-        $event = new AuditUpdateEvent('123', 50, 'articles', ['title' => 'foo'], ['title' => 'bar'], new Entity());
+        $event = new AuditUpdateEvent(
+            '123',
+            50,
+            'articles',
+            ['title' => 'foo'],
+            ['title' => 'bar'],
+            new Entity()
+        );
         $event->setMetaInfo(['extra' => 'info']);
         $serialized = json_encode($event);
         $result = $factory->create(json_decode($serialized, true));