X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=vendor%2Fdoctrine%2Fcommon%2Flib%2FDoctrine%2FCommon%2FEventManager.php;h=f9dcb33c51374b6d08f2a6918fb8f9dc7c3aab1e;hb=refs%2Fheads%2Ft2;hp=0ee04a15a46e65cbf054c92f1b07232dc8a3c96d;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php b/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
index 0ee04a15a..f9dcb33c5 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
@@ -48,7 +48,7 @@ class EventManager
      * @param EventArgs|null $eventArgs The event arguments to pass to the event handlers/listeners.
      *                                  If not supplied, the single empty EventArgs instance is used.
      *
-     * @return boolean
+     * @return void
      */
     public function dispatchEvent($eventName, EventArgs $eventArgs = null)
     {
@@ -82,7 +82,7 @@ class EventManager
      */
     public function hasListeners($event)
     {
-        return isset($this->_listeners[$event]) && $this->_listeners[$event];
+        return !empty($this->_listeners[$event]);
     }
 
     /**
@@ -119,10 +119,7 @@ class EventManager
         $hash = spl_object_hash($listener);
 
         foreach ((array) $events as $event) {
-            // Check if actually have this listener associated
-            if (isset($this->_listeners[$event][$hash])) {
-                unset($this->_listeners[$event][$hash]);
-            }
+            unset($this->_listeners[$event][$hash]);
         }
     }