minor #21096 [DependencyInjection] register alias after defining the class (xabbuh)

fabpot · fabpot · commit ba932ae0954c · 2016-12-29T22:26:19.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DependencyInjection] register alias after defining the class | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- d8d4417 [DI] register alias after defining the class
diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -14,8 +14,6 @@
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
 
-class_alias(ChildDefinition::class, DefinitionDecorator::class);
-
 /**
  * This definition extends another definition.
  *
@@ -199,3 +197,5 @@ public function replaceArgument($index, $value)
         return $this;
     }
 }
+
+class_alias(ChildDefinition::class, DefinitionDecorator::class);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests;
 
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
 class ChildDefinitionTest extends \PHPUnit_Framework_TestCase
 {
@@ -125,4 +126,9 @@ public function testGetArgumentShouldCheckBounds()
 
         $def->getArgument(1);
     }
+
+    public function testDefinitionDecoratorAliasExistsForBackwardsCompatibility()
+    {
+        $this->assertInstanceOf(ChildDefinition::class, new DefinitionDecorator('foo'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@`
`14`	`14`	`use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;`
`15`	`15`	`use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;`
`16`	`16`
`17`		`-class_alias(ChildDefinition::class, DefinitionDecorator::class);`
`18`		`-`
`19`	`17`	`/**`
`20`	`18`	`* This definition extends another definition.`
`21`	`19`	`*`
`@@ -199,3 +197,5 @@ public function replaceArgument($index, $value)`
`199`	`197`	`return $this;`
`200`	`198`	`}`
`201`	`199`	`}`
	`200`	`+`
	`201`	`+class_alias(ChildDefinition::class, DefinitionDecorator::class);`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Tests;`
`13`	`13`
`14`	`14`	`use Symfony\Component\DependencyInjection\ChildDefinition;`
	`15`	`+use Symfony\Component\DependencyInjection\DefinitionDecorator;`
`15`	`16`
`16`	`17`	`class ChildDefinitionTest extends \PHPUnit_Framework_TestCase`
`17`	`18`	`{`
`@@ -125,4 +126,9 @@ public function testGetArgumentShouldCheckBounds()`
`125`	`126`
`126`	`127`	`$def->getArgument(1);`
`127`	`128`	`}`
	`129`	`+`
	`130`	`+ public function testDefinitionDecoratorAliasExistsForBackwardsCompatibility()`
	`131`	`+ {`
	`132`	`+ $this->assertInstanceOf(ChildDefinition::class, new DefinitionDecorator('foo'));`
	`133`	`+ }`
`128`	`134`	`}`