Skip to content

Commit e41df19

Browse files
Merge branch '2.8' into 3.3
* 2.8: Revert "bug #24105 [Filesystem] check permissions if dump target dir is missing (xabbuh)" [Filesystem] skip tests if not applicable [Fabbot] Do not run php-cs-fixer if there are no change in src/ [Security] Fix exception when use_referer option is true and referer is not set or empty Get KERNEL_DIR through $_ENV too for KernelTestCase check permissions if dump target dir is missing
2 parents d41e1ac + 515d4e0 commit e41df19

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Test/KernelTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ protected static function getKernelClass()
115115
return $class;
116116
}
117117

118-
if (isset($_SERVER['KERNEL_DIR'])) {
119-
$dir = $_SERVER['KERNEL_DIR'];
118+
if (isset($_SERVER['KERNEL_DIR']) || isset($_ENV['KERNEL_DIR'])) {
119+
$dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : $_ENV['KERNEL_DIR'];
120120

121121
if (!is_dir($dir)) {
122122
$phpUnitDir = static::getPhpUnitXmlDir();

0 commit comments

Comments
 (0)