Merge branch '1.10' into 1.11

* 1.10:
  add dependency injection conflict

CONFLICTS.md

@@ -52,6 +52,13 @@ references related issues.
 
    Probably introduced in: https://github.com/symfony/symfony/pull/40811
 
+ - `symfony/dependency-injection:4.4.38|5.4.5`:
+   
+   These versions are causing a problem with mink session:
+  `InvalidArgumentException: Specify session name to get in vendor/friends-of-behat/mink/src/Mink.php:198`,
+   Psalm error: 
+   `UndefinedDocblockClass: Docblock-defined class, interface or enum named UnitEnum does not exist`.
+
 In this section we keep track of the reasons, why some restrictions were added to the `requires` section of `composer.json`
 
 - `doctrine/dbal:^2`:

composer.json

@@ -167,6 +167,7 @@
         "symfony/amqp-messenger": "^6.0",
         "symfony/doctrine-messenger": "^6.0",
         "symfony/error-handler": "^6.0",
+        "symfony/dependency-injection": "4.4.38 || 5.4.5",
         "symfony/redis-messenger": "^6.0",
         "symfony/stopwatch": "^6.0",
         "symfony/twig-bridge": "^6.0",