bug #20967 [DI] Fix DefinitionDecorator deprecation layer (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 200516aaaaf2 · 2016-12-17T11:10:26.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix DefinitionDecorator deprecation layer | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This should make Travis green from 3.1 to master. ping @xabbuh FYI Restores compat with `instanceof DefinitionDecorator` checks. Commits ------- 14c65e3 [DI] Fix DefinitionDecorator deprecation layer
diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -14,6 +14,8 @@
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
 
+class_alias(ChildDefinition::class, DefinitionDecorator::class);
+
 /**
  * This definition extends another definition.
  *
diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -20,6 +20,4 @@
  *
  * @deprecated The DefinitionDecorator class is deprecated since version 3.3 and will be removed in 4.0. Use the Symfony\Component\DependencyInjection\ChildDefinition class instead.
  */
-class DefinitionDecorator extends ChildDefinition
-{
-}
+class_exists(ChildDefinition::class);

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`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`	`+`
`17`	`19`	`/**`
`18`	`20`	`* This definition extends another definition.`
`19`	`21`	`*`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,4 @@`
`20`	`20`	`*`
`21`	`21`	`* @deprecated The DefinitionDecorator class is deprecated since version 3.3 and will be removed in 4.0. Use the Symfony\Component\DependencyInjection\ChildDefinition class instead.`
`22`	`22`	`*/`
`23`		`-class DefinitionDecorator extends ChildDefinition`
`24`		`-{`
`25`		`-}`
	`23`	`+class_exists(ChildDefinition::class);`