X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fsymfony%2Fdependency-injection%2FCompiler%2FReplaceAliasByActualDefinitionPass.php;fp=vendor%2Fsymfony%2Fdependency-injection%2FCompiler%2FReplaceAliasByActualDefinitionPass.php;h=85c1cf5474c2e7003c69c6422af39a67c92671e4;hp=b7210ee6ee586c077bfb9681d963fd1b258debbb;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5 diff --git a/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php b/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php index b7210ee6e..85c1cf547 100644 --- a/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php +++ b/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php @@ -77,7 +77,6 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface $definition->setArguments($this->updateArgumentReferences($replacements, $definitionId, $definition->getArguments())); $definition->setMethodCalls($this->updateArgumentReferences($replacements, $definitionId, $definition->getMethodCalls())); $definition->setProperties($this->updateArgumentReferences($replacements, $definitionId, $definition->getProperties())); - $definition->setFactoryService($this->updateFactoryReferenceId($replacements, $definition->getFactoryService(false)), false); $definition->setFactory($this->updateFactoryReference($replacements, $definition->getFactory())); } } @@ -116,23 +115,6 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface return $arguments; } - /** - * Returns the updated reference for the factory service. - * - * @param array $replacements Table of aliases to replace - * @param string|null $referenceId Factory service reference identifier - * - * @return string|null - */ - private function updateFactoryReferenceId(array $replacements, $referenceId) - { - if (null === $referenceId) { - return; - } - - return isset($replacements[$referenceId]) ? $replacements[$referenceId] : $referenceId; - } - private function updateFactoryReference(array $replacements, $factory) { if (is_array($factory) && $factory[0] instanceof Reference && isset($replacements[$referenceId = (string) $factory[0]])) {