Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / symfony / dependency-injection / Compiler / ResolveServiceSubscribersPass.php

diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php
index bde9433690f95dc2756c540dce471b859ca1864d..ccc80a443e420ca550ff199d587b3afaaea9dce6 100644 (file)
--- a/vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveServiceSubscribersPass.php
@@ -35,7 +35,12 @@ class ResolveServiceSubscribersPass extends AbstractRecursivePass
         }
 
         $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);