Extract form and twig to extensions

sonata-project · Jun 4, 2020 · 02a4a1c · 02a4a1c
1 parent b6efcf6
commit 02a4a1c
Show file tree

Hide file tree

Showing 162 changed files with 150 additions and 9,078 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,8 @@
         "php": "^7.2",
         "cocur/slugify": "^3.0 || ^4.0",
         "sonata-project/doctrine-extensions": "^1.5",
+        "sonata-project/form-extensions": "^0.1",
+        "sonata-project/twig-extensions": "^0.1",
         "symfony/config": "^4.3",
         "symfony/dependency-injection": "^4.3",
         "symfony/event-dispatcher": "^4.3",
@@ -44,7 +46,7 @@
         "doctrine/orm": "^2.4",
         "doctrine/phpcr-odm": "^1.0",
         "jackalope/jackalope-doctrine-dbal": "^1.0",
-        "jms/serializer-bundle": "^2.0",
+        "jms/serializer-bundle": "^2.1 || ^3.0",
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "nelmio/api-doc-bundle": "^2.11",
@@ -69,17 +71,13 @@
     "autoload": {
         "psr-4": {
             "Sonata\\CoreBundle\\": "src/CoreBundle/",
-            "Sonata\\Form\\": "src/Form/",
-            "Sonata\\Serializer\\": "src/Serializer/",
-            "Sonata\\Twig\\": "src/Twig/"
+            "Sonata\\Serializer\\": "src/Serializer/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Sonata\\CoreBundle\\Tests\\": "tests/CoreBundle/",
-            "Sonata\\Form\\Tests\\": "tests/Form/",
-            "Sonata\\Serializer\\Tests\\": "tests/Serializer/",
-            "Sonata\\Twig\\Tests\\": "tests/Twig/"
+            "Sonata\\Serializer\\Tests\\": "tests/Serializer/"
         }
     },
     "abandoned": true

diff --git a/src/CoreBundle/DependencyInjection/Compiler/FormCompilerPass.php b/src/CoreBundle/DependencyInjection/Compiler/FormCompilerPass.php
@@ -132,13 +132,6 @@ private function forceUserToMoveConfig(ContainerBuilder $container)
             return;
         }
 
-        $defaultForm = [
-                'mapping' => [
-                    'enabled' => true,
-                    'type' => [],
-                    'extension' => [],
-                ],
-            ];
         $defaultSerializer = [
                 'formats' => [
                     0 => 'json',
@@ -147,12 +140,9 @@ private function forceUserToMoveConfig(ContainerBuilder $container)
                 ],
             ];
 
-        if ($container->getParameter('sonata.core.form') !== $defaultForm) {
-            throw new \Exception('Move bundle config from sonata_core.form to sonata_form.form');
-        }
-
         if ($container->getParameter('sonata.core.serializer') !== $defaultSerializer) {
-            throw new \Exception('Move bundle config from sonata_core.serializer to sonata_form.serializer');
+            throw new \Exception('You are register SonataFormBundle (sonata-project/form-extensions bridge). For now '.
+                'SonataCoreBundle will be use sonata_form configuration. Keep sonata_core.serializer section clear and use sonata_form.serializer instead.');
         }
     }
 }
diff --git a/src/CoreBundle/DependencyInjection/Compiler/TwigCompilerPass.php b/src/CoreBundle/DependencyInjection/Compiler/TwigCompilerPass.php
@@ -101,7 +101,9 @@ private function forceUserToMoveConfig(ContainerBuilder $container)
         }
 
         if (!empty($container->getParameter('sonata.core.flashmessage'))) {
-            throw new \Exception('Move bundle config from sonata_core.flashmessage to sonata_twig.flashmessage');
+            throw new \Exception('You are register SonataTwigBundle (sonata-project/twig-extensions bridge). '.
+                'For now SonataCoreBundle will be use sonata_twig configuration. '.
+                'Keep sonata_core.flashmessage section clear and use sonata_form.flashmessage instead.');
         }
     }
 }
diff --git a/src/CoreBundle/Form/Type/BooleanType.php b/src/CoreBundle/Form/Type/BooleanType.php
@@ -14,6 +14,8 @@
 namespace Sonata\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +37,31 @@ public function getName()
     {
         return 'sonata_type_boolean_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $defaultOptions = [
+            'transform' => false,
+            /*
+             * NEXT_MAJOR: remove this block.
+             * @deprecated since sonata-project/form-extensions 0.x, to be removed in 1.0.
+             */
+            'catalogue' => 'SonataCoreBundle',
+            'choice_translation_domain' => 'SonataCoreBundle',
+            'choices' => [
+                'label_type_yes' => self::TYPE_YES,
+                'label_type_no' => self::TYPE_NO,
+            ],
+            // Use directly translation_domain
+            'translation_domain' => static function (Options $options) {
+                if ($options['catalogue']) {
+                    return $options['catalogue'];
+                }
+
+                return $options['translation_domain'];
+            },
+        ];
+
+        $resolver->setDefaults($defaultOptions);
+    }
 }
diff --git a/src/CoreBundle/Form/Type/CollectionType.php b/src/CoreBundle/Form/Type/CollectionType.php
@@ -13,7 +13,9 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +37,16 @@ public function getName()
     {
         return 'sonata_type_collection_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'modifiable' => false,
+            'type' => TextType::class,
+            'type_options' => [],
+            'pre_bind_data_callback' => null,
+            'btn_add' => 'link_add',
+            'btn_catalogue' => 'SonataCoreBundle',
+        ]);
+    }
 }
diff --git a/src/CoreBundle/Form/Type/DateRangePickerType.php b/src/CoreBundle/Form/Type/DateRangePickerType.php
@@ -14,6 +14,7 @@
 namespace Sonata\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +36,16 @@ public function getName()
     {
         return 'sonata_type_date_range_picker_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'field_options' => [],
+            'field_options_start' => [],
+            'field_options_end' => [
+                'dp_use_current' => false,
+            ],
+            'field_type' => DatePickerType::class,
+        ]);
+    }
 }
diff --git a/src/CoreBundle/Form/Type/DateTimePickerType.php b/src/CoreBundle/Form/Type/DateTimePickerType.php
@@ -13,7 +13,9 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +37,17 @@ public function getName()
     {
         return 'sonata_type_datetime_picker_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array_merge($this->getCommonDefaults(), [
+            'dp_use_minutes' => true,
+            'dp_use_seconds' => true,
+            'dp_minute_stepping' => 1,
+            'format' => DateTimeType::DEFAULT_DATE_FORMAT,
+            'date_format' => null,
+        ]));
+
+        parent::configureOptions($resolver);
+    }
 }
diff --git a/src/CoreBundle/Form/Type/DateTimeRangePickerType.php b/src/CoreBundle/Form/Type/DateTimeRangePickerType.php
@@ -14,6 +14,7 @@
 namespace Sonata\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +36,16 @@ public function getName()
     {
         return 'sonata_type_datetime_range_picker_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'field_options' => [],
+            'field_options_start' => [],
+            'field_options_end' => [
+                'dp_use_current' => false,
+            ],
+            'field_type' => DateTimePickerType::class,
+        ]);
+    }
 }
diff --git a/src/CoreBundle/Form/Type/DateTimeRangeType.php b/src/CoreBundle/Form/Type/DateTimeRangeType.php
@@ -13,7 +13,9 @@
 
 namespace Sonata\CoreBundle\Form\Type;
 
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +37,14 @@ public function getName()
     {
         return 'sonata_type_datetime_range_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'field_options' => [],
+            'field_options_start' => [],
+            'field_options_end' => [],
+            'field_type' => DateTimeType::class,
+        ]);
+    }
 }
diff --git a/src/CoreBundle/Form/Type/EqualType.php b/src/CoreBundle/Form/Type/EqualType.php
@@ -14,6 +14,7 @@
 namespace Sonata\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @deprecated since sonata-project/core-bundle 3.13.0, to be removed in 4.0.
@@ -35,4 +36,17 @@ public function getName()
     {
         return 'sonata_type_equal_legacy';
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $defaultOptions = [
+            'choice_translation_domain' => 'SonataCoreBundle',
+            'choices' => [
+                'label_type_equals' => self::TYPE_IS_EQUAL,
+                'label_type_not_equals' => self::TYPE_IS_NOT_EQUAL,
+            ],
+        ];
+
+        $resolver->setDefaults($defaultOptions);
+    }
 }
diff --git a/src/Form/Bridge/Symfony/DependencyInjection/Configuration.php b/src/Form/Bridge/Symfony/DependencyInjection/Configuration.php