Skip to content

Commit d2e5a1a

Browse files
Merge branch '6.4' into 7.0
* 6.4: [Console][PhpUnitBridge][VarDumper] Fix `NO_COLOR` empty value handling [Translation] Fix CSV escape char in `CsvFileLoader` on PHP >= 7.4 [DoctrineBridge] fix messenger bus dispatch inside an active transaction [HttpFoundation] Add tests for uncovered sections treat uninitialized properties referenced by property paths as null properly set up constraint options [ErrorHandler][VarDumper] Remove PHP 8.4 deprecations [Profiler] Add word wrap in tables in dialog to see all the text [Core] Fix & Enhance security arabic translation.
2 parents 72ec963 + ad51051 commit d2e5a1a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DeprecationErrorHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ private static function hasColorSupport(): bool
407407
}
408408

409409
// Follow https://no-color.org/
410-
if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
410+
if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
411411
return false;
412412
}
413413

bin/simple-phpunit.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla
369369
}
370370
}
371371

372-
$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), false === $getEnvVar('NO_COLOR') ? 'always' : 'never');
372+
$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), '' === $getEnvVar('NO_COLOR', '') ? 'always' : 'never');
373373
$cmd = str_replace('%', '%%', implode(' ', $cmd)).' %1$s';
374374

375375
if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -459,7 +459,7 @@ class SymfonyExcludeListSimplePhpunit
459459
{
460460
}
461461
}
462-
array_splice($argv, 1, 0, ['--colors='.(false === $getEnvVar('NO_COLOR') ? 'always' : 'never')]);
462+
array_splice($argv, 1, 0, ['--colors='.('' === $getEnvVar('NO_COLOR', '') ? 'always' : 'never')]);
463463
$_SERVER['argv'] = $argv;
464464
$_SERVER['argc'] = ++$argc;
465465
include "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit";

0 commit comments

Comments
 (0)