Mercurial > hg > isophonics-drupal-site

diff vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php @ 16:c2387f117808

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Routine composer update
author Chris Cannam
date Tue, 10 Jul 2018 15:07:59 +0100
parents 1fec387a4317
children
line wrap: on
line diff
--- a/vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php	Thu Apr 26 11:26:54 2018 +0100
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php	Tue Jul 10 15:07:59 2018 +0100
@@ -35,7 +35,12 @@
         }
 
         $serviceLocator = $this->serviceLocator;
-        $this->serviceLocator = $value->hasTag('container.service_subscriber.locator') ? $value->getTag('container.service_subscriber.locator')[0]['id'] : null;
+        $this->serviceLocator = null;
+
+        if ($value->hasTag('container.service_subscriber.locator')) {
+            $this->serviceLocator = $value->getTag('container.service_subscriber.locator')[0]['id'];
+            $value->clearTag('container.service_subscriber.locator');
+        }
 
         try {
             return parent::processValue($value);