[DependencyInjection] improve deprecation messages

Also include the service id in the deprecation message.

Author: xabbuh

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);

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);
         }