Add support for Symfony 7

sonata-project · Oct 18, 2024 · 5a7b3a3 · 5a7b3a3
1 parent 8eaec5e
commit 5a7b3a3
Show file tree

Hide file tree

Showing 61 changed files with 158 additions and 152 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -58,6 +58,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
+                    - php-version: '8.3'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 7.0.*
+                      variant: symfony/symfony:"7.0.*"
 
         steps:
             - name: Checkout

diff --git a/composer.json b/composer.json
@@ -33,47 +33,47 @@
         "sonata-project/seo-bundle": "^3.4",
         "sonata-project/twig-extensions": "^1.3 || ^2.0",
         "symfony-cmf/routing-bundle": "^2.1 || ^3.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/console": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/form": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/http-foundation": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/intl": "^5.4 || ^6.2",
-        "symfony/options-resolver": "^5.4 || ^6.2",
-        "symfony/process": "^5.4 || ^6.2",
-        "symfony/property-access": "^5.4 || ^6.2",
-        "symfony/property-info": "^5.4 || ^6.2",
-        "symfony/routing": "^5.4 || ^6.2",
-        "symfony/runtime": "^5.4 || ^6.2",
-        "symfony/security-core": "^5.4 || ^6.2",
-        "symfony/security-http": "^5.4 || ^6.2",
-        "symfony/serializer": "^5.4.24 || ^6.2.11",
-        "symfony/validator": "^5.4 || ^6.2",
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/console": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/form": "^5.4 || ^6.2 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
+        "symfony/intl": "^5.4 || ^6.2 || ^7.0",
+        "symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
+        "symfony/process": "^5.4 || ^6.2 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.2 || ^7.0",
+        "symfony/property-info": "^5.4 || ^6.2 || ^7.0",
+        "symfony/routing": "^5.4 || ^6.2 || ^7.0",
+        "symfony/runtime": "^5.4 || ^6.2 || ^7.0",
+        "symfony/security-core": "^5.4 || ^6.2 || ^7.0",
+        "symfony/security-http": "^5.4 || ^6.2 || ^7.0",
+        "symfony/serializer": "^5.4.24 || ^6.2.11 || ^7.0",
+        "symfony/validator": "^5.4 || ^6.2 || ^7.0",
         "twig/string-extra": "^3.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^7.0",
+        "dama/doctrine-test-bundle": "^8.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "masterminds/html5": "^2.7",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.1.1 || ^5.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.3",
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.18",
+        "psalm/plugin-phpunit": "^0.19",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^1.1",
-        "symfony/browser-kit": "^5.4 || ^6.2",
-        "symfony/css-selector": "^5.4 || ^6.2",
-        "symfony/filesystem": "^5.4 || ^6.2",
+        "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
+        "symfony/css-selector": "^5.4 || ^6.2 || ^7.0",
+        "symfony/filesystem": "^5.4 || ^6.2 || ^7.0",
         "symfony/panther": "^2.0.1",
-        "symfony/phpunit-bridge": "^6.2",
-        "symfony/yaml": "^5.4 || ^6.2",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/yaml": "^5.4 || ^6.2 || ^7.0",
         "vimeo/psalm": "^5.0"
     },
     "conflict": {

diff --git a/src/Admin/BlockAdmin.php b/src/Admin/BlockAdmin.php
@@ -47,7 +47,7 @@ final class BlockAdmin extends BaseBlockAdmin
      */
     public function __construct(
         BlockServiceManagerInterface $blockManager,
-        private array $blocks = []
+        private array $blocks = [],
     ) {
         parent::__construct($blockManager);
     }
@@ -206,7 +206,7 @@ private function configureBlockFields(FormMapper $form, BlockInterface $block):
         $service = $this->blockManager->get($block);
 
         if (!$service instanceof EditableBlockService) {
-            throw new \RuntimeException(sprintf(
+            throw new \RuntimeException(\sprintf(
                 'The block "%s" must implement %s',
                 $blockType,
                 EditableBlockService::class

diff --git a/src/Admin/PageAdmin.php b/src/Admin/PageAdmin.php
@@ -48,7 +48,7 @@ final class PageAdmin extends AbstractAdmin
 
     public function __construct(
         private PageManagerInterface $pageManager,
-        private SiteManagerInterface $siteManager
+        private SiteManagerInterface $siteManager,
     ) {
         parent::__construct();
     }
@@ -119,7 +119,7 @@ protected function alterNewInstance(object $object): void
     protected function configurePersistentParameters(): array
     {
         $parameters = [];
-        $key = sprintf('%s.current_site', $this->getCode());
+        $key = \sprintf('%s.current_site', $this->getCode());
 
         if (!$this->hasRequest()) {
             return $parameters;
@@ -192,7 +192,7 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
                     $builder = $queryBuilder->getQueryBuilder();
 
                     if (\in_array($data->getValue(), ['hybrid', 'cms'], true)) {
-                        $builder->andWhere(sprintf('%s.routeName %s :routeName', $alias, 'cms' === $data->getValue() ? '=' : '!='));
+                        $builder->andWhere(\sprintf('%s.routeName %s :routeName', $alias, 'cms' === $data->getValue() ? '=' : '!='));
                         $builder->setParameter('routeName', PageInterface::PAGE_ROUTE_CMS_NAME);
 
                         return true;

diff --git a/src/Admin/SharedBlockAdmin.php b/src/Admin/SharedBlockAdmin.php
@@ -30,12 +30,12 @@ final class SharedBlockAdmin extends BaseBlockAdmin
 
     protected function generateBaseRoutePattern(bool $isChildAdmin = false): string
     {
-        return sprintf('%s/%s', parent::generateBaseRoutePattern($isChildAdmin), 'shared');
+        return \sprintf('%s/%s', parent::generateBaseRoutePattern($isChildAdmin), 'shared');
     }
 
     protected function generateBaseRouteName(bool $isChildAdmin = false): string
     {
-        return sprintf('%s_%s', parent::generateBaseRouteName($isChildAdmin), 'shared');
+        return \sprintf('%s_%s', parent::generateBaseRouteName($isChildAdmin), 'shared');
     }
 
     /**
@@ -101,7 +101,7 @@ private function configureBlockFields(FormMapper $form, BlockInterface $block):
         $service = $this->blockManager->get($block);
 
         if (!$service instanceof EditableBlockService) {
-            throw new \RuntimeException(sprintf(
+            throw new \RuntimeException(\sprintf(
                 'The block "%s" is not a valid %s',
                 $blockType,
                 EditableBlockService::class

diff --git a/src/Admin/SnapshotAdmin.php b/src/Admin/SnapshotAdmin.php
@@ -40,7 +40,7 @@ final class SnapshotAdmin extends AbstractAdmin
     public function __construct(
         private TransformerInterface $transformer,
         private PageManagerInterface $pageManager,
-        private SnapshotManagerInterface $snapshotManager
+        private SnapshotManagerInterface $snapshotManager,
     ) {
         parent::__construct();
     }

diff --git a/src/Block/BreadcrumbBlockService.php b/src/Block/BreadcrumbBlockService.php
@@ -35,7 +35,7 @@ final class BreadcrumbBlockService extends BaseBreadcrumbMenuBlockService implem
     public function __construct(
         Environment $twig,
         FactoryInterface $factory,
-        private CmsManagerSelectorInterface $cmsSelector
+        private CmsManagerSelectorInterface $cmsSelector,
     ) {
         parent::__construct($twig, $factory);
     }

diff --git a/src/Block/ChildrenPagesBlockService.php b/src/Block/ChildrenPagesBlockService.php
@@ -52,7 +52,7 @@ public function __construct(
         Environment $twig,
         private SiteSelectorInterface $siteSelector,
         private CmsManagerSelectorInterface $cmsManagerSelector,
-        private AdminInterface $pageAdmin
+        private AdminInterface $pageAdmin,
     ) {
         parent::__construct($twig);
     }

diff --git a/src/Block/PageListBlockService.php b/src/Block/PageListBlockService.php
@@ -34,7 +34,7 @@ final class PageListBlockService extends AbstractBlockService implements Editabl
 {
     public function __construct(
         Environment $twig,
-        private PageManagerInterface $pageManager
+        private PageManagerInterface $pageManager,
     ) {
         parent::__construct($twig);
     }

diff --git a/src/Block/SharedBlockBlockService.php b/src/Block/SharedBlockBlockService.php
@@ -46,7 +46,7 @@ final class SharedBlockBlockService extends AbstractBlockService implements Edit
     public function __construct(
         Environment $twig,
         private ManagerInterface $blockManager,
-        private AdminInterface $sharedBlockAdmin
+        private AdminInterface $sharedBlockAdmin,
     ) {
         parent::__construct($twig);
     }

diff --git a/src/CmsManager/CmsManagerSelector.php b/src/CmsManager/CmsManagerSelector.php
@@ -41,7 +41,7 @@ public function __construct(
         private CmsSnapshotManager $cmsSnapshotManager,
         private AdminInterface $pageAdmin,
         private TokenStorageInterface $tokenStorage,
-        private RequestStack $requestStack
+        private RequestStack $requestStack,
     ) {
     }
 
@@ -76,7 +76,7 @@ public function onLoginSuccess(LoginSuccessEvent $event): void
      */
     public function onSecurityInteractiveLogin(InteractiveLoginEvent $event): void
     {
-        @trigger_error(sprintf(
+        @trigger_error(\sprintf(
             'The method "%s()" is deprecated since sonata-project/page-bundle 4.7.0 and will be removed in 5.0.'
             .'  Use "%s()" instead.',
             __METHOD__,

diff --git a/src/CmsManager/CmsPageManager.php b/src/CmsManager/CmsPageManager.php
@@ -47,7 +47,7 @@ final class CmsPageManager extends BaseCmsPageManager
 
     public function __construct(
         private PageManagerInterface $pageManager,
-        private BlockInteractorInterface $blockInteractor
+        private BlockInteractorInterface $blockInteractor,
     ) {
     }
 
@@ -73,18 +73,18 @@ public function getPage(SiteInterface $site, $page): PageInterface
     public function getInternalRoute(SiteInterface $site, string $routeName): PageInterface
     {
         if (str_starts_with($routeName, 'error')) {
-            throw new \RuntimeException(sprintf('Illegal internal route name : %s, an internal page cannot start with `error`', $routeName));
+            throw new \RuntimeException(\sprintf('Illegal internal route name : %s, an internal page cannot start with `error`', $routeName));
         }
 
-        $routeName = sprintf('_page_internal_%s', $routeName);
+        $routeName = \sprintf('_page_internal_%s', $routeName);
 
         try {
             $page = $this->getPageByRouteName($site, $routeName);
         } catch (PageNotFoundException) {
             $page = $this->pageManager->createWithDefaults([
                 'url' => null,
                 'routeName' => $routeName,
-                'name' => sprintf('Internal Page : %s', $routeName),
+                'name' => \sprintf('Internal Page : %s', $routeName),
                 'decorate' => false,
             ]);
 
@@ -151,7 +151,7 @@ protected function getPageBy(?SiteInterface $site, string $fieldName, $value): P
             $page = $this->pageManager->findOneBy($parameters);
 
             if (null === $page) {
-                throw new PageNotFoundException(sprintf('Unable to find the page : %s = %s', $fieldName, $value));
+                throw new PageNotFoundException(\sprintf('Unable to find the page : %s = %s', $fieldName, $value));
             }
 
             $this->loadBlocks($page);

diff --git a/src/CmsManager/CmsSnapshotManager.php b/src/CmsManager/CmsSnapshotManager.php
@@ -50,7 +50,7 @@ final class CmsSnapshotManager extends BaseCmsPageManager
 
     public function __construct(
         private SnapshotManagerInterface $snapshotManager,
-        private TransformerInterface $transformer
+        private TransformerInterface $transformer,
     ) {
     }
 
@@ -75,7 +75,7 @@ public function getPage(SiteInterface $site, $page): PageInterface
 
     public function getInternalRoute(SiteInterface $site, string $routeName): PageInterface
     {
-        return $this->getPageByRouteName($site, sprintf('_page_internal_%s', $routeName));
+        return $this->getPageByRouteName($site, \sprintf('_page_internal_%s', $routeName));
     }
 
     public function findContainer(string $name, PageInterface $page, ?PageBlockInterface $parentContainer = null): ?PageBlockInterface

diff --git a/src/CmsManager/DecoratorStrategy.php b/src/CmsManager/DecoratorStrategy.php
@@ -30,7 +30,7 @@ final class DecoratorStrategy implements DecoratorStrategyInterface
     public function __construct(
         private array $ignoreRoutes,
         private array $ignoreRoutePatterns,
-        private array $ignoreUriPatterns
+        private array $ignoreUriPatterns,
     ) {
     }
 
@@ -80,7 +80,7 @@ public function isRouteNameDecorable(string $routeName): bool
         }
 
         foreach ($this->ignoreRoutePatterns as $routePattern) {
-            if (1 === preg_match(sprintf('#%s#', $routePattern), $routeName)) {
+            if (1 === preg_match(\sprintf('#%s#', $routePattern), $routeName)) {
                 return false;
             }
         }
@@ -91,7 +91,7 @@ public function isRouteNameDecorable(string $routeName): bool
     public function isRouteUriDecorable(string $uri): bool
     {
         foreach ($this->ignoreUriPatterns as $uriPattern) {
-            if (1 === preg_match(sprintf('#%s#', $uriPattern), $uri)) {
+            if (1 === preg_match(\sprintf('#%s#', $uriPattern), $uri)) {
                 return false;
             }
         }

diff --git a/src/Command/CleanupSnapshotsCommand.php b/src/Command/CleanupSnapshotsCommand.php
@@ -27,7 +27,7 @@ final class CleanupSnapshotsCommand extends Command
 {
     public function __construct(
         private CleanupSnapshotBySiteInterface $cleanupSnapshotBySite,
-        private SiteManagerInterface $siteManager
+        private SiteManagerInterface $siteManager,
     ) {
         parent::__construct();
     }
@@ -52,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $keepSnapshots = $input->getOption('keep-snapshots');
 
         foreach ($this->getSites($siteOption) as $site) {
-            $output->write(sprintf('<info>%s</info> - Cleaning up snapshots ...', $site->getName() ?? ''));
+            $output->write(\sprintf('<info>%s</info> - Cleaning up snapshots ...', $site->getName() ?? ''));
 
             $this->cleanupSnapshotBySite->cleanupBySite($site, (int) $keepSnapshots);
 

diff --git a/src/Command/CloneSiteCommand.php b/src/Command/CloneSiteCommand.php
@@ -34,7 +34,7 @@ final class CloneSiteCommand extends Command
     public function __construct(
         private SiteManagerInterface $siteManager,
         private PageManagerInterface $pageManager,
-        private BlockManagerInterface $blockManager
+        private BlockManagerInterface $blockManager,
     ) {
         parent::__construct();
     }
@@ -93,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $parent = $page->getParent();
 
-            $output->writeln(sprintf(
+            $output->writeln(\sprintf(
                 ' % 4s - % -70s - % 4s',
                 $pageId,
                 $page->getTitle() ?? '',
@@ -117,7 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $blockId = $block->getId();
                 \assert(null !== $blockId);
 
-                $output->writeln(sprintf(' cloning block % 4s ', $blockId));
+                $output->writeln(\sprintf(' cloning block % 4s ', $blockId));
 
                 $newBlock = clone $block;
                 $newBlock->setPage($newPage);
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             \assert(null !== $parentId);
 
             if (\array_key_exists($parentId, $pageClones)) {
-                $output->writeln(sprintf(
+                $output->writeln(\sprintf(
                     'new parent: % 4s - % -70s - % 4s -> % 4s',
                     $page->getId() ?? '',
                     $page->getTitle() ?? '',
@@ -167,7 +167,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 \assert(null !== $parentBlockId);
 
                 if (\array_key_exists($parentBlockId, $blockClones)) {
-                    $output->writeln(sprintf(
+                    $output->writeln(\sprintf(
                         'new block parent: % 4s - % 4s',
                         $block->getId() ?? '',
                         $blockClones[$parentBlockId]->getId() ?? ''
@@ -189,12 +189,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      */
     private function listAllSites(OutputInterface $output): void
     {
-        $output->writeln(sprintf(' % 5s - % -30s - %s', 'ID', 'Name', 'Url'));
+        $output->writeln(\sprintf(' % 5s - % -30s - %s', 'ID', 'Name', 'Url'));
 
         $sites = $this->siteManager->findAll();
 
         foreach ($sites as $site) {
-            $output->writeln(sprintf(
+            $output->writeln(\sprintf(
                 ' % 5s - % -30s - %s',
                 $site->getId() ?? '',
                 $site->getName() ?? '',