Merge 3.x into master

sonata-project · Nov 12, 2019 · 4fc246a · 4fc246a
2 parents c4be527 + addab4b
commit 4fc246a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git a/composer.json b/composer.json
@@ -30,11 +30,11 @@
         "doctrine/mongodb-odm-bundle": "^3.0 || ^4.0",
         "sonata-project/admin-bundle": "^3.31",
         "sonata-project/core-bundle": "^3.8",
-        "symfony/config": "^2.8 || ^3.2 || ^4.0",
-        "symfony/dependency-injection": "^2.8 || ^3.2 || ^4.0",
-        "symfony/doctrine-bridge": "^2.8 || ^3.2 || ^4.0",
-        "symfony/form": "^2.8 || ^3.2 || ^4.0",
-        "symfony/http-kernel": "^2.8 || ^3.2 || ^4.0",
+        "symfony/config": "^3.4 || ^4.2",
+        "symfony/dependency-injection": "^3.4 || ^4.2",
+        "symfony/doctrine-bridge": "^3.4 || ^4.2",
+        "symfony/form": "^3.4 || ^4.2",
+        "symfony/http-kernel": "^3.4 || ^4.2",
         "twig/extensions": "^1.0",
         "twig/twig": "^1.34 || ^2.0"
     },

diff --git a/src/Builder/FormContractor.php b/src/Builder/FormContractor.php
@@ -97,13 +97,7 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
         $options = [];
         $options['sonata_field_description'] = $fieldDescription;
 
-        // NEXT_MAJOR: Check only against FQCNs when dropping support for Symfony 2.8
-        if (\in_array($type, [
-            'sonata_type_model',
-            'sonata_type_model_list',
-            'sonata_type_model_hidden',
-            'sonata_type_model_autocomplete',
-        ], true) || $this->checkFormClass($type, [
+        if ($this->checkFormClass($type, [
             ModelType::class,
             ModelTypeList::class,
             ModelListType::class,
@@ -120,8 +114,7 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
             $options['class'] = $fieldDescription->getTargetEntity();
             $options['model_manager'] = $fieldDescription->getAdmin()->getModelManager();
 
-            // NEXT_MAJOR: Check only against FQCNs when dropping support for Symfony 2.8
-            if ('sonata_type_model_autocomplete' === $type || $this->checkFormClass($type, [ModelAutocompleteType::class])) {
+            if ($this->checkFormClass($type, [ModelAutocompleteType::class])) {
                 if (!$fieldDescription->getAssociationAdmin()) {
                     throw new \RuntimeException(sprintf(
                         'The current field `%s` is not linked to an admin.'
@@ -131,8 +124,7 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
                     ));
                 }
             }
-            // NEXT_MAJOR: Check only against FQCNs when dropping support for Symfony 2.8
-        } elseif ('sonata_type_admin' === $type || $this->checkFormClass($type, [AdminType::class])) {
+        } elseif ($this->checkFormClass($type, [AdminType::class])) {
             if (!$fieldDescription->getAssociationAdmin()) {
                 throw new \RuntimeException(sprintf(
                     'The current field `%s` is not linked to an admin.'
@@ -156,8 +148,7 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
 
             $options['data_class'] = $fieldDescription->getAssociationAdmin()->getClass();
             $fieldDescription->setOption('edit', $fieldDescription->getOption('edit', 'admin'));
-        // NEXT_MAJOR: Check only against FQCNs when dropping support for Symfony 2.8
-        } elseif ('sonata_type_collection' === $type || $this->checkFormClass($type, [
+        } elseif ($this->checkFormClass($type, [
             CollectionType::class,
             DeprecatedCollectionType::class,
         ])) {

diff --git a/tests/Builder/FormContractorTest.php b/tests/Builder/FormContractorTest.php
@@ -74,23 +74,16 @@ public function testDefaultOptionsForSonataFormTypes(): void
         $fieldDescription->method('getTargetEntity')->willReturn($modelClass);
         $fieldDescription->method('getAssociationAdmin')->willReturn($admin);
 
-        // NEXT_MAJOR: Use only FQCNs when dropping support for Symfony 2.8
         $modelTypes = [
-            'sonata_type_model',
-            'sonata_type_model_list',
-            'sonata_type_model_hidden',
-            'sonata_type_model_autocomplete',
             ModelType::class,
             ModelListType::class,
             ModelHiddenType::class,
             ModelAutocompleteType::class,
         ];
         $adminTypes = [
-            'sonata_type_admin',
             AdminType::class,
         ];
         $collectionTypes = [
-            'sonata_type_collection',
             DeprecatedCollectionType::class,
         ];