Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
* 6.0:
  [HttpKernel] Fix test sensitivity on xdebug.file_link_format
  [HttpKernel] Fix non-scalar check in surrogate fragment renderer
  [Debug][ErrorHandler] fix operator precedence
  [Cache] Ensured that redis adapter can use multiple redis sentinel hosts
  [DoctrineBridge] fix tests
  [Security] Allow redirect after login to absolute URLs
  • Loading branch information
nicolas-grekas committed Jul 29, 2022
2 parents a298736 + cb30237 commit 736e42d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public function screamAt(int $levels, bool $replace = false): int
*/
private function reRegister(int $prev): void
{
if ($prev !== $this->thrownErrors | $this->loggedErrors) {
if ($prev !== ($this->thrownErrors | $this->loggedErrors)) {
$handler = set_error_handler('is_int');
$handler = \is_array($handler) ? $handler[0] : null;
restore_error_handler();
Expand Down

0 comments on commit 736e42d

Please sign in to comment.