From 8ae36f3cdc57cce28c9cbef4e0541830cc79a2dc Mon Sep 17 00:00:00 2001
From: Joel Wurtz <jwurtz@jolicode.com>
Date: Thu, 25 May 2023 14:34:50 +0200
Subject: [PATCH 1/2] [Console] block input stream if needed When the input
 stream used in the question helper is not blocking, the default value is
 always used as the stream return false. In order to fix that, we force the
 stream to be in blocking state and go back to the old state after so other
 logic is not impacted by this change

---
 .../Component/Console/Helper/QuestionHelper.php       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index ec5b418f2cbe7..e236be92a3913 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -128,7 +128,18 @@ private function doAsk(OutputInterface $output, Question $question)
             }
 
             if (false === $ret) {
+                $isBlocked = stream_get_meta_data($inputStream)['blocked'] ?? true;
+
+                if (!$isBlocked) {
+                    stream_set_blocking($inputStream, true);
+                }
+
                 $ret = $this->readInput($inputStream, $question);
+
+                if (!$isBlocked) {
+                    stream_set_blocking($inputStream, false);
+                }
+
                 if (false === $ret) {
                     throw new MissingInputException('Aborted.');
                 }

From 044bd02a47160ef1a65842d4bc5d07eb5d093422 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 25 May 2023 15:05:00 +0200
Subject: [PATCH 2/2] [5.4] Allow PhpUnitBridge v7

---
 composer.json                                    | 4 ++--
 src/Symfony/Bridge/Doctrine/composer.json        | 1 -
 src/Symfony/Bundle/FrameworkBundle/composer.json | 1 -
 src/Symfony/Component/Form/composer.json         | 1 -
 src/Symfony/Component/Validator/composer.json    | 1 -
 src/Symfony/Component/VarDumper/composer.json    | 1 -
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index b291459895cb7..469c30715f775 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,7 @@
         "psr/simple-cache": "^1.0|^2.0",
         "egulias/email-validator": "^2.1.10|^3.1|^4",
         "symfony/mercure-bundle": "^0.3",
-        "symfony/phpunit-bridge": "^5.2|^6.0",
+        "symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
         "symfony/runtime": "self.version",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
@@ -161,7 +161,7 @@
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
         "ocramius/proxy-manager": "<2.1",
-        "phpunit/phpunit": "<5.4.3"
+        "phpunit/phpunit": "<7.5|9.1.2"
     },
     "config": {
         "allow-plugins": {
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index a0dbbe9636adb..3aa2e352401ca 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -54,7 +54,6 @@
         "doctrine/dbal": "<2.13.1",
         "doctrine/lexer": "<1.1",
         "doctrine/orm": "<2.7.4",
-        "phpunit/phpunit": "<5.4.3",
         "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<4.4",
         "symfony/form": "<5.4.21|>=6,<6.2.7",
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 19da8ab3b66d6..320b993b1f8d1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -74,7 +74,6 @@
         "doctrine/persistence": "<1.3",
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
-        "phpunit/phpunit": "<5.4.3",
         "symfony/asset": "<5.3",
         "symfony/console": "<5.2.5",
         "symfony/dotenv": "<5.1",
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index 6b02d77e29dff..39babd350174e 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -44,7 +44,6 @@
         "symfony/uid": "^5.1|^6.0"
     },
     "conflict": {
-        "phpunit/phpunit": "<5.4.3",
         "symfony/console": "<4.4",
         "symfony/dependency-injection": "<4.4",
         "symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7",
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 019a46fc15282..3e860daa30e30 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -49,7 +49,6 @@
         "doctrine/annotations": "<1.13",
         "doctrine/cache": "<1.11",
         "doctrine/lexer": "<1.1",
-        "phpunit/phpunit": "<5.4.3",
         "symfony/dependency-injection": "<4.4",
         "symfony/expression-language": "<5.1",
         "symfony/http-kernel": "<4.4",
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
index dc46f58d99eca..fc127d721ab16 100644
--- a/src/Symfony/Component/VarDumper/composer.json
+++ b/src/Symfony/Component/VarDumper/composer.json
@@ -28,7 +28,6 @@
         "twig/twig": "^2.13|^3.0.4"
     },
     "conflict": {
-        "phpunit/phpunit": "<5.4.3",
         "symfony/console": "<4.4"
     },
     "suggest": {