From ab0e4ca81b4f4084ec571465445f59c1ccbd72cd Mon Sep 17 00:00:00 2001 From: Jonas Rudolph Date: Fri, 25 Sep 2015 13:05:55 +0200 Subject: [PATCH] Change usage of deprecated EventManager::triggerUntil to EventManager::trigger Hey Matthew, triggerUntil always triggers the error 'This method is deprecated and will be removed in the future. Please use trigger() instead.' and makes our log a mess. Please accept this change=) Kind Regards --- src/PhlyRestfully/Resource.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PhlyRestfully/Resource.php b/src/PhlyRestfully/Resource.php index 9a35d6be..5f894701 100644 --- a/src/PhlyRestfully/Resource.php +++ b/src/PhlyRestfully/Resource.php @@ -188,7 +188,7 @@ public function create($data) $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, array('data' => $data)); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -229,7 +229,7 @@ public function update($id, $data) $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, compact('id', 'data')); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -278,7 +278,7 @@ public function replaceList($data) }); $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, array('data' => $data)); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -320,7 +320,7 @@ public function patch($id, $data) $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, compact('id', 'data')); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -344,7 +344,7 @@ public function delete($id) { $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, array('id' => $id)); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -373,7 +373,7 @@ public function deleteList($data = null) } $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, array('data' => $data)); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -398,7 +398,7 @@ public function fetch($id) { $events = $this->getEventManager(); $event = $this->prepareEvent(__FUNCTION__, array('id' => $id)); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last(); @@ -426,7 +426,7 @@ public function fetchAll() $events = $this->getEventManager(); $params = func_get_args(); $event = $this->prepareEvent(__FUNCTION__, $params); - $results = $events->triggerUntil($event, function($result) { + $results = $events->trigger($event, function($result) { return $result instanceof ApiProblem; }); $last = $results->last();