Add support for Twig and Doctrine extensions 2.0

composer.json

@@ -27,11 +27,11 @@
         "doctrine/persistence": "^2.1 || ^3.0",
         "sonata-project/admin-bundle": "^4.15",
         "sonata-project/block-bundle": "^4.16",
-        "sonata-project/doctrine-extensions": "^1.8",
+        "sonata-project/doctrine-extensions": "^1.8 || ^2.0",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
         "sonata-project/form-extensions": "^1.4",
         "sonata-project/seo-bundle": "^3.0",
-        "sonata-project/twig-extensions": "^1.3",
+        "sonata-project/twig-extensions": "^1.3 || ^2.0",
         "symfony-cmf/routing-bundle": "^2.1 || ^3.0",
         "symfony/config": "^4.4 || ^5.4 || ^6.0",
         "symfony/console": "^4.4 || ^5.4 || ^6.0",

src/Command/CloneSiteCommand.php

@@ -161,7 +161,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 }
             }
 
-            $this->pageManager->save($page, true);
+            $this->pageManager->save($page);
         }
 
         $output->writeln('Fixing block parents');
@@ -183,7 +183,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                         $block->setParent(null);
                     }
 
-                    $this->blockManager->save($block, true);
+                    $this->blockManager->save($block);
                 }
             }
         }

src/Entity/PageManager.php

@@ -123,7 +123,10 @@ public function fixUrl(PageInterface $page): void
         }
     }
 
-    public function save($entity, $andFlush = true)
+    /**
+     * TODO: Add tyephinting once sonata-project/doctrine-extensions < 2 is dropped.
+     */
+    public function save($entity, $andFlush = true): void
     {
         if (!$entity->isHybrid()) {
             $this->fixUrl($entity);

tests/Command/CreateBlockContainerCommandTest.php

@@ -38,7 +38,7 @@ public function testCreateBlock(): void
 
         $page = new Page();
         $pageManager->method('findBy')->with(['templateCode' => 'foo'])->willReturn([$page]);
-        $pageManager->method('save')->with($page)->willReturn($page);
+        $pageManager->method('save')->with($page);
 
         $command = new CreateBlockContainerCommand($pageManager, $blockInteractor);
 

tests/Route/RoutePageGeneratorTest.php

@@ -175,9 +175,13 @@ private function getRoutePageGenerator(): RoutePageGenerator
 
         $pageManager->expects(static::atLeastOnce())
             ->method('findOneBy')
-            ->willReturnMap([
-                [['routeName' => 'test_hybrid_page_with_bad_host', 'site' => 1], null, $hybridPageWithBadHost],
-            ]);
+            ->willReturnCallback(static function ($criteria) use ($hybridPageWithBadHost) {
+                if ($criteria === ['routeName' => 'test_hybrid_page_with_bad_host', 'site' => 1]) {
+                    return $hybridPageWithBadHost;
+                }
+
+                return null;
+            });
 
         $pageManager
             ->method('getHybridPages')