Merge pull request #24 from codete/autoconfiguration

Add autoconfigure support

Author: malarzm

DependencyInjection/CodeteFormGeneratorExtension.php

@@ -2,6 +2,12 @@
 
 namespace Codete\FormGeneratorBundle\DependencyInjection;
 
+use Codete\FormGeneratorBundle\DependencyInjection\Compiler\ConfigurationModifiersCompilerPass;
+use Codete\FormGeneratorBundle\DependencyInjection\Compiler\FieldResolversCompilerPass;
+use Codete\FormGeneratorBundle\DependencyInjection\Compiler\ViewProvidersCompilerPass;
+use Codete\FormGeneratorBundle\FormConfigurationModifierInterface;
+use Codete\FormGeneratorBundle\FormFieldResolverInterface;
+use Codete\FormGeneratorBundle\FormViewProviderInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -16,5 +22,14 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('form_generator.xml');
+
+        if (method_exists($container, 'registerForAutoconfiguration')) {
+            $container->registerForAutoconfiguration(FormConfigurationModifierInterface::class)
+                ->addTag(ConfigurationModifiersCompilerPass::TAG);
+            $container->registerForAutoconfiguration(FormViewProviderInterface::class)
+                ->addTag(ViewProvidersCompilerPass::TAG);
+            $container->registerForAutoconfiguration(FormFieldResolverInterface::class)
+                ->addTag(FieldResolversCompilerPass::TAG);
+        }
     }
 }

DependencyInjection/Compiler/ConfigurationModifiersCompilerPass.php

@@ -7,6 +7,8 @@
  */
 class ConfigurationModifiersCompilerPass extends AbstractCompilerPass
 {
+    const TAG = 'form_generator.configuration_modifier';
+
     /**
      * @inheritdoc
      */
@@ -20,6 +22,6 @@ protected function getMethodToCall()
      */
     protected function getTagName()
     {
-        return 'form_generator.configuration_modifier';
+        return self::TAG;
     }
 }

DependencyInjection/Compiler/FieldResolversCompilerPass.php

@@ -7,6 +7,8 @@
  */
 class FieldResolversCompilerPass extends AbstractCompilerPass
 {
+    const TAG = 'form_generator.field_resolver';
+
     /**
      * @inheritdoc
      */
@@ -20,6 +22,6 @@ protected function getMethodToCall()
      */
     protected function getTagName()
     {
-        return 'form_generator.field_resolver';
+        return self::TAG;
     }
 }

DependencyInjection/Compiler/ViewProvidersCompilerPass.php

@@ -7,6 +7,8 @@
  */
 class ViewProvidersCompilerPass extends AbstractCompilerPass
 {
+    const TAG = 'form_generator.view_provider';
+
     /**
      * @inheritdoc
      */
@@ -20,6 +22,6 @@ protected function getMethodToCall()
      */
     protected function getTagName()
     {
-        return 'form_generator.view_provider';
+        return self::TAG;
     }
 }

README.md

@@ -122,7 +122,7 @@ public $person;
 This will build form from all nested model properties,
 but we can specify which view we want to use:
 
- ``` php
+``` php
 /*
 * @Form\Embed(
 *   class = "Codete\FormGeneratorBundle\Tests\Model\Person",
@@ -132,6 +132,11 @@ but we can specify which view we want to use:
 public $employee;
 ```
 
+---
+
+**If you have enabled [Service autoconfiguration](http://symfony.com/blog/new-in-symfony-3-3-service-autoconfiguration)
+the bundle (since version 1.2.0) will automatically tag services for you.**
+
 FormViewProvider
 ----------------
 

Tests/DependencyInjection/CodeteFormGeneratorExtensionTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace DependencyInjection;
+
+use Codete\FormGeneratorBundle\DependencyInjection\CodeteFormGeneratorExtension;
+use Codete\FormGeneratorBundle\DependencyInjection\Compiler\ConfigurationModifiersCompilerPass;
+use Codete\FormGeneratorBundle\DependencyInjection\Compiler\FieldResolversCompilerPass;
+use Codete\FormGeneratorBundle\DependencyInjection\Compiler\ViewProvidersCompilerPass;
+use Codete\FormGeneratorBundle\FormConfigurationModifierInterface;
+use Codete\FormGeneratorBundle\FormFieldResolverInterface;
+use Codete\FormGeneratorBundle\FormViewProviderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class CodeteFormGeneratorExtensionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCoreServicesAreLoaded()
+    {
+        $container = new ContainerBuilder();
+        $extension = new CodeteFormGeneratorExtension();
+        $extension->load([], $container);
+
+        $this->assertTrue($container->has('form_generator'));
+        $this->assertTrue($container->has('form_generator.type.embed'));
+        $embedType = $container->getDefinition('form_generator.type.embed');
+        $this->assertTrue($embedType->hasTag('form.type'));
+    }
+
+    public function testAutoconfigure()
+    {
+        if (! method_exists(ContainerBuilder::class, 'registerForAutoconfiguration')) {
+            $this->markTestSkipped('This test requires Symfony 3.3 or above');
+        }
+
+        $container = new ContainerBuilder();
+        $extension = new CodeteFormGeneratorExtension();
+        $extension->load([], $container);
+        $autoconfigure = $container->getAutoconfiguredInstanceof();
+
+        $this->assertArrayHasKey(FormConfigurationModifierInterface::class, $autoconfigure);
+        $this->assertTrue($autoconfigure[FormConfigurationModifierInterface::class]->hasTag(ConfigurationModifiersCompilerPass::TAG));
+
+        $this->assertArrayHasKey(FormViewProviderInterface::class, $autoconfigure);
+        $this->assertTrue($autoconfigure[FormViewProviderInterface::class]->hasTag(ViewProvidersCompilerPass::TAG));
+
+        $this->assertArrayHasKey(FormFieldResolverInterface::class, $autoconfigure);
+        $this->assertTrue($autoconfigure[FormFieldResolverInterface::class]->hasTag(FieldResolversCompilerPass::TAG));
+    }
+}