Use findDefinition() instead of getDefinition() after calling has()

chalasr · chalasr · commit 41f3d1f1664e · 2017-04-11T16:03:41.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php
@@ -56,14 +56,14 @@ public function process(ContainerBuilder $container)
             return;
         }
         $factory = array(AbstractAdapter::class, 'createSystemCache');
-        $annotationsPool = $container->getDefinition('cache.annotations');
+        $annotationsPool = $container->findDefinition('cache.annotations');
         if ($factory !== $annotationsPool->getFactory() || 4 !== count($annotationsPool->getArguments())) {
             return;
         }
         if ($container->has('monolog.logger.cache')) {
             $annotationsPool->addArgument(new Reference('monolog.logger.cache'));
         } elseif ($container->has('cache.system')) {
-            $systemPool = $container->getDefinition('cache.system');
+            $systemPool = $container->findDefinition('cache.system');
             if ($factory === $systemPool->getFactory() && 5 <= count($systemArgs = $systemPool->getArguments())) {
                 $annotationsPool->addArgument($systemArgs[4]);
             }

Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,14 @@ public function process(ContainerBuilder $container)`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`	`$factory = array(AbstractAdapter::class, 'createSystemCache');`
`59`		`- $annotationsPool = $container->getDefinition('cache.annotations');`
	`59`	`+ $annotationsPool = $container->findDefinition('cache.annotations');`
`60`	`60`	`if ($factory !== $annotationsPool->getFactory() \|\| 4 !== count($annotationsPool->getArguments())) {`
`61`	`61`	`return;`
`62`	`62`	`}`
`63`	`63`	`if ($container->has('monolog.logger.cache')) {`
`64`	`64`	`$annotationsPool->addArgument(new Reference('monolog.logger.cache'));`
`65`	`65`	`} elseif ($container->has('cache.system')) {`
`66`		`- $systemPool = $container->getDefinition('cache.system');`
	`66`	`+ $systemPool = $container->findDefinition('cache.system');`
`67`	`67`	`if ($factory === $systemPool->getFactory() && 5 <= count($systemArgs = $systemPool->getArguments())) {`
`68`	`68`	`$annotationsPool->addArgument($systemArgs[4]);`
`69`	`69`	`}`