Skip to content

Commit 515d4e0

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: 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 a109993 + 1dc6a03 commit 515d4e0

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
@@ -106,8 +106,8 @@ private static function getPhpUnitCliConfigArgument()
106106
*/
107107
protected static function getKernelClass()
108108
{
109-
if (isset($_SERVER['KERNEL_DIR'])) {
110-
$dir = $_SERVER['KERNEL_DIR'];
109+
if (isset($_SERVER['KERNEL_DIR']) || isset($_ENV['KERNEL_DIR'])) {
110+
$dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : $_ENV['KERNEL_DIR'];
111111

112112
if (!is_dir($dir)) {
113113
$phpUnitDir = static::getPhpUnitXmlDir();

0 commit comments

Comments
 (0)