Merge branch '4.2' into 4.3

* 4.2:
  fixed CS
  fixed CS
  [HttpKernel] Remove TestEventDispatcher.

Author: fabpot

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;
     }