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 ed3ab52

Browse filesBrowse files
committed
minor #38103 Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3) (derrabus)
This PR was merged into the 3.4 branch. Discussion ---------- Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3) | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes/no | New feature? | no | Deprecations? | no | Tickets | #37564 | License | MIT | Doc PR | N/A Our test suite on the 3.4 branch should be compatible with more recent versions of PHPUnit now. In order to make sure that it stays that way, I'm proposing to bump PHPUnit to 8.5 for the php 7.2 job and 9.3 for the php 7.3 and 7.4 jobs. Commits ------- ff47516 Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).
2 parents 71e8028 + ff47516 commit ed3ab52
Copy full SHA for ed3ab52

File tree

Expand file treeCollapse file tree

4 files changed

+7
-7
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+7
-7
lines changed

‎phpunit

Copy file name to clipboardExpand all lines: phpunit
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
1212
if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {
1313
putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');
1414
}
15-
if (\PHP_VERSION_ID >= 80000) {
16-
putenv('SYMFONY_PHPUNIT_VERSION=9.3');
15+
if (\PHP_VERSION_ID < 70300) {
16+
putenv('SYMFONY_PHPUNIT_VERSION=8.5');
1717
} else {
18-
putenv('SYMFONY_PHPUNIT_VERSION=8.3');
18+
putenv('SYMFONY_PHPUNIT_VERSION=9.3');
1919
}
2020
} elseif (\PHP_VERSION_ID >= 70000) {
2121
putenv('SYMFONY_PHPUNIT_VERSION=6.5');

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public function __construct(array $mockedNamespaces = array())
4949
\PHPUnit_Util_Blacklist::$blacklistedClassNames[__CLASS__] = 2;
5050
} elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
5151
eval(" // PHP 5.3 compat
52-
(new BlackList())->getBlacklistedDirectories();
53-
Blacklist::addDirectory(\dirname((new \ReflectionClass(__CLASS__))->getFileName(), 2));
52+
(new \PHPUnit\Util\Blacklist())->getBlacklistedDirectories();
53+
\PHPUnit\Util\Blacklist::addDirectory(\dirname(__FILE__, 2));
5454
");
5555
} else {
5656
Blacklist::$blacklistedClassNames[__CLASS__] = 2;

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/debug": "~2.8|~3.0|~4.0",
2626
"symfony/event-dispatcher": "~3.4|~4.0",
2727
"symfony/http-foundation": "^3.4.38|^4.3",
28-
"symfony/http-kernel": "^3.4.31|^4.3.4",
28+
"symfony/http-kernel": "^3.4.44|^4.3.4",
2929
"symfony/polyfill-mbstring": "~1.0",
3030
"symfony/filesystem": "~2.8|~3.0|~4.0",
3131
"symfony/finder": "~2.8|~3.0|~4.0",

‎src/Symfony/Component/Form/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"require-dev": {
2828
"doctrine/collections": "~1.0",
29-
"symfony/validator": "^3.4.3|^4.0.3",
29+
"symfony/validator": "^3.4.44|^4.0.3",
3030
"symfony/dependency-injection": "~3.3|~4.0",
3131
"symfony/config": "~2.7|~3.0|~4.0",
3232
"symfony/expression-language": "~3.4|~4.0",

0 commit comments

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