[DI] Trigger a deprecated error on the container builder

Taluu · Taluu · commit 954247d55011 · 2015-09-24T10:50:44.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -931,6 +931,10 @@ public function createService(Definition $definition, $id, $tryProxy = true)
             throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
         }
 
+        if ($definition->isDeprecated()) {
+            @trigger_error(sprintf('The service %s relies on a deprecated definition. You should avoid using it.', $id), E_USER_DEPRECATED);
+        }
+
         if ($tryProxy && $definition->isLazy()) {
             $container = $this;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -63,6 +63,28 @@ public function testDefinitions()
         }
     }
 
+    public function testCreateDeprecatedService()
+    {
+        $definition = new Definition('stdClass');
+        $definition->setDeprecated(true);
+
+        $that = $this;
+        $wasTriggered = false;
+
+        set_error_handler(function ($errno, $errstr) use ($that, &$wasTriggered) {
+            $that->assertSame(E_USER_DEPRECATED, $errno);
+            $that->assertSame('The service deprecated_foo relies on a deprecated definition. You should avoid using it.', $errstr);
+            $wasTriggered = true;
+        });
+
+        $builder = new ContainerBuilder();
+        $builder->createService($definition, 'deprecated_foo');
+
+        restore_error_handler();
+
+        $this->assertTrue($wasTriggered);
+    }
+
     /**
      * @covers Symfony\Component\DependencyInjection\ContainerBuilder::register
      */

Original file line number	Diff line number	Diff line change
`@@ -931,6 +931,10 @@ public function createService(Definition $definition, $id, $tryProxy = true)`
`931`	`931`	`throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));`
`932`	`932`	`}`
`933`	`933`
	`934`	`+ if ($definition->isDeprecated()) {`
	`935`	`+ @trigger_error(sprintf('The service %s relies on a deprecated definition. You should avoid using it.', $id), E_USER_DEPRECATED);`
	`936`	`+ }`
	`937`	`+`
`934`	`938`	`if ($tryProxy && $definition->isLazy()) {`
`935`	`939`	`$container = $this;`
`936`	`940`