From 193f843d60215d1b7138785d05abd43ec3224163 Mon Sep 17 00:00:00 2001 From: Jordi Sala Morales Date: Wed, 10 Aug 2022 19:21:04 +0200 Subject: [PATCH] Remove unused controllers (#1541) * Remove unused controllers * Add upgrade note --- UPGRADE-4.0.md | 7 +++ src/Controller/AjaxController.php | 63 --------------------------- src/Controller/BlockController.php | 27 ------------ src/Resources/config/block.php | 8 ---- src/Resources/config/controllers.php | 4 -- src/Resources/config/routing/page.xml | 6 --- 6 files changed, 7 insertions(+), 108 deletions(-) delete mode 100644 src/Controller/AjaxController.php delete mode 100644 src/Controller/BlockController.php delete mode 100644 src/Resources/config/routing/page.xml diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index b54153c65..430afb9b1 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -31,3 +31,10 @@ The following routes were changed: * Remove non working `/view` route for Block Admin * Rename compose preview url for Blocks from `compose_preview` to `compose-preview` * Rename shared block route name from `block/shared` to `block_shared` + +## Remove unused code + +The following code has been removed since it is not used: + +* `Sonata\PageBundle\Controller\AjaxController` +* `Sonata\PageBundle\Controller\BlockController` diff --git a/src/Controller/AjaxController.php b/src/Controller/AjaxController.php deleted file mode 100644 index 915617535..000000000 --- a/src/Controller/AjaxController.php +++ /dev/null @@ -1,63 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Sonata\PageBundle\Controller; - -use Sonata\BlockBundle\Block\BlockContextManagerInterface; -use Sonata\BlockBundle\Block\BlockRendererInterface; -use Sonata\BlockBundle\Exception\BlockNotFoundException; -use Sonata\BlockBundle\Model\BlockInterface; -use Sonata\PageBundle\CmsManager\CmsManagerSelectorInterface; -use Symfony\Component\HttpFoundation\Response; - -/** - * @author Thomas Rabaix - */ -final class AjaxController -{ - private CmsManagerSelectorInterface $cmsManagerSelector; - - private BlockRendererInterface $blockRenderer; - - private BlockContextManagerInterface $contextManager; - - public function __construct( - CmsManagerSelectorInterface $cmsManagerSelector, - BlockRendererInterface $blockRenderer, - BlockContextManagerInterface $contextManager - ) { - $this->cmsManagerSelector = $cmsManagerSelector; - $this->blockRenderer = $blockRenderer; - $this->contextManager = $contextManager; - } - - /** - * @param int|string $pageId - * @param int|string $blockId - */ - public function execute($pageId, $blockId): Response - { - $cmsManager = $this->cmsManagerSelector->retrieve(); - - $page = $cmsManager->getPageById($pageId); - $block = $cmsManager->getBlock($blockId); - - if (!$block instanceof BlockInterface) { - throw new BlockNotFoundException(sprintf('Unable to find block identifier "%s" in page "%s".', $blockId, $pageId)); - } - - $blockContext = $this->contextManager->get($block); - - return $this->blockRenderer->render($blockContext); - } -} diff --git a/src/Controller/BlockController.php b/src/Controller/BlockController.php deleted file mode 100644 index 03fd9576a..000000000 --- a/src/Controller/BlockController.php +++ /dev/null @@ -1,27 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Sonata\PageBundle\Controller; - -use Symfony\Component\HttpFoundation\Response; - -/** - * @author Thomas Rabaix - */ -final class BlockController -{ - public function emptyAction(): Response - { - return new Response('Empty response'); - } -} diff --git a/src/Resources/config/block.php b/src/Resources/config/block.php index 5c6b2a2d4..3ef7a772a 100644 --- a/src/Resources/config/block.php +++ b/src/Resources/config/block.php @@ -17,7 +17,6 @@ use Sonata\PageBundle\Block\ContainerBlockService; use Sonata\PageBundle\Block\PageListBlockService; use Sonata\PageBundle\Block\SharedBlockBlockService; -use Sonata\PageBundle\Controller\AjaxController; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator; @@ -40,13 +39,6 @@ new ReferenceConfigurator('sonata.page.admin.page'), ]) - ->set('sonata.page.block.ajax', AjaxController::class) - ->args([ - new ReferenceConfigurator('sonata.page.cms_manager_selector'), - new ReferenceConfigurator('sonata.block.renderer'), - new ReferenceConfigurator('sonata.block.context_manager'), - ]) - ->set('sonata.page.block.breadcrumb', BreadcrumbBlockService::class) ->tag('sonata.block') ->tag('sonata.breadcrumb') diff --git a/src/Resources/config/controllers.php b/src/Resources/config/controllers.php index 8bdbf5a5b..728f3c46d 100644 --- a/src/Resources/config/controllers.php +++ b/src/Resources/config/controllers.php @@ -13,7 +13,6 @@ use Psr\Container\ContainerInterface; use Sonata\PageBundle\Controller\BlockAdminController; -use Sonata\PageBundle\Controller\BlockController; use Sonata\PageBundle\Controller\PageAdminController; use Sonata\PageBundle\Controller\PageController; use Sonata\PageBundle\Controller\SiteAdminController; @@ -25,9 +24,6 @@ // Use "service" function for creating references to services when dropping support for Symfony 4.4 $containerConfigurator->services() - ->set('sonata.page.controller.block', BlockController::class) - ->public() - ->set('sonata.page.controller.page', PageController::class) ->public() ->tag('container.service_subscriber') diff --git a/src/Resources/config/routing/page.xml b/src/Resources/config/routing/page.xml deleted file mode 100644 index fa10d932c..000000000 --- a/src/Resources/config/routing/page.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - sonata.page.block.ajax:execute - -