projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update to Drupal 8.4.6
[yaffs-website]
/
vendor
/
doctrine
/
common
/
lib
/
Doctrine
/
Common
/
EventManager.php
diff --git
a/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
b/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
index 0ee04a15a46e65cbf054c92f1b07232dc8a3c96d..f9dcb33c51374b6d08f2a6918fb8f9dc7c3aab1e 100644
(file)
--- 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.
*
* @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)
{
*/
public function dispatchEvent($eventName, EventArgs $eventArgs = null)
{
@@
-82,7
+82,7
@@
class EventManager
*/
public function hasListeners($event)
{
*/
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) {
$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]);
}
}
}
}