opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

10
web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
View file

@ -230,14 +230,14 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
public function addSubscriber(EventSubscriberInterface $subscriber) {
foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
if (is_string($params)) {
$this->addListener($event_name, array($subscriber, $params));
$this->addListener($event_name, [$subscriber, $params]);
}
elseif (is_string($params[0])) {
$this->addListener($event_name, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
$this->addListener($event_name, [$subscriber, $params[0]], isset($params[1]) ? $params[1] : 0);
}
else {
foreach ($params as $listener) {
$this->addListener($event_name, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);
$this->addListener($event_name, [$subscriber, $listener[0]], isset($listener[1]) ? $listener[1] : 0);
}
}
}
@ -250,11 +250,11 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
if (is_array($params) && is_array($params[0])) {
foreach ($params as $listener) {
$this->removeListener($event_name, array($subscriber, $listener[0]));
$this->removeListener($event_name, [$subscriber, $listener[0]]);
}
}
else {
$this->removeListener($event_name, array($subscriber, is_string($params) ? $params : $params[0]));
$this->removeListener($event_name, [$subscriber, is_string($params) ? $params : $params[0]]);
}
}
}