From dfe5b9e961893bd9b99635b4c89c9be97ccb85be Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 30 Jun 2021 18:07:05 +0200
Subject: [PATCH] [HttpKernel][FrameworkBundle] bump browser-kit

---
 src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php   | 6 +++---
 src/Symfony/Bundle/FrameworkBundle/composer.json       | 5 ++---
 src/Symfony/Component/HttpKernel/HttpKernelBrowser.php | 6 +++---
 src/Symfony/Component/HttpKernel/composer.json         | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
index 0e41deec707d6..ee75a054e68d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -149,7 +149,7 @@ public function loginUser($user, string $firewallContext = 'main'): self
      *
      * @return Response
      */
-    protected function doRequest($request)
+    protected function doRequest(object $request)
     {
         // avoid shutting down the Kernel if no request has been performed yet
         // WebTestCase::createClient() boots the Kernel but do not handle a request
@@ -176,7 +176,7 @@ protected function doRequest($request)
      *
      * @return Response
      */
-    protected function doRequestInProcess($request)
+    protected function doRequestInProcess(object $request)
     {
         $response = parent::doRequestInProcess($request);
 
@@ -197,7 +197,7 @@ protected function doRequestInProcess($request)
      *
      * @return string
      */
-    protected function getScript($request)
+    protected function getScript(object $request)
     {
         $kernel = var_export(serialize($this->kernel), true);
         $request = var_export(serialize($request), true);
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 38f35e36cfc7c..d72d6cb29e31b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -25,7 +25,7 @@
         "symfony/event-dispatcher": "^5.1|^6.0",
         "symfony/error-handler": "^4.4.1|^5.0.1|^6.0",
         "symfony/http-foundation": "^5.3|^6.0",
-        "symfony/http-kernel": "^5.3|^6.0",
+        "symfony/http-kernel": "^5.4|^6.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php80": "^1.15",
         "symfony/filesystem": "^4.4|^5.0|^6.0",
@@ -37,7 +37,7 @@
         "doctrine/cache": "^1.0|^2.0",
         "doctrine/persistence": "^1.3|^2.0",
         "symfony/asset": "^5.3|^6.0",
-        "symfony/browser-kit": "^4.4|^5.0|^6.0",
+        "symfony/browser-kit": "^5.4|^6.0",
         "symfony/console": "^5.2|^6.0",
         "symfony/css-selector": "^4.4|^5.0|^6.0",
         "symfony/dom-crawler": "^4.4|^5.0|^6.0",
@@ -108,7 +108,6 @@
         "phpdocumentor/type-resolver": "<1.4.0",
         "phpunit/phpunit": "<5.4.3",
         "symfony/asset": "<5.3",
-        "symfony/browser-kit": "<4.4",
         "symfony/console": "<5.2.5",
         "symfony/dotenv": "<5.1",
         "symfony/dom-crawler": "<4.4",
diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
index 501581809d735..2b1e3ee6d9f2b 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
@@ -60,7 +60,7 @@ public function catchExceptions(bool $catchExceptions)
      *
      * @return Response A Response instance
      */
-    protected function doRequest($request)
+    protected function doRequest(object $request)
     {
         $response = $this->kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, $this->catchExceptions);
 
@@ -78,7 +78,7 @@ protected function doRequest($request)
      *
      * @return string
      */
-    protected function getScript($request)
+    protected function getScript(object $request)
     {
         $kernel = var_export(serialize($this->kernel), true);
         $request = var_export(serialize($request), true);
@@ -196,7 +196,7 @@ protected function filterFiles(array $files)
      *
      * @return DomResponse A DomResponse instance
      */
-    protected function filterResponse($response)
+    protected function filterResponse(object $response)
     {
         // this is needed to support StreamedResponse
         ob_start();
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 660c98fdfc619..3d13f723b6c51 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -28,7 +28,7 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "symfony/browser-kit": "^4.4|^5.0|^6.0",
+        "symfony/browser-kit": "^5.4|^6.0",
         "symfony/config": "^5.0|^6.0",
         "symfony/console": "^4.4|^5.0|^6.0",
         "symfony/css-selector": "^4.4|^5.0|^6.0",
@@ -48,7 +48,7 @@
         "psr/log-implementation": "1.0"
     },
     "conflict": {
-        "symfony/browser-kit": "<4.4",
+        "symfony/browser-kit": "<5.4",
         "symfony/cache": "<5.0",
         "symfony/config": "<5.0",
         "symfony/console": "<4.4",