Make CoreBundle optional

composer.json

@@ -25,15 +25,16 @@
         "sonata-project/block-bundle": "^3.18.3",
         "sonata-project/classification-bundle": "^3.3",
         "sonata-project/comment-bundle": "^3.1",
-        "sonata-project/core-bundle": "^3.18.0",
         "sonata-project/datagrid-bundle": "^2.5",
         "sonata-project/doctrine-extensions": "^1.5",
         "sonata-project/doctrine-orm-admin-bundle": "^3.2",
+        "sonata-project/form-extensions": "^0.1 || ^1.3",
         "sonata-project/formatter-bundle": "^3.4 || ^4.0",
         "sonata-project/intl-bundle": "^2.4",
         "sonata-project/media-bundle": "^3.10",
         "sonata-project/notification-bundle": "^3.3",
         "sonata-project/seo-bundle": "^2.4",
+        "sonata-project/twig-extensions": "^0.1 || ^1.2",
         "sonata-project/user-bundle": "^4.0",
         "symfony/config": "^3.4 || ^4.0",
         "symfony/console": "^3.4 || ^4.0",
@@ -63,7 +64,7 @@
     },
     "require-dev": {
         "friendsofsymfony/rest-bundle": "^2.2",
-        "jms/serializer-bundle": "^1.0 || ^2.0",
+        "jms/serializer-bundle": "^2.0 || ^3.0",
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "nelmio/api-doc-bundle": "^2.13",

src/BasketBundle/Block/BasketBlockService.php

@@ -17,7 +17,7 @@
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\BlockBundle\Block\Service\AbstractAdminBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

src/BasketBundle/Form/ApiBasketElementParentType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\BasketBundle\Form;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiBasketElementParentType extends BaseDoctrineORMSerializationType
 {

src/BasketBundle/Form/ApiBasketParentType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\BasketBundle\Form;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiBasketParentType extends BaseDoctrineORMSerializationType
 {

src/BasketBundle/Resources/views/Basket/delivery_address_step.html.twig

@@ -12,7 +12,7 @@ file that was distributed with this source code.
 {% sonata_template_box 'This is the basket delivery address step template. Feel free to override it.' %}
 
 {% block sonata_flash_messages %}
-    {% include '@SonataCore/FlashMessage/render.html.twig' %}
+    {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] %}
 {% endblock %}
 
 {% include '@SonataBasket/Basket/stepper.html.twig' with {step: 'delivery'} %}

src/BasketBundle/Resources/views/Basket/delivery_step.html.twig

@@ -12,7 +12,7 @@ file that was distributed with this source code.
 {% sonata_template_box 'This is the basket delivery address template. Feel free to override it.' %}
 
 {% block sonata_flash_messages %}
-    {% include '@SonataCore/FlashMessage/render.html.twig' %}
+    {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] %}
 {% endblock %}
 
 {% include '@SonataBasket/Basket/stepper.html.twig' with {step: 'delivery'} %}

src/BasketBundle/Resources/views/Basket/index.html.twig

@@ -10,7 +10,7 @@ file that was distributed with this source code.
 #}
 
 {% block sonata_flash_messages %}
-    {% include '@SonataCore/FlashMessage/render.html.twig' %}
+    {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] %}
 {% endblock %}
 
 {% sonata_template_box 'This is the basket page template. Feel free to override it.' %}

src/BasketBundle/Resources/views/Basket/payment_address_step.html.twig

@@ -12,7 +12,7 @@ file that was distributed with this source code.
 {% sonata_template_box 'This is the basket billing address step template. Feel free to override it.' %}
 
 {% block sonata_flash_messages %}
-    {% include '@SonataCore/FlashMessage/render.html.twig' with {domain: 'SonataCustomerBundle'} %}
+    {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] with {domain: 'SonataCustomerBundle'} %}
 {% endblock %}
 
 {% include '@SonataBasket/Basket/stepper.html.twig' with {step: 'billing'} %}

src/BasketBundle/Resources/views/Basket/payment_step.html.twig

@@ -12,7 +12,7 @@ file that was distributed with this source code.
 {% sonata_template_box 'This is the basket billing step template. Feel free to override it.' %}
 
 {% block sonata_flash_messages %}
-    {% include '@SonataCore/FlashMessage/render.html.twig' %}
+    {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] %}
 {% endblock %}
 
 {% include '@SonataBasket/Basket/stepper.html.twig' with {step: 'billing'} %}

src/BasketBundle/Serializer/BasketSerializerHandler.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\BasketBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Form\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>

src/BasketBundle/SonataBasketBundle.php

@@ -42,18 +42,22 @@ public function boot(): void
 
     /**
      * Register form mapping information.
+     *
+     * NEXT_MAJOR: remove this method
      */
     public function registerFormMapping(): void
     {
-        FormHelper::registerFormTypeMapping([
-            'sonata_basket_basket' => BasketType::class,
-            'sonata_basket_address' => AddressType::class,
-            'sonata_basket_shipping' => ShippingType::class,
-            'sonata_basket_payment' => PaymentType::class,
-            'sonata_basket_api_form_basket' => ApiBasketType::class,
-            'sonata_basket_api_form_basket_element' => ApiBasketElementType::class,
-            'sonata_basket_api_form_basket_parent' => ApiBasketParentType::class,
-            'sonata_basket_api_form_basket_element_parent' => ApiBasketElementParentType::class,
-        ]);
+        if (class_exists(FormHelper::class)) {
+            FormHelper::registerFormTypeMapping([
+                'sonata_basket_basket' => BasketType::class,
+                'sonata_basket_address' => AddressType::class,
+                'sonata_basket_shipping' => ShippingType::class,
+                'sonata_basket_payment' => PaymentType::class,
+                'sonata_basket_api_form_basket' => ApiBasketType::class,
+                'sonata_basket_api_form_basket_element' => ApiBasketElementType::class,
+                'sonata_basket_api_form_basket_parent' => ApiBasketParentType::class,
+                'sonata_basket_api_form_basket_element_parent' => ApiBasketElementParentType::class,
+            ]);
+        }
     }
 }

src/Component/Form/BasketValidator.php

@@ -15,7 +15,7 @@
 
 use Sonata\Component\Basket\BasketInterface;
 use Sonata\Component\Product\Pool as ProductPool;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\ContainerConstraintValidatorFactory;

src/Component/Product/ProductProviderInterface.php

@@ -142,8 +142,6 @@ public function buildBasketElement(BasketElementInterface $basketElement, ?Produ
      * please not you always work with a clone version of the basketElement.
      *
      * If the basket is valid it will then replace the one in session
-     *
-     * @param \Sonata\CoreBundle\Validator\ErrorElement $errorElement
      */
     public function validateFormBasketElement(ErrorElement $errorElement, BasketElementInterface $basketElement, BasketInterface $basket);
 

src/CustomerBundle/Block/RecentCustomersBlockService.php

@@ -19,8 +19,8 @@
 use Sonata\BlockBundle\Block\Service\AbstractAdminBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\Component\Customer\CustomerManagerInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;

src/CustomerBundle/DependencyInjection/SonataCustomerExtension.php

@@ -26,14 +26,21 @@
  */
 class SonataCustomerExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function prepend(ContainerBuilder $container): void
+    public function prepend(ContainerBuilder $container)
     {
+        $bundles = $container->getParameter('kernel.bundles');
         if ($container->hasExtension('twig')) {
             // add custom form widgets
-            $container->prependExtensionConfig('twig', ['form_themes' => ['@SonataCore/Form/datepicker.html.twig']]);
+            if (isset($bundles['SonataCoreBundle'])) {
+                $container->prependExtensionConfig('twig', [
+                    'form_themes' => ['@SonataCore/Form/datepicker.html.twig'],
+                ]);
+            }
+            if (isset($bundles['SonataFormBundle'])) {
+                $container->prependExtensionConfig('twig', [
+                    'form_themes' => ['@SonataForm/Form/datepicker.html.twig'],
+                ]);
+            }
         }
     }
 

src/CustomerBundle/Form/Type/AddressTypeType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\CustomerBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseStatusType;
+use Sonata\Form\Type\BaseStatusType;
 
 class AddressTypeType extends BaseStatusType
 {

src/CustomerBundle/Form/Type/ApiAddressType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\CustomerBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiAddressType extends BaseDoctrineORMSerializationType
 {

src/CustomerBundle/Form/Type/ApiCustomerType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\CustomerBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class ApiCustomerType extends BaseDoctrineORMSerializationType
 {

src/CustomerBundle/Resources/views/Addresses/list.html.twig

@@ -8,7 +8,7 @@
     {% sonata_template_box 'This is the customer addresses list template. Feel free to override it.' %}
 
     {% block sonata_flash_messages %}
-        {% include '@SonataCore/FlashMessage/render.html.twig' with {domain: 'SonataCustomerBundle'} %}
+        {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] with {domain: 'SonataCustomerBundle'} %}
     {% endblock %}
 
     {% block sonata_profile_address_actions %}

src/CustomerBundle/Resources/views/Profile/action.html.twig

@@ -25,7 +25,7 @@ file that was distributed with this source code.
     </div>
 
     <div class="span10 col-lg-10">
-        {% include '@SonataCore/FlashMessage/render.html.twig' %}
+        {% include ['@SonataCore/FlashMessage/render.html.twig', '@SonataTwig/FlashMessage/render.html.twig'] %}
 
         {% block sonata_profile_content '' %}
     </div>

src/CustomerBundle/Serializer/CustomerSerializerHandler.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\CustomerBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Form\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>

src/CustomerBundle/SonataCustomerBundle.php

@@ -37,14 +37,18 @@ public function boot(): void
 
     /**
      * Register form mapping information.
+     *
+     * NEXT_MAJOR: remove this method
      */
     public function registerFormMapping(): void
     {
-        FormHelper::registerFormTypeMapping([
-            'sonata_customer_address' => AddressType::class,
-            'sonata_customer_address_types' => AddressTypeType::class,
-            'sonata_customer_api_form_customer' => ApiCustomerType::class,
-            'sonata_customer_api_form_address' => ApiAddressType::class,
-        ]);
+        if (class_exists(FormHelper::class)) {
+            FormHelper::registerFormTypeMapping([
+                'sonata_customer_address' => AddressType::class,
+                'sonata_customer_address_types' => AddressTypeType::class,
+                'sonata_customer_api_form_customer' => ApiCustomerType::class,
+                'sonata_customer_api_form_address' => ApiAddressType::class,
+            ]);
+        }
     }
 }

src/DeliveryBundle/SonataDeliveryBundle.php

@@ -32,11 +32,15 @@ public function boot(): void
 
     /**
      * Register form mapping information.
+     *
+     * NEXT_MAJOR: remove this method
      */
     public function registerFormMapping(): void
     {
-        FormHelper::registerFormTypeMapping([
-            'sonata_delivery_choice' => DeliveryChoiceType::class,
-        ]);
+        if (class_exists(FormHelper::class)) {
+            FormHelper::registerFormTypeMapping([
+                'sonata_delivery_choice' => DeliveryChoiceType::class,
+            ]);
+        }
     }
 }

src/InvoiceBundle/Form/Type/InvoiceStatusType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\InvoiceBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseStatusType;
+use Sonata\Form\Type\BaseStatusType;
 
 class InvoiceStatusType extends BaseStatusType
 {

src/InvoiceBundle/Serializer/InvoiceSerializerHandler.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\InvoiceBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Form\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>

src/InvoiceBundle/SonataInvoiceBundle.php

@@ -32,11 +32,15 @@ public function boot(): void
 
     /**
      * Register form mapping information.
+     *
+     * NEXT_MAJOR: remove this method
      */
     public function registerFormMapping(): void
     {
-        FormHelper::registerFormTypeMapping([
-            'sonata_invoice_status' => InvoiceStatusType::class,
-        ]);
+        if (class_exists(FormHelper::class)) {
+            FormHelper::registerFormTypeMapping([
+                'sonata_invoice_status' => InvoiceStatusType::class,
+            ]);
+        }
     }
 }

src/OrderBundle/Block/RecentOrdersBlockService.php

@@ -20,8 +20,8 @@
 use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\Component\Customer\CustomerManagerInterface;
 use Sonata\Component\Order\OrderManagerInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;

src/OrderBundle/DependencyInjection/Compiler/StatusRendererCompilerPass.php

@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sonata\CoreBundle\DependencyInjection\Compiler;
+namespace Sonata\OrderBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/OrderBundle/Form/Type/OrderStatusType.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\OrderBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseStatusType;
+use Sonata\Form\Type\BaseStatusType;
 
 class OrderStatusType extends BaseStatusType
 {

src/OrderBundle/Serializer/OrderElementSerializerHandler.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\OrderBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Form\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>

src/OrderBundle/Serializer/OrderSerializerHandler.php

@@ -13,7 +13,7 @@
 
 namespace Sonata\OrderBundle\Serializer;
 
-use Sonata\CoreBundle\Serializer\BaseSerializerHandler;
+use Sonata\Form\Serializer\BaseSerializerHandler;
 
 /**
  * @author Sylvain Deloux <sylvain.deloux@ekino.com>

src/OrderBundle/SonataOrderBundle.php

@@ -32,11 +32,15 @@ public function boot(): void
 
     /**
      * Register form mapping information.
+     *
+     * NEXT_MAJOR: remove this method
      */
     public function registerFormMapping(): void
     {
-        FormHelper::registerFormTypeMapping([
-            'sonata_order_status' => OrderStatusType::class,
-        ]);
+        if (class_exists(FormHelper::class)) {
+            FormHelper::registerFormTypeMapping([
+                'sonata_order_status' => OrderStatusType::class,
+            ]);
+        }
     }
 }