Merge branch 'hotfix/298' into develop

Forward port #298
zfcampus · Jan 17, 2018 · 6d983a6 · 6d983a6
2 parents bdef40e + 986c90e
commit 6d983a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,9 @@ All notable changes to this project will be documented in this file, in reverse
   Doctrine Resource listener attached via config. These are now correctly
   dispatched.
 
+- [#298](https://github.com/zfcampus/zf-apigility-doctrine/pull/298) fixes
+  data passed to listener on patch method.
+
 ## 2.1.0 - 2016-10-17
 
 ### Added

diff --git a/src/Server/Resource/DoctrineResource.php b/src/Server/Resource/DoctrineResource.php
@@ -574,10 +574,15 @@ public function patch($id, $data)
         $results = $this->triggerDoctrineEvent(DoctrineResourceEvent::EVENT_PATCH_PRE, $entity, $data);
         if ($results->last() instanceof ApiProblem) {
             return $results->last();
+        } elseif (! $results->isEmpty() && $results->last() !== null) {
+            // TODO Change to a more logical/secure way to see if data was acted and and we have the expected response
+            $preEventData = $results->last();
+        } else {
+            $preEventData = $data;
         }
 
         // Hydrate entity with patched data
-        $this->getHydrator()->hydrate((array) $data, $entity);
+        $this->getHydrator()->hydrate((array) $preEventData, $entity);
 
         $results = $this->triggerDoctrineEvent(DoctrineResourceEvent::EVENT_PATCH_POST, $entity, $data);
         if ($results->last() instanceof ApiProblem) {