Merge branch '5.4' into 6.0

* 5.4:
  More return type fixes (bis)
  Cleanup `@return` annotations

Author: nicolas-grekas

AbstractBrowser.php

@@ -105,8 +105,6 @@ public function getMaxRedirects()
     /**
      * Sets the insulated flag.
      *
-     * @param bool $insulated Whether to insulate the requests or not
-     *
      * @throws \RuntimeException When Symfony Process Component is not installed
      */
     public function insulate(bool $insulated = true)
@@ -120,8 +118,6 @@ public function insulate(bool $insulated = true)
 
     /**
      * Sets server parameters.
-     *
-     * @param array $server An array of server parameters
      */
     public function setServerParameters(array $server)
     {
@@ -141,7 +137,7 @@ public function setServerParameter(string $key, string $value)
     /**
      * Gets single server parameter for specified key.
      *
-     * @return mixed A value of the parameter
+     * @return mixed
      */
     public function getServerParameter(string $key, mixed $default = '')
     {
@@ -180,7 +176,7 @@ public function jsonRequest(string $method, string $uri, array $parameters = [],
     /**
      * Returns the History instance.
      *
-     * @return History A History instance
+     * @return History
      */
     public function getHistory()
     {
@@ -190,7 +186,7 @@ public function getHistory()
     /**
      * Returns the CookieJar instance.
      *
-     * @return CookieJar A CookieJar instance
+     * @return CookieJar
      */
     public function getCookieJar()
     {
@@ -200,7 +196,7 @@ public function getCookieJar()
     /**
      * Returns the current Crawler instance.
      *
-     * @return Crawler A Crawler instance
+     * @return Crawler
      */
     public function getCrawler()
     {
@@ -214,7 +210,7 @@ public function getCrawler()
     /**
      * Returns the current BrowserKit Response instance.
      *
-     * @return Response A BrowserKit Response instance
+     * @return Response
      */
     public function getInternalResponse()
     {
@@ -231,7 +227,7 @@ public function getInternalResponse()
      * The origin response is the response instance that is returned
      * by the code that handles requests.
      *
-     * @return object A response instance
+     * @return object
      *
      * @see doRequest()
      */
@@ -247,7 +243,7 @@ public function getResponse()
     /**
      * Returns the current BrowserKit Request instance.
      *
-     * @return Request A BrowserKit Request instance
+     * @return Request
      */
     public function getInternalRequest()
     {
@@ -264,7 +260,7 @@ public function getInternalRequest()
      * The origin request is the request instance that is sent
      * to the code that handles requests.
      *
-     * @return object A Request instance
+     * @return object
      *
      * @see doRequest()
      */
@@ -433,9 +429,7 @@ public function request(string $method, string $uri, array $parameters = [], arr
     /**
      * Makes a request in another process.
      *
-     * @param object $request An origin request instance
-     *
-     * @return object An origin response instance
+     * @return object
      *
      * @throws \RuntimeException When processing returns exit code
      */
@@ -470,9 +464,7 @@ protected function doRequestInProcess(object $request)
     /**
      * Makes a request.
      *
-     * @param object $request An origin request instance
-     *
-     * @return object An origin response instance
+     * @return object
      */
     abstract protected function doRequest(object $request);
 
@@ -491,7 +483,7 @@ protected function getScript(object $request)
     /**
      * Filters the BrowserKit request to the origin one.
      *
-     * @return object An origin request instance
+     * @return object
      */
     protected function filterRequest(Request $request)
     {
@@ -501,9 +493,7 @@ protected function filterRequest(Request $request)
     /**
      * Filters the origin response to the BrowserKit one.
      *
-     * @param object $response The origin response to filter
-     *
-     * @return Response An BrowserKit Response instance
+     * @return Response
      */
     protected function filterResponse(object $response)
     {
@@ -647,8 +637,6 @@ public function restart()
     /**
      * Takes a URI and converts it to absolute if it is not already absolute.
      *
-     * @param string $uri A URI
-     *
      * @return string An absolute URI
      */
     protected function getAbsoluteUri(string $uri)

CookieJar.php

@@ -33,7 +33,7 @@ public function set(Cookie $cookie)
      * (this behavior ensures a BC behavior with previous versions of
      * Symfony).
      *
-     * @return Cookie|null A Cookie instance or null if the cookie does not exist
+     * @return Cookie|null
      */
     public function get(string $name, string $path = '/', string $domain = null)
     {

History.php

@@ -53,7 +53,7 @@ public function isEmpty()
     /**
      * Goes back in the history.
      *
-     * @return Request A Request instance
+     * @return Request
      *
      * @throws \LogicException if the stack is already on the first page
      */
@@ -69,7 +69,7 @@ public function back()
     /**
      * Goes forward in the history.
      *
-     * @return Request A Request instance
+     * @return Request
      *
      * @throws \LogicException if the stack is already on the last page
      */
@@ -85,7 +85,7 @@ public function forward()
     /**
      * Returns the current element in the history.
      *
-     * @return Request A Request instance
+     * @return Request
      *
      * @throws \LogicException if the stack is empty
      */