Skip to content

Commit 6e01f85

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Security][WIP] Add authenticators info to the profiler [Translation] Use symfony default locale when pulling translations from providers added missing translations for Bosnian (bs) Add the missing greek translations for security core and validator component [HttpKernel] Fix return types in `EventDataCollector` Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 [Security][Validator] Add missing translations for Slovenian (sl) [Messenger] Add worker metadata inside logs [Messenger] Log when worker should stop and when `SIGTERM` is received cs fix [Security][Validator] Add missing translations for Finnish (fi) [VarDumper] returns a 500 when dd() is executed chore(VarDumper): declare that dd() never returns [MonologBridge] Deprecate the Swiftmailer handler [Cache] Commit items implicitly only when deferred keys are requested [MonologBridge] Deprecates ResetLoggersWorkerSubscriber Fix "can not" spelling [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services [Form] Fix ChoiceType Extension to effectively set and use the translator Added new CssColor constraint
2 parents 365809e + a60e015 commit 6e01f85

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Cloner/VarCloner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected function doClone(mixed $var): array
8181
$vals[$k]->handle = ++$refsCounter;
8282
$hardRefs[$zvalRef] = $vals[$k];
8383
}
84-
// Create $stub when the original value $v can not be used directly
84+
// Create $stub when the original value $v cannot be used directly
8585
// If $v is a nested structure, put that structure in array $a
8686
switch (true) {
8787
case null === $v:

Resources/functions/dump.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,15 @@ function dump(mixed $var, mixed ...$moreVars): mixed
3232
}
3333

3434
if (!function_exists('dd')) {
35-
function dd(mixed ...$vars): void
35+
/**
36+
* @return never
37+
*/
38+
function dd(...$vars): void
3639
{
40+
if (!in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !headers_sent()) {
41+
header('HTTP/1.1 500 Internal Server Error');
42+
}
43+
3744
foreach ($vars as $v) {
3845
VarDumper::dump($v);
3946
}

0 commit comments

Comments
 (0)