Skip to content

Commit e62cd00

Browse files
Merge branch '6.4' into 7.0
* 6.4: Partially revert "DX: PHP CS Fixer - update excluded paths and apply some minor CS" [AssetMapper] Allowing for files to be written to some non-local location [HttpKernel] Resolve EBADP error on flock with LOCK_SH with NFS [AssetMapper] Fixing bug of bad parsing of imports when an import then export are adjacent add missing basque translations [FrameworkBundle][Validator] Allow implementing validation groups provider outside DTOs [Notifier][Novu] Implement overrides [Validator] Handle `null` case [Workflow] List place or transition listeners in profiler [Intl] Add support for emoji 15.1 Replace Tickets by Issues [Validator] Add missing arabic translations [Validator] Added missing translations for Romanian language for Validator component [Messenger] Fix graceful exit with ids [HttpKernel] Add parameters `kernel.runtime_mode` and `kernel.runtime_mode.*`, all set from env var `APP_RUNTIME_MODE`
2 parents 320cba1 + 86901b1 commit e62cd00

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Resources/functions/dump.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function dump(mixed ...$vars): mixed
4545
if (!function_exists('dd')) {
4646
function dd(mixed ...$vars): never
4747
{
48-
if (!in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !headers_sent()) {
48+
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) && !headers_sent()) {
4949
header('HTTP/1.1 500 Internal Server Error');
5050
}
5151

VarDumper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ private static function register(): void
7676
case 'server' === $format:
7777
case $format && 'tcp' === parse_url($format, \PHP_URL_SCHEME):
7878
$host = 'server' === $format ? $_SERVER['VAR_DUMPER_SERVER'] ?? '127.0.0.1:9912' : $format;
79-
$dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliDumper() : new HtmlDumper();
79+
$dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) ? new CliDumper() : new HtmlDumper();
8080
$dumper = new ServerDumper($host, $dumper, self::getDefaultContextProviders());
8181
break;
8282
default:
83-
$dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliDumper() : new HtmlDumper();
83+
$dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) ? new CliDumper() : new HtmlDumper();
8484
}
8585

8686
if (!$dumper instanceof ServerDumper) {
@@ -102,7 +102,7 @@ private static function getDefaultContextProviders(): array
102102
{
103103
$contextProviders = [];
104104

105-
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && class_exists(Request::class)) {
105+
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) && class_exists(Request::class)) {
106106
$requestStack = new RequestStack();
107107
$requestStack->push(Request::createFromGlobals());
108108
$contextProviders['request'] = new RequestContextProvider($requestStack);

0 commit comments

Comments
 (0)