Merge branch '3.x'

sonata-project · Jul 30, 2020 · 5c67d5a · 5c67d5a
2 parents f7d4845 + d713e04
commit 5c67d5a
Show file tree

Hide file tree

Showing 9 changed files with 361 additions and 232 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
 =======================
 
@@ -11,6 +19,6 @@ UPGRADE FROM 3.0 to 3.1
 
 ### 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
@@ -25,8 +25,7 @@
         "php": "^7.2",
         "sonata-project/classification-bundle": "^3.12",
         "sonata-project/datagrid-bundle": "^2.4",
-        "sonata-project/doctrine-extensions": "^1.5.1",
-        "sonata-project/easy-extends-bundle": "^2.5",
+        "sonata-project/doctrine-extensions": "^1.8",
         "sonata-project/form-extensions": "^0.1 || ^1.4",
         "sonata-project/formatter-bundle": "^4.0",
         "sonata-project/intl-bundle": "^2.4",

diff --git a/docs/reference/advanced_configuration.rst b/docs/reference/advanced_configuration.rst
@@ -6,36 +6,36 @@ Advanced Configuration
     # config/packages/sonata_news.yaml
 
     sonata_news:
-        title:        Sonata Project
-        link:         https://sonata-project.org
-        description:  Cool bundles on top of Symfony2
-        salt:         'secureToken'
+        title: Sonata Project
+        link: https://sonata-project.org
+        description: Cool bundles on top of Symfony2
+        salt: 'secureToken'
         permalink_generator: sonata.news.permalink.date # sonata.news.permalink.collection
         permalink:
-            date:     '%%1$04d/%%2$02d/%%3$02d/%%4$s' # => 2012/02/01/slug
-        db_driver:    'no_driver'
+            date: '%%1$04d/%%2$02d/%%3$02d/%%4$s' # => 2012/02/01/slug
+        db_driver: 'no_driver'
         comment:
             notification:
-                emails:   [email@example.org, email2@example.org]
-                from:     no-reply@sonata-project.org
+                emails: [email@example.org, email2@example.org]
+                from: no-reply@sonata-project.org
                 template: '@SonataNews/Mail/comment_notification.txt.twig'
 
         class:
-            post:       Application\Sonata\NewsBundle\Entity\Post
-            comment:    Application\Sonata\NewsBundle\Entity\Comment
-            media:      Application\Sonata\MediaBundle\Entity\Media
-            user:       Application\Sonata\UserBundle\Entity\User
-            tag:        Application\Sonata\ClassificationBundle\Entity\Tag
-            collection: Application\Sonata\ClassificationBundle\Entity\Collection
+            post: App\Entity\SonataNewsPost
+            comment: App\Entity\SonataNewsComment
+            media: App\Entity\SonataMediaMedia
+            user: App\Entity\SonataUserUser
+            tag: App\Entity\SonataClassificationTag
+            collection: App\Entity\SonataClassificationCollection
 
         admin:
             post:
-                class:       Sonata\NewsBundle\Admin\PostAdmin
-                controller:  SonataAdminBundle:CRUD
+                class: Sonata\NewsBundle\Admin\PostAdmin
+                controller: SonataAdminBundle:CRUD
                 translation: SonataNewsBundle
             comment:
-                class:       Sonata\NewsBundle\Admin\CommentAdmin
-                controller:  SonataNewsBundle:CommentAdmin
+                class: Sonata\NewsBundle\Admin\CommentAdmin
+                controller: SonataNewsBundle:CommentAdmin
                 translation: SonataNewsBundle
 
 .. code-block:: yaml
@@ -45,8 +45,8 @@ Advanced Configuration
     sonata_classification:
         class:
             collection: Application\Sonata\ClassificationBundle\Entity\Collection
-            tag:        Application\Sonata\ClassificationBundle\Entity\Tag
-            category:   Application\Sonata\ClassificationBundle\Entity\Category
+            tag: Application\Sonata\ClassificationBundle\Entity\Tag
+            category: Application\Sonata\ClassificationBundle\Entity\Category
 
 .. code-block:: yaml