Merge 4595d63 into 213b81f

sonata-project · Jul 30, 2020 · 26b97cb · 26b97cb
2 parents 213b81f + 4595d63
commit 26b97cb
Show file tree

Hide file tree

Showing 16 changed files with 555 additions and 219 deletions.
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
@@ -1,6 +1,14 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.x to 3.x
+=======================
+
+### SonataEasyExtends is deprecated
+
+Registering `SonataEasyExtendsBundle` bundle is deprecated, it SHOULD NOT be registered.
+Register `SonataDoctrineBundle` bundle instead.
+
 UPGRADE FROM 3.1 to 3.2
 =======================
 
@@ -12,6 +20,6 @@ and should be done by overriding `getFormBuilder` instead.
 
 ### Tests
 
-All files under the ``Tests`` directory are now correctly handled as internal test classes. 
-You can't extend them anymore, because they are only loaded when running internal tests. 
+All files under the ``Tests`` directory are now correctly handled as internal test classes.
+You can't extend them anymore, because they are only loaded when running internal tests.
 More information can be found in the [composer docs](https://getcomposer.org/doc/04-schema.md#autoload-dev).
diff --git a/composer.json b/composer.json
@@ -22,10 +22,9 @@
     ],
     "require": {
         "php": "^7.2",
-        "cocur/slugify": "^2.0 || ^3.0 || ^4.0",
+        "cocur/slugify": "^3.0 || ^4.0",
         "sonata-project/datagrid-bundle": "^2.3 || ^3.0",
-        "sonata-project/doctrine-extensions": "^1.6.0",
-        "sonata-project/easy-extends-bundle": "^2.5",
+        "sonata-project/doctrine-extensions": "^1.8",
         "sonata-project/form-extensions": "^0.1.1 || ^1.4",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
@@ -40,19 +39,21 @@
         "doctrine/mongodb-odm": "<2.0",
         "friendsofsymfony/rest-bundle": "<2.1 || >=3.0",
         "jms/serializer": "<0.13",
-        "sonata-project/admin-bundle": "<3.59",
-        "sonata-project/block-bundle": "<3.14 || >=4.0",
+        "sonata-project/admin-bundle": "<3.68",
+        "sonata-project/block-bundle": "<3.19 || >=4.0",
         "sonata-project/core-bundle": "<3.20",
-        "sonata-project/doctrine-orm-admin-bundle": "<3.4",
-        "sonata-project/media-bundle": "<3.17 || >=4.0"
+        "sonata-project/doctrine-orm-admin-bundle": "<3.16",
+        "sonata-project/media-bundle": "<3.20 || >=4.0"
     },
     "require-dev": {
         "doctrine/mongodb-odm": "^2.0",
         "friendsofsymfony/rest-bundle": "^2.3",
         "jms/serializer-bundle": "^2.0 || ^3.0",
-        "sonata-project/admin-bundle": "^3.59",
-        "sonata-project/block-bundle": "^3.18",
-        "sonata-project/doctrine-orm-admin-bundle": "^3.4",
+        "matthiasnoback/symfony-config-test": "^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+        "sonata-project/admin-bundle": "^3.68",
+        "sonata-project/block-bundle": "^3.19",
+        "sonata-project/doctrine-orm-admin-bundle": "^3.16",
         "sonata-project/media-bundle": "^3.20",
         "symfony/phpunit-bridge": "^5.1"
     },

diff --git a/docs/reference/advanced_configuration.rst b/docs/reference/advanced_configuration.rst
@@ -10,25 +10,25 @@ Advanced Configuration
 
         sonata_classification:
             class:
-                tag:          Application\Sonata\ClassificationBundle\Entity\Tag
-                category:     Application\Sonata\ClassificationBundle\Entity\Category
-                collection:   Application\Sonata\ClassificationBundle\Entity\Collection
-                context:      Application\Sonata\ClassificationBundle\Entity\Context
+                tag: App\Entity\SonataClassificationTag
+                category: App\Entity\SonataClassificationCategory
+                collection: App\Entity\SonataClassificationCollection
+                context: App\Entity\SonataClassificationContext
 
             admin:
                 tag:
-                    class:        Sonata\ClassificationBundle\Admin\TagAdmin
-                    controller:   SonataAdminBundle:CRUD
-                    translation:  SonataClassificationBundle
+                    class: Sonata\ClassificationBundle\Admin\TagAdmin
+                    controller: SonataAdminBundle:CRUD
+                    translation: SonataClassificationBundle
                 category:
-                    class:        Sonata\ClassificationBundle\Admin\CategoryAdmin
-                    controller:   SonataClassificationBundle:CategoryAdmin
-                    translation:  SonataClassificationBundle
+                    class: Sonata\ClassificationBundle\Admin\CategoryAdmin
+                    controller: SonataClassificationBundle:CategoryAdmin
+                    translation: SonataClassificationBundle
                 collection:
-                    class:        Sonata\ClassificationBundle\Admin\CollectionAdmin
-                    controller:   SonataAdminBundle:CRUD
-                    translation:  SonataClassificationBundle
+                    class: Sonata\ClassificationBundle\Admin\CollectionAdmin
+                    controller: SonataAdminBundle:CRUD
+                    translation: SonataClassificationBundle
                 context:
-                    class:        Sonata\ClassificationBundle\Admin\ContextAdmin
-                    controller:   SonataAdminBundle:CRUD
-                    translation:  SonataClassificationBundle
+                    class: Sonata\ClassificationBundle\Admin\ContextAdmin
+                    controller: SonataAdminBundle:CRUD
+                    translation: SonataClassificationBundle