Skip to content
Permalink
Browse files

Merge branch '4.4'

* 4.4:
  fixed CS
  fixed CS
  fixed CS
  fixed CS
  Do not log or call the proxy function when the locale is the same
  Added missing required dependencies on psr/cache and psr/container in symfony/cache-contracts and symfony/service-contracts respectively.
  [HttpClient] fix closing debug stream prematurely
  [Mailer] made code more robust
  Restore compatibility with php 5.5
  fixed sender/recipients in SMTP Envelope
  collect called listeners information only once
  [HttpClient] add HttplugClient for compat with libs that need httplug v1 or v2
  [HttpKernel] Remove TestEventDispatcher.
  • Loading branch information...
fabpot committed Jun 13, 2019
2 parents a7f3f6b + 762f6dc commit 6f8c3be44880b9ce6960567ec357008a02d39e6e
Showing with 3 additions and 3 deletions.
  1. +3 −3 Filesystem.php
@@ -744,15 +744,15 @@ private function getSchemeAndHierarchy(string $filename): array
private static function box($func)
{
self::$lastError = null;
\set_error_handler(__CLASS__.'::handleError');
set_error_handler(__CLASS__.'::handleError');
try {
$result = $func(...\array_slice(\func_get_args(), 1));
\restore_error_handler();
restore_error_handler();
return $result;
} catch (\Throwable $e) {
}
\restore_error_handler();
restore_error_handler();
throw $e;
}

0 comments on commit 6f8c3be

Please sign in to comment.
You can’t perform that action at this time.