Fix some tests

symfony · dunglas · Aug 24, 2015 · Aug 25, 2015 · Aug 25, 2015 · Aug 25, 2015
commit 7ab5b0873ed24ec42a5e29455c97140c70966d65
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -127,6 +127,8 @@
             <argument /> <!-- The custom success handler service id -->
             <argument type="collection" /> <!-- Options -->
             <argument /> <!-- Provider-shared Key -->
+
+            <tag name="no_autowiring" />
         </service>
 
         <service id="security.authentication.success_handler" class="%security.authentication.success_handler.class%" abstract="true" public="false">

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

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -40,7 +40,7 @@ class PassConfig
      *
      * @param bool $autowiring Enable the autowiring
      */
-    public function __construct($autowiring = false)
+    public function __construct($autowiring = true)
     {
         $this->mergePass = new MergeExtensionConfigurationPass();
 

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->hasParameter('container.autowiring') ? $this->getParameter('container.autowiring') : false);
+            $this->compiler = new Compiler($this->hasParameter('container.autowiring') ? $this->getParameter('container.autowiring') : true);
         }
 
         return $this->compiler;

diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -893,7 +893,7 @@ public function testLazyLoadedService()
 
     public function testAutowiring()
     {
-        $container = new ContainerBuilder();
+        $container = new ContainerBuilder(new ParameterBag(array('container.autowiring' => true)));
 
         $container->register('a', __NAMESPACE__.'\A');
         $container->register('b', __NAMESPACE__.'\B');