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

Routine composer update
author Chris Cannam
date Tue, 10 Jul 2018 15:07:59 +0100
parents 1fec387a4317
children
comparison
equal deleted inserted replaced
15:e200cb7efeb3 16:c2387f117808
33 if (!$value instanceof Definition) { 33 if (!$value instanceof Definition) {
34 return parent::processValue($value, $isRoot); 34 return parent::processValue($value, $isRoot);
35 } 35 }
36 36
37 $serviceLocator = $this->serviceLocator; 37 $serviceLocator = $this->serviceLocator;
38 $this->serviceLocator = $value->hasTag('container.service_subscriber.locator') ? $value->getTag('container.service_subscriber.locator')[0]['id'] : null; 38 $this->serviceLocator = null;
39
40 if ($value->hasTag('container.service_subscriber.locator')) {
41 $this->serviceLocator = $value->getTag('container.service_subscriber.locator')[0]['id'];
42 $value->clearTag('container.service_subscriber.locator');
43 }
39 44
40 try { 45 try {
41 return parent::processValue($value); 46 return parent::processValue($value);
42 } finally { 47 } finally {
43 $this->serviceLocator = $serviceLocator; 48 $this->serviceLocator = $serviceLocator;