minor #15113 [2.8][DependencyInjection] improve deprecation messages (xabbuh)

fabpot · fabpot · commit 03e96d24f36e · 2015-06-27T16:06:09.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [2.8][DependencyInjection] improve deprecation messages | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Also include the service id in the deprecation message. Commits ------- d144dbb [DependencyInjection] improve deprecation messages
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -162,7 +162,7 @@ private function parseDefinition(\DOMElement $service, $file)
             $triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
 
             if ($triggerDeprecation) {
-                @trigger_error(sprintf('The "scope" attribute in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "scope" attribute of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
             }
 
             $definition->setScope(XmlUtils::phpize($value), false);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -169,7 +169,7 @@ private function parseDefinition($id, $service, $file)
 
         if (isset($service['scope'])) {
             if ('request' !== $id) {
-                @trigger_error(sprintf('The "scope" key in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $file), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
             }
             $definition->setScope($service['scope'], false);
         }

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private function parseDefinition(\DOMElement $service, $file)`
`162`	`162`	`$triggerDeprecation = 'request' !== (string) $service->getAttribute('id');`
`163`	`163`
`164`	`164`	`if ($triggerDeprecation) {`
`165`		`- @trigger_error(sprintf('The "scope" attribute in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $file), E_USER_DEPRECATED);`
	`165`	`+ @trigger_error(sprintf('The "scope" attribute of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`$definition->setScope(XmlUtils::phpize($value), false);`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private function parseDefinition($id, $service, $file)`
`169`	`169`
`170`	`170`	`if (isset($service['scope'])) {`
`171`	`171`	`if ('request' !== $id) {`
`172`		`- @trigger_error(sprintf('The "scope" key in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $file), E_USER_DEPRECATED);`
	`172`	`+ @trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);`
`173`	`173`	`}`
`174`	`174`	`$definition->setScope($service['scope'], false);`
`175`	`175`	`}`