From 8bc08186a194604d3f4d4835a8ad9a324c359c23 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Mon, 31 Mar 2025 09:03:10 +0200
Subject: [PATCH 1/2] fix cs

---
 src/CmfRoutingBundle.php              | 1 +
 src/Doctrine/Phpcr/LocaleListener.php | 2 +-
 src/Doctrine/Phpcr/RouteProvider.php  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CmfRoutingBundle.php b/src/CmfRoutingBundle.php
index ebe8640f..f5e53259 100644
--- a/src/CmfRoutingBundle.php
+++ b/src/CmfRoutingBundle.php
@@ -63,6 +63,7 @@ private function buildPhpcrCompilerPass(ContainerBuilder $container): void
             $aliasMap = ['CmfRoutingBundle' => 'Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr'];
         }
         $container->addCompilerPass(
+            /* @phpstan-ignore arguments.count (support for doctrine/persistence 2) */
             DoctrinePhpcrMappingsPass::createXmlMappingDriver(
                 [
                     realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingBundle\Model',
diff --git a/src/Doctrine/Phpcr/LocaleListener.php b/src/Doctrine/Phpcr/LocaleListener.php
index b7a51ce4..4cb3fd62 100644
--- a/src/Doctrine/Phpcr/LocaleListener.php
+++ b/src/Doctrine/Phpcr/LocaleListener.php
@@ -70,7 +70,7 @@ public function __construct(
         PrefixCandidates $candidates,
         array $locales,
         bool $addLocalePattern = false,
-        bool $updateAvailableTranslations = false
+        bool $updateAvailableTranslations = false,
     ) {
         $this->candidates = $candidates;
         $this->locales = $locales;
diff --git a/src/Doctrine/Phpcr/RouteProvider.php b/src/Doctrine/Phpcr/RouteProvider.php
index e19099f7..6b4e851d 100644
--- a/src/Doctrine/Phpcr/RouteProvider.php
+++ b/src/Doctrine/Phpcr/RouteProvider.php
@@ -45,7 +45,7 @@ public function __construct(
         ManagerRegistry $managerRegistry,
         CandidatesInterface $candidatesStrategy,
         ?string $className = null,
-        ?LoggerInterface $logger = null
+        ?LoggerInterface $logger = null,
     ) {
         parent::__construct($managerRegistry, $className);
         $this->candidatesStrategy = $candidatesStrategy;

From f70890b2c8aa36daf7afb2b77c9f75d25ec9fb0a Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Mon, 31 Mar 2025 09:07:07 +0200
Subject: [PATCH 2/2] fix dependencies

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9e0c50cb..6290600a 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "doctrine/data-fixtures": "^1.0.0",
         "doctrine/doctrine-bundle": "^2.8",
-        "doctrine/orm": "^2.9 || ^3.0",
+        "doctrine/orm": "^2.9 || ^3.0.1",
         "doctrine/phpcr-bundle": "^3.0",
         "doctrine/phpcr-odm": "^2.0",
         "jackalope/jackalope-doctrine-dbal": "^2.0",