Skip to content

Commit 494e21c

Browse files
Merge branch '5.4' into 6.2
* 5.4: [5.4] Allow PhpUnitBridge v7 [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
2 parents a123512 + 813b79a commit 494e21c

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"symfony/uid": "^5.4|^6.0"
4545
},
4646
"conflict": {
47-
"phpunit/phpunit": "<5.4.3",
4847
"symfony/console": "<5.4",
4948
"symfony/dependency-injection": "<5.4",
5049
"symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7",

0 commit comments

Comments
 (0)