Fix pack with tests

composer.json

@@ -19,8 +19,8 @@
     ],
     "require": {
         "php": "^7.2",
-        "cocur/slugify": "^1.4 || ^2.0 || ^3.0 || ^4.0",
-        "sonata-project/doctrine-extensions": "^1.1",
+        "cocur/slugify": "^3.0 || ^4.0",
+        "sonata-project/doctrine-extensions": "^1.5",
         "symfony/config": "^4.3",
         "symfony/dependency-injection": "^4.3",
         "symfony/event-dispatcher": "^4.3",
@@ -35,7 +35,7 @@
         "symfony/twig-bridge": "^4.3",
         "symfony/validator": "^4.3",
         "twig/extensions": "^1.5",
-        "twig/twig": "^1.34 || ^2.0"
+        "twig/twig": "^2.12.1"
     },
     "conflict": {
         "sonata-project/exporter": "< 1.11"
@@ -44,13 +44,14 @@
         "doctrine/orm": "^2.4",
         "doctrine/phpcr-odm": "^1.0",
         "jackalope/jackalope-doctrine-dbal": "^1.0",
-        "jms/serializer-bundle": "^1.0 || ^2.0",
-        "matthiasnoback/symfony-config-test": "^4.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "jms/serializer-bundle": "^2.0",
+        "matthiasnoback/symfony-config-test": "^4.2",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "nelmio/api-doc-bundle": "^2.11",
-        "phpspec/prophecy": "^1.0",
+        "phpspec/prophecy": "^1.10.3",
         "sonata-project/exporter": "^1.11 || ^2.0",
-        "symfony/phpunit-bridge": "^4.3"
+        "symfony/browser-kit": "^3.4 || ^4.3 || ^5.0",
+        "symfony/phpunit-bridge": "^5.0"
     },
     "suggest": {
         "sonata-project/doctrine-extensions": "Direct replacement for Doctrine behavioral extensions",

src/CoreBundle/DependencyInjection/SonataCoreExtension.php

@@ -94,22 +94,22 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('commands.xml');
         $loader->load('core.xml');
-        $loader->load('core_form_types.xml');
-        $loader->load('core_date.xml');
-        $loader->load('core_flash.xml');
+        $loader->load('date.xml');
+        $loader->load('flash.xml');
+        $loader->load('form_types.xml');
         $loader->load('model_adapter.xml');
-        $loader->load('core_twig.xml');
-        $loader->load('core_validator.xml');
+        $loader->load('twig.xml');
+        $loader->load('validator.xml');
 
         if (!isset($bundles['SonataFormBundle'])) {
-            $loader->load('form_types.xml');
-            $loader->load('date.xml');
-            $loader->load('validator.xml');
+            $loader->load('form/date.xml');
+            $loader->load('form/form_types.xml');
+            $loader->load('form/validator.xml');
         }
 
         if (!isset($bundles['SonataTwigBundle'])) {
-            $loader->load('flash.xml');
-            $loader->load('twig.xml');
+            $loader->load('twig/flash.xml');
+            $loader->load('twig/twig.xml');
         }
 
         $this->registerFlashTypes($container, $config);
@@ -194,7 +194,7 @@ public function registerFlashTypes(ContainerBuilder $container, array $config)
             $cssClasses[$typeKey] = \array_key_exists('css_class', $typeConfig) ? $typeConfig['css_class'] : $typeKey;
         }
 
-        $identifier = 'sonata.twig.flashmessage.manager';
+        $identifier = 'sonata.core.flashmessage.manager';
 
         $definition = $container->getDefinition($identifier);
         $definition->replaceArgument(2, $types);

src/CoreBundle/Form/Type/ColorSelectorType.php

@@ -18,7 +18,6 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * NEXT_MAJOR: remove this class.
@@ -38,16 +37,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         parent::buildForm($builder, $options);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @todo Remove it when bumping requirements to SF 2.7+
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([

src/CoreBundle/Form/Type/TranslatableChoiceType.php

@@ -19,7 +19,6 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
@@ -40,16 +39,6 @@ public function __construct(TranslatorInterface $translator)
         $this->translator = $translator;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @todo Remove it when bumping requirements to SF 2.7+
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([

src/CoreBundle/Resources/config/date.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sonata.form.date.moment_format_converter" class="Sonata\Form\Date\MomentFormatConverter"/>
+        <service id="sonata.core.date.moment_format_converter" alias="sonata.form.date.moment_format_converter">
+            <deprecated>The "%service_id%" service is deprecated since sonata-project/core-bundle 3.x and will be removed in 4.0. Use "%alias_id%" instead.</deprecated>
+        </service>
     </services>
 </container>