Commit6f58674

authored and

committed

[FrameworkBundle] changed KernelTestCase::getKernelClass() to check $_SERVER['KERNEL_DIR'] before invoking getPhpUnitXmlDir()

1 parent4c97420 commit6f58674Copy full SHA for 6f58674

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,17 @@ private static function getPhpUnitCliConfigArgument()`
`100`	`100`	`*/`
`101`	`101`	`protectedstaticfunctiongetKernelClass()`
`102`	`102`	`{`
`103`		`-$dir =$phpUnitDir =static::getPhpUnitXmlDir();`
`104`		`-`
`105`	`103`	`if (isset($_SERVER['KERNEL_DIR'])) {`
`106`	`104`	`$dir =$_SERVER['KERNEL_DIR'];`
`107`	`105`
`108`		`-if (!is_dir($dir) &&is_dir("$phpUnitDir/$dir")) {`
`109`		`-$dir ="$phpUnitDir/$dir";`
	`106`	`+if (!is_dir($dir)) {`
	`107`	`+$phpUnitDir =static::getPhpUnitXmlDir();`
	`108`	`+if (is_dir("$phpUnitDir/$dir")) {`
	`109`	`+$dir ="$phpUnitDir/$dir";`
	`110`	`+ }`
`110`	`111`	`}`
	`112`	`+ }else {`
	`113`	`+$dir =static::getPhpUnitXmlDir();`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`$finder =newFinder();`

Comments

(0)