Fix Compatibility with Form Extensions (#173)

* Fix Compatibility with Form Extensions * Bump symfony to 4.4 min, php 7.2
sonata-project · Jul 4, 2020 · 00bdd49 · 00bdd49
1 parent 50cb779
commit 00bdd49
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -14,34 +14,36 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "sonata-project/admin-bundle": "^3.1",
         "sonata-project/classification-bundle": "^3.0",
         "sonata-project/doctrine-orm-admin-bundle": "^3.0",
         "sonata-project/easy-extends-bundle": "^2.2",
+        "sonata-project/form-extensions": "^0.1.1 || ^1.4",
         "sonata-project/media-bundle": "^3.0",
-        "symfony/config": "^3.4 || ^4.0",
-        "symfony/dependency-injection": "^3.4 || ^4.0",
-        "symfony/form": "^3.4 || ^4.0",
-        "symfony/http-foundation": "^3.4 || ^4.0",
-        "symfony/options-resolver": "^3.4 || ^4.0",
-        "symfony/routing": "^3.4 || ^4.0",
-        "symfony/security-core": "^3.4 || ^4.0",
-        "symfony/templating": "^3.4 || ^4.0",
-        "symfony/translation": "^3.4 || ^4.0",
-        "symfony/twig-bridge": "^3.4 || ^4.0",
-        "symfony/validator": "^3.4 || ^4.0",
+        "symfony/config": "^4.4",
+        "symfony/dependency-injection": "^4.4",
+        "symfony/form": "^4.4",
+        "symfony/http-foundation": "^4.4",
+        "symfony/options-resolver": "^4.4",
+        "symfony/routing": "^4.4",
+        "symfony/security-core": "^4.4",
+        "symfony/templating": "^4.4",
+        "symfony/translation": "^4.4",
+        "symfony/twig-bridge": "^4.4",
+        "symfony/validator": "^4.4",
         "twig/extensions": "^1.0",
         "twig/twig": "^2.0"
     },
     "conflict": {
-        "sonata-project/block-bundle": "<3.11"
+        "sonata-project/block-bundle": "<3.11",
+        "sonata-project/core-bundle": "<3.20"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "sonata-project/block-bundle": "^3.18.3",
-        "symfony/phpunit-bridge": "^5.0"
+        "symfony/phpunit-bridge": "^5.1"
     },
     "config": {
         "sort-packages": true

diff --git a/src/Admin/ArticleAdmin.php b/src/Admin/ArticleAdmin.php
@@ -23,9 +23,9 @@
 use Sonata\ArticleBundle\Model\AbstractArticle;
 use Sonata\ArticleBundle\Model\ArticleInterface;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Form\Type\CollectionType;
-use Sonata\CoreBundle\Form\Type\DateTimePickerType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\CollectionType;
+use Sonata\Form\Type\DateTimePickerType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;

diff --git a/src/Admin/FragmentAdmin.php b/src/Admin/FragmentAdmin.php
@@ -19,7 +19,7 @@
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
 use Sonata\ArticleBundle\FragmentService\FragmentServiceInterface;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;

diff --git a/src/FragmentService/AbstractFragmentService.php b/src/FragmentService/AbstractFragmentService.php
@@ -15,7 +15,7 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

diff --git a/src/FragmentService/FragmentServiceInterface.php b/src/FragmentService/FragmentServiceInterface.php
@@ -15,7 +15,7 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

diff --git a/src/FragmentService/TextFragmentService.php b/src/FragmentService/TextFragmentService.php
@@ -15,8 +15,8 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Validator\Constraints\NotBlank;
 

diff --git a/src/FragmentService/TitleFragmentService.php b/src/FragmentService/TitleFragmentService.php
@@ -15,8 +15,8 @@
 
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;

diff --git a/tests/FragmentService/AbstractFragmentServiceTest.php b/tests/FragmentService/AbstractFragmentServiceTest.php
@@ -19,7 +19,7 @@
 use Sonata\ArticleBundle\FragmentService\FragmentServiceInterface;
 use Sonata\ArticleBundle\Model\AbstractFragment;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Validator\ErrorElement;
 
 /**
  * @author Romain Mouillard <romain.mouillard@gmail.com>

diff --git a/tests/FragmentService/TextFragmentServiceTest.php b/tests/FragmentService/TextFragmentServiceTest.php
@@ -18,8 +18,8 @@
 use Sonata\ArticleBundle\FragmentService\AbstractFragmentService;
 use Sonata\ArticleBundle\FragmentService\TextFragmentService;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Validator\Constraints\NotBlank;
 

diff --git a/tests/FragmentService/TitleFragmentServiceTest.php b/tests/FragmentService/TitleFragmentServiceTest.php
@@ -18,8 +18,8 @@
 use Sonata\ArticleBundle\FragmentService\AbstractFragmentService;
 use Sonata\ArticleBundle\FragmentService\TitleFragmentService;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Form\Type\ImmutableArrayType;
-use Sonata\CoreBundle\Validator\ErrorElement;
+use Sonata\Form\Type\ImmutableArrayType;
+use Sonata\Form\Validator\ErrorElement;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;