[DependencyInjection] Minor fixes

romainneutron · romainneutron · commit d727be1bb7a1 · 2014-03-31T19:37:10.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Alias;
 
@@ -32,7 +31,7 @@ public function process(ContainerBuilder $container)
 
             list ($decorated, $renamedId) = $decorated;
             if (!$renamedId) {
-                $renamedId = $id.'.inner';
+                $renamedId = $id.'.parent';
             }
 
             // we create a new alias/service for the service we are replacing
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -83,7 +83,7 @@ public function setDecoratedService($id, $renamedId = null)
     /**
      * Gets the service that decorates this service.
      *
-     * @return array An array composed of the decorated service id and the new id for it
+     * @return null|array An array composed of the decorated service id and the new id for it, null if no service is decorated
      */
     public function getDecoratedService()
     {

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function setDecoratedService($id, $renamedId = null)`
`83`	`83`	`/**`
`84`	`84`	`* Gets the service that decorates this service.`
`85`	`*`
`86`		`- * @return array An array composed of the decorated service id and the new id for it`
	`86`	`+ * @return null\|array An array composed of the decorated service id and the new id for it, null if no service is decorated`
`87`	`87`	`*/`
`88`	`88`	`public function getDecoratedService()`
`89`	`89`	`{`