Remove deprecated ReST API with dependencies (#780)

* Remove deprecated ReST API with dependencies Signed-off-by: Wojciech Błoszyk <wbloszyk@gmail.com> * Fix tests Signed-off-by: Wojciech Błoszyk <wbloszyk@gmail.com> * Remove sonata/datagrid-bundle Signed-off-by: Wojciech Błoszyk <wbloszyk@gmail.com> * Fix lint Signed-off-by: Wojciech Błoszyk <wbloszyk@gmail.com> * Remove ReST API from docs Signed-off-by: Wojciech Błoszyk <wbloszyk@gmail.com> * Fixes Signed-off-by: Wojciech Błoszyk <wbloszyk@gmail.com>
sonata-project · Sep 25, 2021 · fbf6ee7 · fbf6ee7
1 parent 2e1a183
commit fbf6ee7
Show file tree

Hide file tree

Showing 47 changed files with 411 additions and 1,925 deletions.
diff --git a/composer.json b/composer.json
@@ -25,13 +25,12 @@
         "php": "^7.3 || ^8.0",
         "doctrine/persistence": "^1.3 || ^2.0",
         "sonata-project/classification-bundle": "^3.12",
-        "sonata-project/datagrid-bundle": "^2.4 || ^3.0",
         "sonata-project/doctrine-extensions": "^1.10.1",
-        "sonata-project/form-extensions": "^0.1 || ^1.4",
+        "sonata-project/form-extensions": "^1.4",
         "sonata-project/formatter-bundle": "^4.0",
         "sonata-project/intl-bundle": "^2.4",
         "sonata-project/media-bundle": "^3.20",
-        "sonata-project/twig-extensions": "^0.1 || ^1.3",
+        "sonata-project/twig-extensions": "^1.3",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
         "symfony/dependency-injection": "^4.4",
@@ -53,8 +52,6 @@
     },
     "conflict": {
         "doctrine/dbal": "<2.6.0",
-        "friendsofsymfony/rest-bundle": "<2.3",
-        "jms/serializer": "<0.13",
         "sonata-project/admin-bundle": "<3.59",
         "sonata-project/block-bundle": "<3.18",
         "sonata-project/core-bundle": "<3.20",
@@ -63,12 +60,10 @@
         "sonata-project/seo-bundle": "<2.5 || >=3.0"
     },
     "require-dev": {
+        "doctrine/mongodb-odm": "^2.2",
         "doctrine/orm": "^2.4",
-        "friendsofsymfony/rest-bundle": "^2.3 || ^3.0",
-        "jms/serializer-bundle": "^3.0",
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.2",
-        "nelmio/api-doc-bundle": "^2.13.3",
         "sonata-project/admin-bundle": "^3.59",
         "sonata-project/block-bundle": "^3.18",
         "sonata-project/doctrine-orm-admin-bundle": "^3.5",
@@ -79,7 +74,6 @@
         "symfony/swiftmailer-bundle": "^3.4"
     },
     "suggest": {
-        "nelmio/api-doc-bundle": "If you want to use the API.",
         "sonata-project/block-bundle": "For rendering block lists.",
         "sonata-project/doctrine-orm-admin-bundle": "For integrate Doctrine ORM into the SonataAdminBundle.",
         "sonata-project/notification-bundle": "If you want to send comment notification asynchronously.",

diff --git a/docs/.doctor-rst.yaml b/docs/.doctor-rst.yaml
@@ -44,4 +44,3 @@ rules:
 whitelist:
     lines:
         - '.. versionadded:: 3.x'
-        - 'resource: "@NelmioApiDocBundle/Resources/config/routing.yml"'
diff --git a/docs/index.rst b/docs/index.rst
@@ -10,4 +10,3 @@ News Bundle
    reference/introduction
    reference/installation
    reference/advanced_configuration
-   reference/api
diff --git a/docs/reference/api.rst b/docs/reference/api.rst
diff --git a/docs/reference/installation.rst b/docs/reference/installation.rst
@@ -40,10 +40,6 @@ Add ``SonataNewsBundle`` via composer::
 
     composer require sonata-project/news-bundle
 
-If you want to use the REST API, you also need ``friendsofsymfony/rest-bundle`` and ``nelmio/api-doc-bundle``::
-
-    composer require friendsofsymfony/rest-bundle nelmio/api-doc-bundle
-
 Next, be sure to enable the bundles in your ``config/bundles.php`` file if they
 are not already enabled::
 

diff --git a/src/Action/AbstractPostArchiveAction.php b/src/Action/AbstractPostArchiveAction.php
@@ -80,7 +80,7 @@ public function __construct(BlogInterface $blog, PostManagerInterface $postManag
      */
     final public function renderArchive(Request $request, array $criteria = [], array $parameters = [])
     {
-        $pager = $this->postManager->getPager(
+        $pager = $this->postManager->getPaginator(
             $criteria,
             $request->get('page', 1)
         );

diff --git a/src/Action/CommentListAction.php b/src/Action/CommentListAction.php
@@ -38,7 +38,7 @@ public function __construct(CommentManagerInterface $commentManager)
     public function __invoke($postId)
     {
         $pager = $this->commentManager
-            ->getPager([
+            ->getPaginator([
                 'postId' => $postId,
                 'status' => CommentInterface::STATUS_VALID,
             ], 1, 500); //no limit

diff --git a/src/Block/RecentCommentsBlockService.php b/src/Block/RecentCommentsBlockService.php
@@ -77,7 +77,7 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
             'context' => $blockContext,
             'settings' => $blockContext->getSettings(),
             'block' => $blockContext->getBlock(),
-            'pager' => $this->manager->getPager($criteria, 1, $blockContext->getSetting('number')),
+            'pager' => $this->manager->getPaginator($criteria, 1, $blockContext->getSetting('number')),
             'admin_pool' => $this->adminPool,
         ];
 

diff --git a/src/Block/RecentPostsBlockService.php b/src/Block/RecentPostsBlockService.php
@@ -77,7 +77,7 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
             'context' => $blockContext,
             'settings' => $blockContext->getSettings(),
             'block' => $blockContext->getBlock(),
-            'pager' => $this->manager->getPager($criteria, 1, $blockContext->getSetting('number')),
+            'pager' => $this->manager->getPaginator($criteria, 1, $blockContext->getSetting('number')),
             'admin_pool' => $this->adminPool,
         ];
 

diff --git a/src/Controller/Api/CommentController.php b/src/Controller/Api/CommentController.php