Make CoreBundle optional

sonata-project · Jun 4, 2020 · a974c36 · a974c36
1 parent 0a16728
commit a974c36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,9 @@
         "doctrine/orm": "^2.5",
         "doctrine/persistence": "^1.3.4",
         "sonata-project/admin-bundle": "^3.63",
-        "sonata-project/core-bundle": "^3.14",
         "sonata-project/exporter": "^1.11.0 || ^2.0",
+        "sonata-project/form-extensions": "^0.1 || ^1.4",
+        "sonata-project/twig-extensions": "^0.1 || ^1.3",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
         "symfony/dependency-injection": "^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;
@@ -159,7 +158,8 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
                 return $fieldDescription->getAssociationAdmin()->getNewInstance();
             };
             $fieldDescription->setOption('edit', $fieldDescription->getOption('edit', 'admin'));
-        } elseif ($this->checkFormClass($type, [CollectionType::class, DeprecatedCollectionType::class])) {
+        // NEXT_MAJOR: remove 'Sonata\CoreBundle\Form\Type\CollectionType'
+        } elseif ($this->checkFormClass($type, [CollectionType::class, 'Sonata\CoreBundle\Form\Type\CollectionType'])) {
             if (!$fieldDescription->getAssociationAdmin()) {
                 throw new \RuntimeException(sprintf(
                     'The current field `%s` is not linked to an admin.'