Merge branch '6.2' into 6.3

* 6.2:
  Avoid call on null
  [Notifier] Document Firebase options object in readme
  [ErrorHandler] Fix sending Vary header with SerializerErrorRenderer
  Fix intl data tests
  Improve the description of the Intl component
  [DoctrineBridge] fix issue with missing stopwatch events
  [HttpClient] Fix canceling MockResponse

Author: nicolas-grekas

Tests/UriResolverTest.php

@@ -81,6 +81,9 @@ public static function provideResolverTests()
             ['/foo', 'file:///bar/baz', 'file:///foo'],
             ['foo', 'file:///', 'file:///foo'],
             ['foo', 'file:///bar/baz', 'file:///bar/foo'],
+
+            ['foo', 'http://localhost?bar=1', 'http://localhost/foo'],
+            ['foo', 'http://localhost#bar', 'http://localhost/foo'],
         ];
     }
 }

UriResolver.php

@@ -70,7 +70,7 @@ public static function resolve(string $uri, ?string $baseUri): string
         }
 
         // relative path
-        $path = parse_url(substr($baseUri, \strlen($baseUriCleaned)), \PHP_URL_PATH);
+        $path = parse_url(substr($baseUri, \strlen($baseUriCleaned)), \PHP_URL_PATH) ?? '';
         $path = self::canonicalizePath(substr($path, 0, strrpos($path, '/')).'/'.$uri);
 
         return $baseUriCleaned.('' === $path || '/' !== $path[0] ? '/' : '').$path;