Fix the configurability of CoreExtension deps in standalone usage

stof · stof · commit f4fc2e3cac35 · 2019-04-07T15:10:52.000+02:00
When using the Forms entrypoint to configure the component, there was
no chance to configure dependencies of the CoreExtension, as the one
registered without argument was first and would win.
The builder now delays the prepending of the CoreExtension to do it only
if the CoreExtension is not registered explicitly.
diff --git a/src/Symfony/Component/Form/FormFactoryBuilder.php b/src/Symfony/Component/Form/FormFactoryBuilder.php
@@ -11,13 +11,17 @@
 
 namespace Symfony\Component\Form;
 
+use Symfony\Component\Form\Extension\Core\CoreExtension;
+
 /**
  * The default implementation of FormFactoryBuilderInterface.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class FormFactoryBuilder implements FormFactoryBuilderInterface
 {
+    private $forceCoreExtension;
+
     /**
      * @var ResolvedFormTypeFactoryInterface
      */
@@ -43,6 +47,14 @@ class FormFactoryBuilder implements FormFactoryBuilderInterface
      */
     private $typeGuessers = [];
 
+    /**
+     * @param bool $forceCoreExtension
+     */
+    public function __construct($forceCoreExtension = false)
+    {
+        $this->forceCoreExtension = $forceCoreExtension;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -144,6 +156,21 @@ public function getFormFactory()
     {
         $extensions = $this->extensions;
 
+        if ($this->forceCoreExtension) {
+            $hasCoreExtension = false;
+
+            foreach ($extensions as $extension) {
+                if ($extension instanceof CoreExtension) {
+                    $hasCoreExtension = true;
+                    break;
+                }
+            }
+
+            if (!$hasCoreExtension) {
+                array_unshift($extensions, new CoreExtension());
+            }
+        }
+
         if (\count($this->types) > 0 || \count($this->typeExtensions) > 0 || \count($this->typeGuessers) > 0) {
             if (\count($this->typeGuessers) > 1) {
                 $typeGuesser = new FormTypeGuesserChain($this->typeGuessers);
diff --git a/src/Symfony/Component/Form/Forms.php b/src/Symfony/Component/Form/Forms.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form;
 
-use Symfony\Component\Form\Extension\Core\CoreExtension;
-
 /**
  * Entry point of the Form component.
  *
@@ -105,10 +103,7 @@ public static function createFormFactory()
      */
     public static function createFormFactoryBuilder()
     {
-        $builder = new FormFactoryBuilder();
-        $builder->addExtension(new CoreExtension());
-
-        return $builder;
+        return new FormFactoryBuilder(true);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Form;`
`13`	`13`
`14`		`-use Symfony\Component\Form\Extension\Core\CoreExtension;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* Entry point of the Form component.`
`18`	`16`	`*`
`@@ -105,10 +103,7 @@ public static function createFormFactory()`
`105`	`103`	`*/`
`106`	`104`	`public static function createFormFactoryBuilder()`
`107`	`105`	`{`
`108`		`- $builder = new FormFactoryBuilder();`
`109`		`- $builder->addExtension(new CoreExtension());`
`110`		`-`
`111`		`- return $builder;`
	`106`	`+ return new FormFactoryBuilder(true);`
`112`	`107`	`}`
`113`	`108`
`114`	`109`	`/**`