minor #14720 [2.7][DI] Definition deprecation notice includes the parameters given (iltar)

fabpot · fabpot · commit 3e7b19e55e78 · 2015-05-22T13:51:10.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [2.7][DI] Definition deprecation notice includes the parameters given | Q | A | ------------- | --- | Deprecations? | yes | Tests pass? | yes | Fixed tickets | #14687 | License | MIT This PR won't fix the issue at hand, but should make it a bit easier to debug. Because this is used by the configuration loader, it's hard to trace back where and how it's actually used. Commits ------- b322d46 Definition deprecation notice includes the parameters given
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -98,7 +98,7 @@ public function getFactory()
      */
     public function setFactoryClass($factoryClass)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', E_USER_DEPRECATED);
+        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
 
         $this->factoryClass = $factoryClass;
 
@@ -134,7 +134,7 @@ public function getFactoryClass($triggerDeprecationError = true)
      */
     public function setFactoryMethod($factoryMethod)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', E_USER_DEPRECATED);
+        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
 
         $this->factoryMethod = $factoryMethod;
 
@@ -205,7 +205,7 @@ public function getFactoryMethod($triggerDeprecationError = true)
      */
     public function setFactoryService($factoryService)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', E_USER_DEPRECATED);
+        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;
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function getFactory()`
`98`	`98`	`*/`
`99`	`99`	`public function setFactoryClass($factoryClass)`
`100`	`100`	`{`
`101`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', E_USER_DEPRECATED);`
	`101`	`+ trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);`
`102`	`102`
`103`	`103`	`$this->factoryClass = $factoryClass;`
`104`	`104`
`@@ -134,7 +134,7 @@ public function getFactoryClass($triggerDeprecationError = true)`
`134`	`134`	`*/`
`135`	`135`	`public function setFactoryMethod($factoryMethod)`
`136`	`136`	`{`
`137`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', E_USER_DEPRECATED);`
	`137`	`+ trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);`
`138`	`138`
`139`	`139`	`$this->factoryMethod = $factoryMethod;`
`140`	`140`
`@@ -205,7 +205,7 @@ public function getFactoryMethod($triggerDeprecationError = true)`
`205`	`205`	`*/`
`206`	`206`	`public function setFactoryService($factoryService)`
`207`	`207`	`{`
`208`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', E_USER_DEPRECATED);`
	`208`	`+ 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);`
`209`	`209`
`210`	`210`	`$this->factoryService = $factoryService;`
`211`	`211`