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 3ad44bf

Browse filesBrowse files
committed
fix compatibility with phpunit 9
1 parent 08ded7f commit 3ad44bf
Copy full SHA for 3ad44bf

File tree

Expand file treeCollapse file tree

3 files changed

+16
-6
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+16
-6
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,13 @@ public function __construct(array $mockedNamespaces = array())
4747
{
4848
if (class_exists('PHPUnit_Util_Blacklist')) {
4949
\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
50-
} else {
51-
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
50+
} elseif (class_exists(Blacklist::class)) {
51+
$className = '\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait';
52+
if (method_exists(Blacklist::class, 'addDirectory')) {
53+
Blacklist::addDirectory($className);
54+
} else {
55+
Blacklist::$blacklistedClassNames[$className] = 2;
56+
}
5257
}
5358

5459
$warn = false;

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+8-3Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,14 @@ if (!class_exists('SymfonyBlacklistPhpunit', false)) {
126126
if (class_exists('PHPUnit_Util_Blacklist')) {
127127
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
128128
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
129-
} else {
130-
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
131-
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
129+
} elseif (class_exists(\PHPUnit\Util\Blacklist::class)) {
130+
if (method_exists(\PHPUnit\Util\Blacklist::class, 'addDirectory')) {
131+
\PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistPhpunit');
132+
\PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
133+
} else {
134+
\PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
135+
\PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
136+
}
132137
}
133138
134139
Symfony\Bridge\PhpUnit\TextUI\Command::main();

‎src/Symfony/Bridge/PhpUnit/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
2525
},
2626
"conflict": {
27-
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0"
27+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2"
2828
},
2929
"autoload": {
3030
"files": [ "bootstrap.php" ],

0 commit comments

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