Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5c37ab0

Browse filesBrowse files
Merge branch '5.0'
* 5.0: [PhpUnitBridge] fix compat with older versions of composer
2 parents 1299336 + 6d10f88 commit 5c37ab0
Copy full SHA for 5c37ab0

File tree

Expand file treeCollapse file tree

2 files changed

+2
-5
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+2
-5
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@
141141
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
142142
}
143143

144-
if (PHP_VERSION_ID >= 70000) {
145-
$passthruOrFail("$COMPOSER config --unset platform");
146-
}
144+
$passthruOrFail("$COMPOSER config --unset platform.php");
147145
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
148146
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
149147
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $path)));

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/composer.json
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.2.5",
2020
"symfony/config": "^4.4|^5.0",
21-
"symfony/framework-bundle": "^4.4|^5.0",
21+
"symfony/framework-bundle": "^5.1",
2222
"symfony/http-kernel": "^4.4|^5.0",
2323
"symfony/routing": "^4.4|^5.0",
2424
"symfony/twig-bundle": "^4.4|^5.0",
@@ -28,7 +28,6 @@
2828
"symfony/browser-kit": "^4.4|^5.0",
2929
"symfony/console": "^4.4|^5.0",
3030
"symfony/css-selector": "^4.4|^5.0",
31-
"symfony/dependency-injection": "^4.4|^5.0",
3231
"symfony/stopwatch": "^4.4|^5.0"
3332
},
3433
"conflict": {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.