Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 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`
  • Loading branch information
nicolas-grekas committed Oct 20, 2023
2 parents fd086d0 + c873490 commit 80b1258
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Debug.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static function enable(): ErrorHandler
{
error_reporting(-1);

if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
ini_set('display_errors', 0);
} elseif (!filter_var(\ini_get('log_errors'), \FILTER_VALIDATE_BOOL) || \ini_get('error_log')) {
// CLI - display errors only if they're not already logged to STDERR
Expand Down
2 changes: 1 addition & 1 deletion ErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ public static function handleFatalError(array $error = null): void
*/
private function renderException(\Throwable $exception): void
{
$renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer($this->debug);
$renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer($this->debug);

$exception = $renderer->render($exception);

Expand Down

0 comments on commit 80b1258

Please sign in to comment.