Rely *explicitly* on FrameworkBundle's FormPass (#399)

sonata-project · Apr 27, 2017 · 6da6436 · 6da6436
1 parent bc3cc80
commit 6da6436
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/DependencyInjection/Compiler/FormFactoryCompilerPass.php b/DependencyInjection/Compiler/FormFactoryCompilerPass.php
@@ -11,10 +11,10 @@
 
 namespace Sonata\CoreBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class FormFactoryCompilerPass implements CompilerPassInterface
+class FormFactoryCompilerPass extends FormPass
 {
     /**
      * {@inheritdoc}
@@ -41,6 +41,7 @@ public function process(ContainerBuilder $container)
 
         // get factories
         $original = $container->getDefinition('form.extension');
+        parent::process($container);
 
         $factory = $container->getDefinition('sonata.core.form.extension.dependency');
         $factory->replaceArgument(1, $original->getArgument(1));

diff --git a/Tests/DependencyInjection/Compiler/FormFactoryCompilerPassTest.php b/Tests/DependencyInjection/Compiler/FormFactoryCompilerPassTest.php
@@ -52,27 +52,22 @@ public function testProcessWithContainerHasNoFormExtensionDefinition()
 
     public function testProcessWithContainerHasFormExtensionDefinition()
     {
-        $formExtension = new Definition();
-        $formExtension->addArgument('foo');
-        $formExtension->addArgument('bar');
-        $formExtension->addArgument('baz');
-        $formExtension->addArgument('caz');
+        $formExtension = new Definition(null, array(null, null, null, null));
         $this->setDefinition('form.extension', $formExtension);
 
-        $sonataFormExtension = new Definition();
-        $sonataFormExtension->addArgument('extension-foo');
-        $sonataFormExtension->addArgument('extension-bar');
-        $sonataFormExtension->addArgument('extension-baz');
-        $sonataFormExtension->addArgument('extension-caz');
+        $formType = new Definition();
+        $formType->addTag('form.type');
+        $this->setDefinition('foo', $formType);
+
+        $sonataFormExtension = new Definition(null, array(null, null, null, null));
         $this->setDefinition('sonata.core.form.extension.dependency', $sonataFormExtension);
 
         $this->compile();
 
-        $expectedFormExtension = $this->container->getDefinition('form.extension');
+        $this->assertSame($sonataFormExtension, $this->container->getDefinition('form.extension'));
 
-        $this->assertSame('extension-foo', $expectedFormExtension->getArgument(0));
-        $this->assertSame('bar', $expectedFormExtension->getArgument(1));
-        $this->assertSame('baz', $expectedFormExtension->getArgument(2));
-        $this->assertSame('caz', $expectedFormExtension->getArgument(3));
+        $this->assertContains('foo', $sonataFormExtension->getArgument(1));
+        $this->assertSame(array(), $sonataFormExtension->getArgument(2));
+        $this->assertSame(array(), $sonataFormExtension->getArgument(3));
     }
 }
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "sonata-project/datagrid-bundle": "^2.0",
         "symfony/config": "^2.3 || ^3.0",
         "symfony/form": "^2.3.5 || ^3.0",
+        "symfony/framework-bundle": "^2.3 || ^3.0",
         "symfony/http-foundation": "^2.3 || ^3.0",
         "symfony/property-access": "^2.3 || ^3.0",
         "symfony/security": "^2.3 || ^3.0",