Fix Breadcrumbs into the page

src/Admin/SharedBlockAdmin.php

@@ -18,7 +18,7 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\BlockBundle\Block\Service\EditableBlockService;
 use Sonata\BlockBundle\Model\BlockInterface;
-use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
+use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface as ORMProxyQueryInterface;
 use Sonata\PageBundle\Model\PageBlockInterface;
 
 /**
@@ -38,14 +38,20 @@ protected function generateBaseRouteName(bool $isChildAdmin = false): string
         return sprintf('%s_%s', parent::generateBaseRouteName($isChildAdmin), 'shared');
     }
 
+    /**
+     * @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType
+     *
+     * @see https://github.com/vimeo/psalm/issues/8429
+     */
     protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterface
     {
-        \assert($query instanceof ProxyQuery);
+        \assert($query instanceof ORMProxyQueryInterface);
 
         // Filter on blocks without page and parents
-        $rootAlias = current($query->getRootAliases());
-        $query->andWhere($query->expr()->isNull($rootAlias.'.page'));
-        $query->andWhere($query->expr()->isNull($rootAlias.'.parent'));
+        $queryBuilder = $query->getQueryBuilder();
+        $rootAlias = current($queryBuilder->getRootAliases());
+        $queryBuilder->andWhere($queryBuilder->expr()->isNull($rootAlias.'.page'));
+        $queryBuilder->andWhere($queryBuilder->expr()->isNull($rootAlias.'.parent'));
 
         return $query;
     }

src/Controller/PageAdminController.php

@@ -54,6 +54,8 @@ public static function getSubscribedServices(): array
     }
 
     /**
+     * @param ProxyQueryInterface<object> $query
+     *
      * @throws AccessDeniedException
      */
     public function batchActionSnapshot(ProxyQueryInterface $query): RedirectResponse

src/Controller/SnapshotAdminController.php

@@ -35,6 +35,8 @@ public static function getSubscribedServices(): array
     }
 
     /**
+     * @param ProxyQueryInterface<object> $query
+     *
      * @throws AccessDeniedException
      */
     public function batchActionToggleEnabled(ProxyQueryInterface $query): RedirectResponse

src/Resources/views/layout.html.twig

@@ -18,8 +18,8 @@ file that was distributed with this source code.
             </div>
 
             {% block sonata_page_breadcrumb %}
-                <div class="row">
-                    {{ sonata_block_render_event('breadcrumb', { 'context': 'page', 'current_uri': app.request.requestUri }) }}
+                <div class="row page-breadcrumb">
+                    {{ sonata_block_render_event('breadcrumb', { 'context': 'sonata.page.block.breadcrumb', 'current_uri': app.request.requestUri }) }}
                 </div>
             {% endblock %}
 

tests/Page/TemplateManagerTest.php

@@ -13,12 +13,20 @@
 
 namespace Sonata\PageBundle\Tests\Page;
 
-use PHPUnit\Framework\TestCase;
+use Sonata\PageBundle\CmsManager\CmsSnapshotManager;
+use Sonata\PageBundle\Model\PageInterface;
+use Sonata\PageBundle\Model\SnapshotManagerInterface;
 use Sonata\PageBundle\Model\Template;
+use Sonata\PageBundle\Model\TransformerInterface;
 use Sonata\PageBundle\Page\TemplateManager;
+use Sonata\PageBundle\Tests\App\AppKernel;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Environment;
 
-final class TemplateManagerTest extends TestCase
+final class TemplateManagerTest extends KernelTestCase
 {
     public function testAddSingleTemplate(): void
     {
@@ -136,6 +144,51 @@ public function testRenderResponseWithDefaultParameters(): void
         );
     }
 
+    public function testTemplateShowingBreadcrumbIntoThePage(): void
+    {
+        $kernel = self::bootKernel();
+        // TODO: Simplify this when dropping support for Symfony 4.
+        // @phpstan-ignore-next-line
+        $container = method_exists($this, 'getContainer') ? self::getContainer() : $kernel->getContainer();
+
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request());
+        $container->set('request_stack', $requestStack);
+
+        // Mocking snapshot
+        $pageMock = $this->createMock(PageInterface::class);
+        $pageMock->method('getName')->willReturn('Foo');
+        $pageMock->method('getParents')->willReturn([]);
+        $pageMock->method('getUrl')->willReturn('/');
+
+        // Mock Snapshot manager
+        $snapshotManagerMock = $this->createMock(SnapshotManagerInterface::class);
+        $transformerMock = $this->createMock(TransformerInterface::class);
+        $cmsSnapshotManagerMock = new CmsSnapshotManager($snapshotManagerMock, $transformerMock);
+        $cmsSnapshotManagerMock->setCurrentPage($pageMock);
+        $container->set('sonata.page.cms.snapshot', $cmsSnapshotManagerMock);
+
+        $twig = $container->get('twig');
+        \assert($twig instanceof Environment);
+
+        $manager = new TemplateManager($twig, []);
+        $response = $manager->renderResponse('test');
+        /** @var string $content */
+        $content = $response->getContent();
+        $crawler = new Crawler($content);
+
+        static::assertCount(1, $crawler->filter('.page-breadcrumb'));
+
+        $breadcrumbFoo = $crawler->filter('.page-breadcrumb')->filter('a');
+        static::assertSame('/', $breadcrumbFoo->attr('href'));
+        static::assertStringContainsString('Foo', $breadcrumbFoo->text());
+    }
+
+    protected static function getKernelClass(): string
+    {
+        return AppKernel::class;
+    }
+
     private function getTemplate(string $name, string $path = 'path/to/file'): Template
     {
         return new Template($name, $path);