Merge branch '7.3' into 7.4

* 7.3:
  [Filesystem] Unify logic for isAbsolute() in Path
  [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string
  [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector
  [HttpClient] Reject 3xx pushed responses
  [ProxyManagerBridge] Remove comment that reference github discussion
  [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer
  [Routing] Fix matching the "0" URL
  [Form] Fix EnumType choice_label logic for grouped choices
  The BrowserKit history with parameter separator without slash.

Author: nicolas-grekas

AbstractBrowser.php

@@ -669,7 +669,7 @@ protected function getAbsoluteUri(string $uri): string
             $uri = $path.$uri;
         }
 
-        return preg_replace('#^(.*?//[^/]+)\/.*$#', '$1', $currentUri).$uri;
+        return preg_replace('#^(.*?//[^/?]+)[/?].*$#', '$1', $currentUri).$uri;
     }
 
     /**

Tests/AbstractBrowserTest.php

@@ -893,6 +893,15 @@ public function testInternalRequestNull()
         $client->getInternalRequest();
     }
 
+    public function testHistoryWithParametersAndNoSlash()
+    {
+        $client = $this->getBrowser();
+        $client->request('GET', 'https://www.example.com?the=value');
+        $client->request('GET', '/path/?parameter=value');
+
+        $this->assertSame('https://www.example.com/path/?parameter=value', $client->getRequest()->getUri(), '->request() history provides proper base.');
+    }
+
     public function testFollowRedirectWithoutRequest()
     {
         $browser = $this->getBrowser();