From 0c92e7a5a42e4f69bb5877f051896ff93480647e Mon Sep 17 00:00:00 2001
From: tlallement <tlallement@incert.lu>
Date: Fri, 4 Aug 2023 11:02:27 +0200
Subject: [PATCH 1/2] Constraint dev dependencies to compatible versions

---
 Tests/app/AppKernel.php | 8 ++++----
 composer.json           | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Tests/app/AppKernel.php b/Tests/app/AppKernel.php
index b82a3526..1e8dcc77 100644
--- a/Tests/app/AppKernel.php
+++ b/Tests/app/AppKernel.php
@@ -47,7 +47,7 @@ public function __construct($testCase, $debug = true)
         parent::__construct($environment, $debug);
     }
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         if (!file_exists($filename = $this->getRootDir() . '/' . $this->testCase . '/bundles.php')) {
             throw new \RuntimeException(sprintf('The bundles file "%s" does not exist.', $filename));
@@ -61,12 +61,12 @@ public function getRootDir()
         return __DIR__;
     }
 
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->getRootDir() . '/tmp/' . $this->testCase . '/cache/' . $this->environment;
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->getRootDir() . '/tmp/' . $this->testCase . '/logs';
     }
@@ -86,7 +86,7 @@ public function unserialize($str)
         call_user_func_array(array($this, '__construct'), unserialize($str));
     }
 
-    protected function getKernelParameters()
+    protected function getKernelParameters(): array
     {
         $parameters = parent::getKernelParameters();
         $parameters['kernel.test_case'] = $this->testCase;
diff --git a/composer.json b/composer.json
index 3859472e..98583304 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,8 @@
     "require-dev": {
         "ext-mongodb": "*",
         "symfony/symfony": "~5.0|~6.0",
+        "doctrine/annotations": "^1.13",
+        "doctrine/cache": "^1.4",
         "doctrine/orm": ">=2.4",
         "doctrine/doctrine-bundle": "^2.2",
         "doctrine/data-fixtures": "~1.1",
@@ -31,6 +33,7 @@
         "phpunit/phpunit": "^9.5",
         "doctrine/mongodb-odm": "^2.1",
         "mongodb/mongodb": "^1.8",
+        "monolog/monolog": "^2.0",
         "ext-pdo": "*",
         "mikey179/vfsstream": "^1.6"
     },

From 68064269a0366fd2d2b3d2848fa94e23f250cf14 Mon Sep 17 00:00:00 2001
From: tlallement <tlallement@incert.lu>
Date: Fri, 4 Aug 2023 11:48:02 +0200
Subject: [PATCH 2/2] Fix after merge

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

diff --git a/composer.json b/composer.json
index 43f40a1a..d0fa4daa 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,6 @@
         "phpunit/phpunit": "^9.5",
         "doctrine/mongodb-odm": "^2.1",
         "mongodb/mongodb": "^1.8",
-        "monolog/monolog": "^2.0",
         "ext-pdo": "*",
         "mikey179/vfsstream": "^1.6",
         "rector/rector": "^0.14.8"