File tree 3 files changed +23
-3
lines changed
src/Symfony/Bridge/PhpUnit 3 files changed +23
-3
lines changed Original file line number Diff line number Diff line change @@ -47,8 +47,13 @@ public function __construct(array $mockedNamespaces = array())
47
47
{
48
48
if (class_exists ('PHPUnit_Util_Blacklist ' )) {
49
49
\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
+ }
52
57
}
53
58
54
59
$ warn = false ;
Original file line number Diff line number Diff line change @@ -123,6 +123,21 @@ require PHPUNIT_COMPOSER_INSTALL;
123
123
if (!class_exists('SymfonyBlacklistPhpunit', false)) {
124
124
class SymfonyBlacklistPhpunit {}
125
125
}
126
+ if (class_exists('PHPUnit_Util_Blacklist')) {
127
+ PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
128
+ PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
129
+ } elseif (class_exists(Blacklist::class)) {
130
+ if (method_exists(Blacklist::class, 'addDirectory')) {
131
+ Blacklist::addDirectory('SymfonyBlacklistPhpunit');
132
+ Blacklist::addDirectory('SymfonyBlacklistSimplePhpunit');
133
+ } else {
134
+ Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
135
+ Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
136
+ }
137
+ }
138
+
139
+
140
+
126
141
if (class_exists('PHPUnit_Util_Blacklist')) {
127
142
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;
128
143
PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;
Original file line number Diff line number Diff line change 24
24
"symfony/debug" : " For tracking deprecated interfaces usages at runtime with DebugClassLoader"
25
25
},
26
26
"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 "
28
28
},
29
29
"autoload" : {
30
30
"files" : [ " bootstrap.php" ],
You can’t perform that action at this time.
0 commit comments