Merge branch 'hotfix/100' into develop

Forward port #100
zfcampus · Jul 8, 2015 · 14b542a · 14b542a
2 parents 8b11ccf + 999ca3f
commit 14b542a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Plugin/Hal.php b/src/Plugin/Hal.php
@@ -632,11 +632,18 @@ public function renderEntity(Entity $halEntity, $renderEntity = true, $depth = 0
         $halEntity->setLinks($entityLinks);
         $entity['_links'] = $this->fromResource($halEntity);
 
+        $payload = new ArrayObject($entity);
+        $this->getEventManager()->trigger(
+            __FUNCTION__ . '.post',
+            $this,
+            array('payload' => $payload, 'entity' => $halEntity)
+        );
+
         if (isset($entityHash)) {
             unset($this->entityHashStack[$entityHash]);
         }
 
-        return $entity;
+        return $payload->getArrayCopy();
     }
 
     /**

diff --git a/test/Plugin/HalTest.php b/test/Plugin/HalTest.php
@@ -2313,4 +2313,21 @@ public function testAllowsSpecifyingAlternateCallbackForReturningEntityId()
             $this->assertEquals('bar', $item['foo']);
         }
     }
+
+    /**
+     * @group 100
+     */
+    public function testRenderEntityPostEventIsTriggered()
+    {
+        $entity = array('id' => 1, 'foo' => 'bar');
+        $halEntity = new Entity($entity, 1);
+
+        $triggered = false;
+        $this->plugin->getEventManager()->attach('renderEntity.post', function ($e) use (&$triggered) {
+            $triggered = true;
+        });
+
+        $this->plugin->renderEntity($halEntity);
+        $this->assertTrue($triggered);
+    }
 }