Flag to enable/disable autowiring. no_autowiring tag.

symfony · dunglas · Aug 24, 2015 · Aug 25, 2015 · Aug 25, 2015 · Aug 25, 2015
commit afe009ad399442b3d1b12c40fb8da6eb1ef036bd
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -17,6 +17,8 @@
             <argument type="service" id="annotations.reader" />
             <argument /><!-- Cache Implementation -->
             <argument /><!-- Debug-Flag -->
+
+            <tag name="no_autowiring" />
         </service>
 
         <service id="annotations.file_cache_reader" class="%annotations.file_cache_reader.class%" public="false">

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -55,7 +55,9 @@
             <argument>%session.save_path%</argument>
         </service>
 
-        <service id="session.handler.write_check" class="%session.handler.write_check.class%" public="false" />
+        <service id="session.handler.write_check" class="%session.handler.write_check.class%" public="false">
+            <tag name="no_autowiring" />
+        </service>
 
         <service id="session_listener" class="%session_listener.class%">
             <tag name="kernel.event_subscriber" />

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowiringPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowiringPass.php
@@ -23,6 +23,8 @@
  */
 class AutowiringPass implements CompilerPassInterface
 {
+    const NO_AUTOWIRING = 'no_autowiring';
+
     private $container;
     private $reflectionClasses = array();
     private $definedTypes = array();
@@ -36,7 +38,9 @@ public function process(ContainerBuilder $container)
     {
         $this->container = $container;
         foreach ($container->getDefinitions() as $id => $definition) {
-            $this->completeDefinition($id, $definition);
+            if (!$definition->hasTag(self::NO_AUTOWIRING)) {
+                $this->completeDefinition($id, $definition);
+            }
         }
 
         // Free memory and remove circular reference to container

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -27,10 +27,12 @@ class Compiler
 
     /**
      * Constructor.
+     *
+     * @param bool $autowiring Enable the autowiring
      */
-    public function __construct()
+    public function __construct($autowiring = false)
     {
-        $this->passConfig = new PassConfig();
+        $this->passConfig = new PassConfig($autowiring);
         $this->serviceReferenceGraph = new ServiceReferenceGraph();
         $this->loggingFormatter = new LoggingFormatter();
     }

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -37,8 +37,10 @@ class PassConfig
 
     /**
      * Constructor.
+     *
+     * @param bool $autowiring Enable the autowiring
      */
-    public function __construct()
+    public function __construct($autowiring = false)
     {
         $this->mergePass = new MergeExtensionConfigurationPass();
 
@@ -50,11 +52,17 @@ public function __construct()
             new CheckDefinitionValidityPass(),
             new ResolveReferencesToAliasesPass(),
             new ResolveInvalidReferencesPass(),
-            new AutowiringPass(),
+        );
+
+        if ($autowiring) {
+            $this->optimizationPasses[] = new AutowiringPass();
+        }
+
+        $this->optimizationPasses = array_merge($this->optimizationPasses, array(
             new AnalyzeServiceReferencesPass(true),
             new CheckCircularReferencesPass(),
             new CheckReferenceValidityPass(),
-        );
+        ));
 
         $this->removingPasses = array(
             new RemovePrivateAliasesPass(),

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -325,7 +325,7 @@ public function getCompilerPassConfig()
     public function getCompiler()
     {
         if (null === $this->compiler) {
-            $this->compiler = new Compiler();
+            $this->compiler = new Compiler($this->hasParameter('container.autowiring') ? $this->getParameter('container.autowiring') : false);
         }
 
         return $this->compiler;

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowiringPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowiringPassTest.php
@@ -97,7 +97,7 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
-     * @expectedExceptionMessage Unable to autowire type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface".
+     * @expectedExceptionMessage Unable to autowire argument of type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" for the service "a".
      */
     public function testTypeCollision()
     {
@@ -178,6 +178,20 @@ public function testOptionalParameter()
         $this->assertEquals('a', $definition->getArgument(1));
         $this->assertEquals('foo', $definition->getArgument(2));
     }
+
+    public function testNoAutowiringTag()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('foo', __NAMESPACE__.'\Foo');
+        $barDefintion = $container->register('bar', __NAMESPACE__.'\Bar');
+        $barDefintion->addTag(AutowiringPass::NO_AUTOWIRING);
+
+        $pass = new AutowiringPass();
+        $pass->process($container);
+
+        $this->assertCount(0, $container->getDefinition('bar')->getArguments());
+    }
 }
 
 class Foo

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -59,6 +59,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $name;
     protected $startTime;
     protected $loadClassCache;
+    protected $containerAutowiring = true;
 
     const VERSION = '2.8.0-DEV';
     const VERSION_ID = 20800;
@@ -552,6 +553,7 @@ protected function getKernelParameters()
                 'kernel.bundles' => $bundles,
                 'kernel.charset' => $this->getCharset(),
                 'kernel.container_class' => $this->getContainerClass(),
+                'container.autowiring' => $this->containerAutowiring,
             ),
             $this->getEnvParameters()
         );