Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit bf5dc51

Browse filesBrowse files
Merge branch '5.4' into 6.0
* 5.4: [HttpKernel][FrameworkBundle] bump browser-kit cs fix
2 parents 6955222 + b1e2527 commit bf5dc51
Copy full SHA for bf5dc51

File tree

3 files changed

+22
-17
lines changed
Filter options

3 files changed

+22
-17
lines changed

‎src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ public function loginUser($user, string $firewallContext = 'main'): self
145145
/**
146146
* {@inheritdoc}
147147
*
148-
* @param Request $request A Request instance
148+
* @param Request $request
149149
*
150-
* @return Response A Response instance
150+
* @return Response
151151
*/
152-
protected function doRequest($request)
152+
protected function doRequest(object $request)
153153
{
154154
// avoid shutting down the Kernel if no request has been performed yet
155155
// WebTestCase::createClient() boots the Kernel but do not handle a request
@@ -172,11 +172,11 @@ protected function doRequest($request)
172172
/**
173173
* {@inheritdoc}
174174
*
175-
* @param Request $request A Request instance
175+
* @param Request $request
176176
*
177-
* @return Response A Response instance
177+
* @return Response
178178
*/
179-
protected function doRequestInProcess($request)
179+
protected function doRequestInProcess(object $request)
180180
{
181181
$response = parent::doRequestInProcess($request);
182182

@@ -193,11 +193,11 @@ protected function doRequestInProcess($request)
193193
* Symfony Standard Edition). If this is not your case, create your own
194194
* client and override this method.
195195
*
196-
* @param Request $request A Request instance
196+
* @param Request $request
197197
*
198-
* @return string The script content
198+
* @return string
199199
*/
200-
protected function getScript($request)
200+
protected function getScript(object $request)
201201
{
202202
$kernel = var_export(serialize($this->kernel), true);
203203
$request = var_export(serialize($request), true);

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
"phpdocumentor/type-resolver": "<1.4.0",
108108
"phpunit/phpunit": "<5.4.3",
109109
"symfony/asset": "<5.4",
110-
"symfony/browser-kit": "<5.4",
111110
"symfony/console": "<5.4",
112111
"symfony/dotenv": "<5.4",
113112
"symfony/dom-crawler": "<5.4",

‎src/Symfony/Component/HttpKernel/HttpKernelBrowser.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
+13-7Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ public function catchExceptions(bool $catchExceptions)
5454
}
5555

5656
/**
57-
* Makes a request.
57+
* {@inheritdoc}
58+
*
59+
* @param Request $request
5860
*
5961
* @return Response A Response instance
6062
*/
61-
protected function doRequest(mixed $request)
63+
protected function doRequest(object $request)
6264
{
6365
$response = $this->kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, $this->catchExceptions);
6466

@@ -70,11 +72,13 @@ protected function doRequest(mixed $request)
7072
}
7173

7274
/**
73-
* Returns the script to execute when the request must be insulated.
75+
* {@inheritdoc}
76+
*
77+
* @param Request $request
7478
*
7579
* @return string
7680
*/
77-
protected function getScript(mixed $request)
81+
protected function getScript(object $request)
7882
{
7983
$kernel = var_export(serialize($this->kernel), true);
8084
$request = var_export(serialize($request), true);
@@ -124,7 +128,7 @@ protected function getHandleScript()
124128
}
125129

126130
/**
127-
* Converts the BrowserKit request to a HttpKernel request.
131+
* {@inheritdoc}
128132
*
129133
* @return Request A Request instance
130134
*/
@@ -186,11 +190,13 @@ protected function filterFiles(array $files)
186190
}
187191

188192
/**
189-
* Converts the HttpKernel response to a BrowserKit response.
193+
* {@inheritdoc}
194+
*
195+
* @param Request $request
190196
*
191197
* @return DomResponse A DomResponse instance
192198
*/
193-
protected function filterResponse(mixed $response)
199+
protected function filterResponse(object $response)
194200
{
195201
// this is needed to support StreamedResponse
196202
ob_start();

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.