[DI] Dont trigger deprecation for event_dispatcher service

chalasr · chalasr · commit 61f3922dc53e · 2017-03-30T10:39:22.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -31,6 +31,7 @@
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Serializer\Serializer;
@@ -878,6 +879,18 @@ public function testPropertyInfoEnabled()
         $this->assertTrue($container->has('property_info'));
     }
 
+    public function testEventDispatcherService()
+    {
+        $container = $this->createContainer(array('kernel.charset' => 'UTF-8', 'kernel.secret' => 'secret'));
+        $container->registerExtension(new FrameworkExtension());
+        $this->loadFromFile($container, 'default_config');
+        $container
+            ->register('foo', \stdClass::class)
+            ->setProperty('dispatcher', new Reference('event_dispatcher'));
+        $container->compile();
+        $this->assertInstanceOf(EventDispatcherInterface::class, $container->get('foo')->dispatcher);
+    }
+
     public function testCacheDefaultRedisProvider()
     {
         $container = $this->createContainerFromFile('cache');
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -38,6 +38,7 @@
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 
@@ -1056,11 +1057,13 @@ private function createService(Definition $definition, $id, $tryProxy = true)
                 }
             }
         } else {
-            $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
+            $r = new \ReflectionClass($class = $parameterBag->resolveValue($definition->getClass()));
 
             $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
+             // don't trigger deprecations for internal uses, to be removed in 4.0 along with the deprecated class
+            $deprecationWhitelist = array('event_dispatcher' => ContainerAwareEventDispatcher::class);
 
-            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ") && (!isset($deprecationWhitelist[$id]) || $deprecationWhitelist[$id] !== $class)) {
                 @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;`
`39`	`39`	`use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;`
`40`	`40`	`use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;`
	`41`	`+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;`
`41`	`42`	`use Symfony\Component\ExpressionLanguage\Expression;`
`42`	`43`	`use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;`
`43`	`44`
`@@ -1056,11 +1057,13 @@ private function createService(Definition $definition, $id, $tryProxy = true)`
`1056`	`1057`	`}`
`1057`	`1058`	`}`
`1058`	`1059`	`} else {`
`1059`		`- $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));`
	`1060`	`+ $r = new \ReflectionClass($class = $parameterBag->resolveValue($definition->getClass()));`
`1060`	`1061`
`1061`	`1062`	`$service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);`
	`1063`	`+ // don't trigger deprecations for internal uses, to be removed in 4.0 along with the deprecated class`
	`1064`	`+ $deprecationWhitelist = array('event_dispatcher' => ContainerAwareEventDispatcher::class);`
`1062`	`1065`
`1063`		`- if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
	`1066`	`+ if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ") && (!isset($deprecationWhitelist[$id]) \|\| $deprecationWhitelist[$id] !== $class)) {`
`1064`	`1067`	`@trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);`
`1065`	`1068`	`}`
`1066`	`1069`	`}`