Commite27ed28

committed

fix compatibility with phpunit 9

1 parent08ded7f commite27ed28Copy full SHA for e27ed28

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,12 @@ class SymfonyTestsListenerTrait`
`46`	`46`	`publicfunction__construct(array$mockedNamespaces =array())`
`47`	`47`	`{`
`48`	`48`	`if (class_exists('PHPUnit_Util_Blacklist')) {`
`49`		`- \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] =2;`
	`49`	`+ \PHPUnit_Util_Blacklist::$blacklistedClassNames[__CLASS__] =2;`
	`50`	`+ }elseif (method_exists(Blacklist::class,'addDirectory')) {`
	`51`	`+ (newBlackList())->getBlacklistedDirectories();`
	`52`	`+ Blacklist::addDirectory(\dirname(\dirname((new \ReflectionClass(__CLASS__))->getFileName())));`
`50`	`53`	`}else {`
`51`		`- Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] =2;`
	`54`	`+ Blacklist::$blacklistedClassNames[__CLASS__] =2;`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`$warn =false;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,10 @@ if (!class_exists('SymfonyBlacklistPhpunit', false)) {`
`126`	`126`	`if (class_exists('PHPUnit_Util_Blacklist')) {`
`127`	`127`	`PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;`
`128`	`128`	`PHPUnit_Util_Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;`
	`129`	`+} elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {`
	`130`	`+ (new PHPUnit\Util\BlackList())->getBlacklistedDirectories();`
	`131`	`+ PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyBlacklistPhpunit'))->getFileName()));`
	`132`	`+ PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyBlacklistSimplePhpunit'))->getFileName()));`
`129`	`133`	`} else {`
`130`	`134`	`PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistPhpunit'] = 1;`
`131`	`135`	`PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyBlacklistSimplePhpunit'] = 1;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`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" ],`

Comments

(0)