Merge branch '5.0' into 5.1

nicolas-grekas · nicolas-grekas · commit b9adef763c4f · 2020-05-23T15:13:03.000+02:00
* 5.0:
  [BrowserKit] fix bad merge
diff --git a/HttpBrowser.php b/HttpBrowser.php
@@ -39,7 +39,10 @@ public function __construct(HttpClientInterface $client = null, History $history
         parent::__construct([], $history, $cookieJar);
     }
 
-    protected function doRequest(Request $request): Response
+    /**
+     * @param Request $request
+     */
+    protected function doRequest($request): Response
     {
         $headers = $this->getHeaders($request);
         [$body, $extraHeaders] = $this->getBodyAndExtraHeaders($request, $headers);

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ public function __construct(HttpClientInterface $client = null, History $history`
`39`	`39`	`parent::__construct([], $history, $cookieJar);`
`40`	`40`	`}`
`41`	`41`
`42`		`- protected function doRequest(Request $request): Response`
	`42`	`+ /**`
	`43`	`+ * @param Request $request`
	`44`	`+ */`
	`45`	`+ protected function doRequest($request): Response`
`43`	`46`	`{`
`44`	`47`	`$headers = $this->getHeaders($request);`
`45`	`48`	`[$body, $extraHeaders] = $this->getBodyAndExtraHeaders($request, $headers);`