Add the possibility to register forms as services

doc/providers/form.rst

@@ -142,8 +142,12 @@ form by adding constraints on the fields::
 
 You can register form types by extending ``form.types``::
 
-    $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) {
+    $app['your.type.service'] = function ($app) {
+        return new YourServiceFormType();
+    };
+    $app->extend('form.types', function ($types) use ($app) {
         $types[] = new YourFormType();
+        $types[] = 'your.type.service';
 
         return $types;
     }));
@@ -159,16 +163,24 @@ You can register form extensions by extending ``form.extensions``::
 
 You can register form type extensions by extending ``form.type.extensions``::
 
+    $app['your.type.extension.service'] = function ($app) {
+        return new YourServiceFormTypeExtension();
+    };
     $app->extend('form.type.extensions', function ($extensions) use ($app) {
         $extensions[] = new YourFormTypeExtension();
+        $extensions[] = 'your.type.extension.service';
 
         return $extensions;
     });
 
 You can register form type guessers by extending ``form.type.guessers``::
 
+    $app['your.type.guesser.service'] = function ($app) {
+        return new YourServiceFormTypeGuesser();
+    };
     $app->extend('form.type.guessers', function ($guessers) use ($app) {
         $guessers[] = new YourFormTypeGuesser();
+        $guessers[] = 'your.type.guesser.service';
 
         return $guessers;
     });

src/Silex/Provider/Form/SilexFormExtension.php

+<?php
+
+/*
+ * This file is part of the Silex framework.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Silex\Provider\Form;
+
+use Pimple\Container;
+use Symfony\Component\Form\Exception\InvalidArgumentException;
+use Symfony\Component\Form\FormExtensionInterface;
+use Symfony\Component\Form\FormTypeGuesserChain;
+
+class SilexFormExtension implements FormExtensionInterface
+{
+    private $app;
+    private $types;
+    private $typeExtensions;
+    private $guessers;
+    private $guesserLoaded = false;
+    private $guesser;
+
+    public function __construct(Container $app, array $types, array $typeExtensions, array $guessers)
+    {
+        $this->app = $app;
+        $this->setTypes($types);
+        $this->setTypeExtensions($typeExtensions);
+        $this->setGuessers($guessers);
+    }
+
+    public function getType($name)
+    {
+        if (!isset($this->types[$name])) {
+            throw new InvalidArgumentException(sprintf('The type "%s" is not the name of a registered form type.', $name));
+        }
+        if (!is_object($this->types[$name])) {
+            $this->types[$name] = $this->app[$this->types[$name]];
+        }
+
+        return $this->types[$name];
+    }
+
+    public function hasType($name)
+    {
+        return isset($this->types[$name]);
+    }
+
+    public function getTypeExtensions($name)
+    {
+        return isset($this->typeExtensions[$name]) ? $this->typeExtensions[$name] : [];
+    }
+
+    public function hasTypeExtensions($name)
+    {
+        return isset($this->typeExtensions[$name]);
+    }
+
+    public function getTypeGuesser()
+    {
+        if (!$this->guesserLoaded) {
+            $this->guesserLoaded = true;
+
+            if ($this->guessers) {
+                $guessers = [];
+                foreach ($this->guessers as $guesser) {
+                    if (!is_object($guesser)) {
+                        $guesser = $this->app[$guesser];
+                    }
+                    $guessers[] = $guesser;
+                }
+                $this->guesser = new FormTypeGuesserChain($guessers);
+            }
+        }
+
+        return $this->guesser;
+    }
+
+    private function setTypes(array $types)
+    {
+        $this->types = [];
+        foreach ($types as $type) {
+            if (!is_object($type)) {
+                if (!isset($this->app[$type])) {
+                    throw new InvalidArgumentException(sprintf('Invalid form type. The silex service "%s" does not exist.', $type));
+                }
+                $this->types[$type] = $type;
+            } else {
+                $this->types[get_class($type)] = $type;
+            }
+        }
+    }
+
+    private function setTypeExtensions(array $typeExtensions)
+    {
+        $this->typeExtensions = [];
+        foreach ($typeExtensions as $extension) {
+            if (!is_object($extension)) {
+                if (!isset($this->app[$extension])) {
+                    throw new InvalidArgumentException(sprintf('Invalid form type extension. The silex service "%s" does not exist.', $extension));
+                }
+                $extension = $this->app[$extension];
+            }
+            $this->typeExtensions[$extension->getExtendedType()][] = $extension;
+        }
+    }
+
+    private function setGuessers(array $guessers)
+    {
+        $this->guessers = [];
+        foreach ($guessers as $guesser) {
+            if (!is_object($guesser) && !isset($this->app[$guesser])) {
+                throw new InvalidArgumentException(sprintf('Invalid form type guesser. The silex service "%s" does not exist.', $guesser));
+            }
+            $this->guessers[] = $guesser;
+        }
+    }
+}

src/Silex/Provider/FormServiceProvider.php

@@ -63,8 +63,13 @@ class FormServiceProvider implements ServiceProviderInterface
             return new CsrfExtension($app['csrf.token_manager']);
         };
 
+        $app['form.extension.silex'] = function ($app) {
+            return new Form\SilexFormExtension($app, $app['form.types'], $app['form.type.extensions'], $app['form.type.guessers']);
+        };
+
         $app['form.extensions'] = function ($app) {
             $extensions = array(
+                $app['form.extension.silex'],
                 new HttpFoundationExtension(),
             );
 
@@ -82,9 +87,6 @@ class FormServiceProvider implements ServiceProviderInterface
         $app['form.factory'] = function ($app) {
             return Forms::createFormFactoryBuilder()
                 ->addExtensions($app['form.extensions'])
-                ->addTypes($app['form.types'])
-                ->addTypeExtensions($app['form.type.extensions'])
-                ->addTypeGuessers($app['form.type.guessers'])
                 ->setResolvedTypeFactory($app['form.resolved_type_factory'])
                 ->getFormFactory()
             ;

tests/Silex/Tests/Provider/FormServiceProviderTest.php

@@ -53,6 +53,51 @@ class FormServiceProviderTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Symfony\Component\Form\Form', $form);
     }
 
+    public function testFormServiceProviderWillLoadTypesServices()
+    {
+        $app = new Application();
+
+        $app->register(new FormServiceProvider());
+
+        $app['dummy'] = function () {
+            return new DummyFormType();
+        };
+        $app->extend('form.types', function ($extensions) {
+            $extensions[] = 'dummy';
+
+            return $extensions;
+        });
+
+        $form = $app['form.factory']
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', array())
+            ->add('dummy', 'dummy')
+            ->getForm();
+
+        $this->assertInstanceOf('Symfony\Component\Form\Form', $form);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid form type. The silex service "dummy" does not exist.
+     */
+    public function testNonExistentTypeService()
+    {
+        $app = new Application();
+
+        $app->register(new FormServiceProvider());
+
+        $app->extend('form.types', function ($extensions) {
+            $extensions[] = 'dummy';
+
+            return $extensions;
+        });
+
+        $app['form.factory']
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', array())
+            ->add('dummy', 'dummy')
+            ->getForm();
+    }
+
     public function testFormServiceProviderWillLoadTypeExtensions()
     {
         $app = new Application();
@@ -72,6 +117,51 @@ class FormServiceProviderTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Symfony\Component\Form\Form', $form);
     }
 
+    public function testFormServiceProviderWillLoadTypeExtensionsServices()
+    {
+        $app = new Application();
+
+        $app->register(new FormServiceProvider());
+
+        $app['dummy.form.type.extension'] = function () {
+            return new DummyFormTypeExtension();
+        };
+        $app->extend('form.type.extensions', function ($extensions) {
+            $extensions[] = 'dummy.form.type.extension';
+
+            return $extensions;
+        });
+
+        $form = $app['form.factory']
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', array())
+            ->add('file', 'Symfony\Component\Form\Extension\Core\Type\FileType', array('image_path' => 'webPath'))
+            ->getForm();
+
+        $this->assertInstanceOf('Symfony\Component\Form\Form', $form);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid form type extension. The silex service "dummy.form.type.extension" does not exist.
+     */
+    public function testNonExistentTypeExtensionService()
+    {
+        $app = new Application();
+
+        $app->register(new FormServiceProvider());
+
+        $app->extend('form.type.extensions', function ($extensions) {
+            $extensions[] = 'dummy.form.type.extension';
+
+            return $extensions;
+        });
+
+        $app['form.factory']
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', array())
+            ->add('dummy', 'dummy.form.type')
+            ->getForm();
+    }
+
     public function testFormServiceProviderWillLoadTypeGuessers()
     {
         $app = new Application();
@@ -87,6 +177,43 @@ class FormServiceProviderTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Symfony\Component\Form\FormFactory', $app['form.factory']);
     }
 
+    public function testFormServiceProviderWillLoadTypeGuessersServices()
+    {
+        $app = new Application();
+
+        $app->register(new FormServiceProvider());
+
+        $app['dummy.form.type.guesser'] = function () {
+            return new FormTypeGuesserChain(array());
+        };
+        $app->extend('form.type.guessers', function ($guessers) {
+            $guessers[] = 'dummy.form.type.guesser';
+
+            return $guessers;
+        });
+
+        $this->assertInstanceOf('Symfony\Component\Form\FormFactory', $app['form.factory']);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid form type guesser. The silex service "dummy.form.type.guesser" does not exist.
+     */
+    public function testNonExistentTypeGuesserService()
+    {
+        $app = new Application();
+
+        $app->register(new FormServiceProvider());
+
+        $app->extend('form.type.guessers', function ($extensions) {
+            $extensions[] = 'dummy.form.type.guesser';
+
+            return $extensions;
+        });
+
+        $factory = $app['form.factory'];
+    }
+
     public function testFormServiceProviderWillUseTranslatorIfAvailable()
     {
         $app = new Application();
@@ -159,8 +286,22 @@ class FormServiceProviderTest extends \PHPUnit_Framework_TestCase
     }
 }
 
-class DummyFormType extends AbstractType
-{
+if (!class_exists('Symfony\Component\Form\Deprecated\FormEvents')) {
+    class DummyFormType extends AbstractType
+    {
+    }
+} else {
+    // FormTypeInterface::getName() is needed by the form component 2.8.x
+    class DummyFormType extends AbstractType
+    {
+        /**
+         * @return string The name of this type
+         */
+        public function getName()
+        {
+            return 'dummy';
+        }
+    }
 }
 
 if (method_exists('Symfony\Component\Form\AbstractType', 'configureOptions')) {