Merge 07048aa into d1267d6

sonata-project · Jul 6, 2020 · 16a2490 · 16a2490
2 parents d1267d6 + 07048aa
commit 16a2490
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "doctrine/mongodb-odm": "^1.3 || ^2.0",
         "doctrine/mongodb-odm-bundle": "^3.0 || ^4.0",
         "sonata-project/admin-bundle": "^3.61",
-        "sonata-project/core-bundle": "^3.17",
+        "sonata-project/form-extensions": "^0.1 || ^1.4",
         "symfony/config": "^4.4",
         "symfony/dependency-injection": "^4.4",
         "symfony/doctrine-bridge": "^4.4",

diff --git a/src/Builder/FormContractor.php b/src/Builder/FormContractor.php
@@ -23,7 +23,6 @@
 use Sonata\AdminBundle\Form\Type\ModelListType;
 use Sonata\AdminBundle\Form\Type\ModelType;
 use Sonata\AdminBundle\Form\Type\ModelTypeList;
-use Sonata\CoreBundle\Form\Type\CollectionType as DeprecatedCollectionType;
 use Sonata\Form\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -150,7 +149,8 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
             $fieldDescription->setOption('edit', $fieldDescription->getOption('edit', 'admin'));
         } elseif ($this->checkFormClass($type, [
             CollectionType::class,
-            DeprecatedCollectionType::class,
+            // NEXT_MAJOR: Remove 'Sonata\CoreBundle\Form\Type\CollectionType'
+            'Sonata\CoreBundle\Form\Type\CollectionType',
         ])) {
             if (!$fieldDescription->getAssociationAdmin()) {
                 throw new \RuntimeException(sprintf(

diff --git a/tests/Builder/FormContractorTest.php b/tests/Builder/FormContractorTest.php
@@ -23,7 +23,6 @@
 use Sonata\AdminBundle\Form\Type\ModelListType;
 use Sonata\AdminBundle\Form\Type\ModelType;
 use Sonata\AdminBundle\Model\ModelManagerInterface;
-use Sonata\CoreBundle\Form\Type\CollectionType as DeprecatedCollectionType;
 use Sonata\DoctrineMongoDBAdminBundle\Builder\FormContractor;
 use Sonata\DoctrineMongoDBAdminBundle\Model\ModelManager;
 use Sonata\Form\Type\CollectionType;
@@ -84,7 +83,8 @@ public function testDefaultOptionsForSonataFormTypes(): void
             AdminType::class,
         ];
         $collectionTypes = [
-            DeprecatedCollectionType::class,
+            // NEXT_MAJOR: 'Sonata\CoreBundle\Form\Type\CollectionType'
+            'Sonata\CoreBundle\Form\Type\CollectionType',
             CollectionType::class,
         ];