minor #17565 [DependencyInjection] simplify the BC layer (xabbuh)

fabpot · fabpot · commit 528572b764ee · 2016-01-27T16:32:31.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [DependencyInjection] simplify the BC layer | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The change to the `setFactoryService()` method is consistent with what we did with the `getFactoryService()` before (and how we handle the deprecation of strict references in Symfony 2.8). Commits ------- 6cd5ee3 [DependencyInjection] simplify the BC layer
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -44,10 +44,7 @@ public function process(ContainerBuilder $container)
             $definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
             $definition->setProperties($this->processArguments($definition->getProperties()));
             $definition->setFactory($this->processFactory($definition->getFactory()));
-
-            if (null !== $factoryService = $definition->getFactoryService(false)) {
-                $definition->setFactoryService($this->processFactoryService($factoryService));
-            }
+            $definition->setFactoryService($this->processFactoryService($definition->getFactoryService(false)), false);
         }
 
         foreach ($container->getAliases() as $id => $alias) {
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -194,9 +194,11 @@ public function getFactoryMethod($triggerDeprecationError = true)
      *
      * @deprecated since version 2.6, to be removed in 3.0.
      */
-    public function setFactoryService($factoryService)
+    public function setFactoryService($factoryService, $triggerDeprecationError = true)
     {
-        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
+        if ($triggerDeprecationError) {
+            @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
+        }
 
         $this->factoryService = $factoryService;
 
diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -99,7 +99,7 @@ public function setFactoryMethod($method)
     /**
      * {@inheritdoc}
      */
-    public function setFactoryService($service)
+    public function setFactoryService($service, $triggerDeprecationError = true)
     {
         $this->changes['factory_service'] = true;
 

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,11 @@ public function getFactoryMethod($triggerDeprecationError = true)`
`194`	`194`	`*`
`195`	`195`	`* @deprecated since version 2.6, to be removed in 3.0.`
`196`	`196`	`*/`
`197`		`- public function setFactoryService($factoryService)`
	`197`	`+ public function setFactoryService($factoryService, $triggerDeprecationError = true)`
`198`	`198`	`{`
`199`		`- @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);`
	`199`	`+ if ($triggerDeprecationError) {`
	`200`	`+ @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);`
	`201`	`+ }`
`200`	`202`
`201`	`203`	`$this->factoryService = $factoryService;`
`202`	`204`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function setFactoryMethod($method)`
`99`	`99`	`/**`
`100`	`100`	`* {@inheritdoc}`
`101`	`101`	`*/`
`102`		`- public function setFactoryService($service)`
	`102`	`+ public function setFactoryService($service, $triggerDeprecationError = true)`
`103`	`103`	`{`
`104`	`104`	`$this->changes['factory_service'] = true;`
`105`	`105`