Add union types

Author: nicolas-grekas

AbstractBrowser.php

@@ -141,11 +141,9 @@ public function setServerParameter(string $key, string $value)
     /**
      * Gets single server parameter for specified key.
      *
-     * @param mixed $default A default value when key is undefined
-     *
      * @return mixed A value of the parameter
      */
-    public function getServerParameter(string $key, $default = '')
+    public function getServerParameter(string $key, mixed $default = '')
     {
         return $this->server[$key] ?? $default;
     }
@@ -441,7 +439,7 @@ public function request(string $method, string $uri, array $parameters = [], arr
      *
      * @throws \RuntimeException When processing returns exit code
      */
-    protected function doRequestInProcess($request)
+    protected function doRequestInProcess(object $request)
     {
         $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
         putenv('SYMFONY_DEPRECATIONS_SERIALIZE='.$deprecationsFile);
@@ -476,7 +474,7 @@ protected function doRequestInProcess($request)
      *
      * @return object An origin response instance
      */
-    abstract protected function doRequest($request);
+    abstract protected function doRequest(object $request);
 
     /**
      * Returns the script to execute when the request must be insulated.
@@ -485,7 +483,7 @@ abstract protected function doRequest($request);
      *
      * @throws \LogicException When this abstract class is not implemented
      */
-    protected function getScript($request)
+    protected function getScript(object $request)
     {
         throw new \LogicException('To insulate requests, you need to override the getScript() method.');
     }
@@ -507,7 +505,7 @@ protected function filterRequest(Request $request)
      *
      * @return Response An BrowserKit Response instance
      */
-    protected function filterResponse($response)
+    protected function filterResponse(object $response)
     {
         return $response;
     }
@@ -699,7 +697,7 @@ protected function getAbsoluteUri(string $uri)
      *
      * @return Crawler
      */
-    protected function requestFromRequest(Request $request, $changeHistory = true)
+    protected function requestFromRequest(Request $request, bool $changeHistory = true)
     {
         return $this->request($request->getMethod(), $request->getUri(), $request->getParameters(), $request->getFiles(), $request->getServer(), $request->getContent(), $changeHistory);
     }

HttpBrowser.php

@@ -42,7 +42,7 @@ public function __construct(HttpClientInterface $client = null, History $history
     /**
      * @param Request $request
      */
-    protected function doRequest($request): Response
+    protected function doRequest(object $request): Response
     {
         $headers = $this->getHeaders($request);
         [$body, $extraHeaders] = $this->getBodyAndExtraHeaders($request, $headers);

Tests/TestClient.php

@@ -24,12 +24,12 @@ public function setNextResponse(Response $response)
         $this->nextResponse = $response;
     }
 
-    public function setNextScript($script)
+    public function setNextScript(string $script)
     {
         $this->nextScript = $script;
     }
 
-    protected function doRequest($request): Response
+    protected function doRequest(object $request): Response
     {
         if (null === $this->nextResponse) {
             return new Response();
@@ -41,7 +41,7 @@ protected function doRequest($request): Response
         return $response;
     }
 
-    protected function getScript($request)
+    protected function getScript(object $request)
     {
         $r = new \ReflectionClass(Response::class);
         $path = $r->getFileName();

Tests/TestHttpClient.php

@@ -47,12 +47,12 @@ public function setNextResponse(Response $response)
         $this->nextResponse = $response;
     }
 
-    public function setNextScript($script)
+    public function setNextScript(string $script)
     {
         $this->nextScript = $script;
     }
 
-    protected function doRequest($request): Response
+    protected function doRequest(object $request): Response
     {
         if (null === $this->nextResponse) {
             return parent::doRequest($request);
@@ -64,7 +64,7 @@ protected function doRequest($request): Response
         return $response;
     }
 
-    protected function getScript($request)
+    protected function getScript(object $request)
     {
         $r = new \ReflectionClass(Response::class);
         $path = $r->getFileName();