10000 fix blacklist · symfony/symfony@36213a5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 36213a5

Browse files
garakgarak
committed
fix blacklist
1 parent 0ecae1e commit 36213a5

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ class SymfonyTestsListenerTrait
4646
public function __construct(array $mockedNamespaces = array())
4747
{
4848
if (class_exists('PHPUnit_Util_Blacklist')) {
49-
\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
49+
\PHPUnit_Util_Blacklist::$blacklistedClassNames[__CLASS__] = 2;
5050
} elseif (method_exists(Blacklist::class, 'addDirectory')) {
51-
Blacklist::addDirectory('\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait');
51+
(new BlackList())->getBlacklistedDirectories();
52+
Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass(__CLASS__))->getFileName())));
5253
} else {
53-
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
54+
Blacklist::$blacklistedClassNames[__CLASS__] = 2;
5455
}
5556

5657
$warn = false;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ if (class_exists('PHPUnit_Util_Blacklist')) {
127127
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
128128
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
129129
} elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
130-
PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistPhpunit');
131-
PHPUnit\Util\Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
130+
(new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
131+
PHPUnit\Util\Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass('SymfonyBlacklistPhpunit'))->getFileName())));
132+
PHPUnit\Util\Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass('SymfonyBlacklistSimplePhpunit'))->getFileName())));
132133
} else {
133134
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
134135
PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;

0 commit comments

Comments
 (0)
0