Support setter autowiring

dunglas · dunglas · commit 55b626f313cb · 2016-12-09T15:21:14.000+01:00
diff --git a/DependencyInjection/DunglasActionExtension.php b/DependencyInjection/DunglasActionExtension.php
@@ -127,7 +127,11 @@ private function registerClass(ContainerBuilder $container, $className, array $t
         }
 
         $definition = $container->register($className, $className);
-        $definition->setAutowired(true);
+        if (method_exists($definition, 'setAutowiredMethods')) {
+            $definition->setAutowiredMethods(['__construct', 'set*']);
+        } else {
+            $definition->setAutowired(true);
+        }
 
         // Inject the container if applicable
         if (is_a($className, ContainerAwareInterface::class, true)) {
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -60,7 +60,7 @@ public function testInvalidTag()
     {
         $processor = new Processor();
 
-        $config = $processor->processConfiguration(new Configuration(true), [[
+        $processor->processConfiguration(new Configuration(true), [[
             'tags' => [__CLASS__ => [['console.command', 'invalid']]],
         ]]);
     }
diff --git a/Tests/Fixtures/TestBundle/Action/SetterAction.php b/Tests/Fixtures/TestBundle/Action/SetterAction.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action;
+
+use Dunglas\ActionBundle\Tests\Fixtures\TestBundle\DummyService;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class SetterAction
+{
+    /**
+     * @var DummyService
+     */
+    private $dummyService;
+
+    public function setDummyService(DummyService $dummyService)
+    {
+        $this->dummyService = $dummyService;
+    }
+
+    public function __invoke()
+    {
+        $this->dummyService->doSomething();
+
+        return new Response('setter');
+    }
+}
diff --git a/Tests/Fixtures/TestKernel.php b/Tests/Fixtures/TestKernel.php
@@ -8,7 +8,11 @@
  */
 
 use Dunglas\ActionBundle\DunglasActionBundle;
+use Dunglas\ActionBundle\Tests\Fixtures\IsolatedAction\AnIsolatedAction;
 use Dunglas\ActionBundle\Tests\Fixtures\NotScannedBundle\NotScannedBundle;
+use Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action\DummyAction;
+use Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action\OverrideAction;
+use Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action\SetterAction;
 use Dunglas\ActionBundle\Tests\Fixtures\TestBundle\TestBundle;
 use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -45,8 +49,9 @@ public function registerBundles()
     protected function configureRoutes(RouteCollectionBuilder $routes)
     {
         // Specify explicitly the controller
-        $routes->add('/', 'Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action\DummyAction', 'dummy');
-        $routes->add('/isolated', 'Dunglas\ActionBundle\Tests\Fixtures\IsolatedAction\AnIsolatedAction', 'isolated');
+        $routes->add('/', DummyAction::class, 'dummy');
+        $routes->add('/isolated', AnIsolatedAction::class, 'isolated');
+        $routes->add('/setter', SetterAction::class, 'setter');
 
         // Use the @Route annotation
         $routes->import('@TestBundle/Action/', '/', 'annotation');
@@ -77,6 +82,6 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             ],
         ]);
 
-        $c->register('Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action\OverrideAction', 'Dunglas\ActionBundle\Tests\Fixtures\TestBundle\Action\OverrideAction');
+        $c->register(OverrideAction::class, OverrideAction::class);
     }
 }
diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
@@ -10,6 +10,7 @@
 namespace Dunglas\ActionBundle\Tests;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\DependencyInjection\Definition;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
@@ -90,4 +91,16 @@ public function testCanAccessTraditionalController()
         $crawler = $client->request('GET', '/traditional');
         $this->assertSame('traditional', $crawler->text());
     }
+
+    public function testSetterAutowiring()
+    {
+        if (!method_exists(Definition::class, 'setAutowiredMethods')) {
+            $this->markTestSkipped('Setter autowiring requires Symfony 3.3+');
+        }
+
+        $client = static::createClient();
+
+        $crawler = $client->request('GET', '/setter');
+        $this->assertSame('setter', $crawler->text());
+    }
 }
diff --git a/composer.json b/composer.json
@@ -12,6 +12,12 @@
       "homepage": "https://dunglas.fr"
     }
   ],
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/dunglas/symfony"
+    }
+  ],
   "require": {
     "php": ">=5.5.9 <7.2.0",
     "symfony/config": "~2.8||~3.0",
@@ -20,6 +26,7 @@
     "symfony/http-kernel": "~2.8||~3.0"
   },
   "require-dev": {
+    "symfony/symfony": "dev-autowiring as 3.3.0",
     "phpunit/phpunit": "^5.0||^4.6",
     "sensio/framework-extra-bundle": "^3.0.10",
     "symfony/console": "~2.8||~3.0",

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testInvalidTag()`
`60`	`60`	`{`
`61`	`61`	`$processor = new Processor();`
`62`	`62`
`63`		`- $config = $processor->processConfiguration(new Configuration(true), [[`
	`63`	`+ $processor->processConfiguration(new Configuration(true), [[`
`64`	`64`	`'tags' => [__CLASS__ => [['console.command', 'invalid']]],`
`65`	`65`	`]]);`
`66`	`66`	`}`