Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit84d31fa

Browse files
committed
minor#19115 [FrameworkBundle] fix argument type docblock (xabbuh)
This PR was merged into the 3.2-dev branch.Discussion----------[FrameworkBundle] fix argument type docblock| Q | A| ------------- | ---| Branch? | master| Bug fix? | no| New feature? | no| BC breaks? | no| Deprecations? | no| Tests pass? | yes| Fixed tickets |#18502 (comment)| License | MIT| Doc PR |Commits-------c4e440c [FrameworkBundle] fix argument type docblock
2 parents92d80c9 +c4e440c commit84d31fa

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
useSymfony\Component\DependencyInjection\ContainerAwareInterface;
1515
useSymfony\Component\DependencyInjection\ContainerAwareTrait;
1616
useSymfony\Component\HttpFoundation\BinaryFileResponse;
17-
useSymfony\Component\HttpFoundation\File\File;
1817
useSymfony\Component\HttpFoundation\JsonResponse;
1918
useSymfony\Component\HttpFoundation\Response;
2019
useSymfony\Component\HttpFoundation\RedirectResponse;
@@ -129,9 +128,9 @@ protected function json($data, $status = 200, $headers = array(), $context = arr
129128
/**
130129
* Returns a BinaryFileResponse object with original or customized file name and disposition header.
131130
*
132-
* @paramFile|string $file File object or path to file to be sent as response
133-
* @param string|null $fileName File name to be sent to response or null (will use original file name)
134-
* @param string $disposition Disposition of response ("attachment" is default, other type is "inline")
131+
* @param\SplFileInfo|string $file File object or path to file to be sent as response
132+
* @param string|null$fileName File name to be sent to response or null (will use original file name)
133+
* @param string$disposition Disposition of response ("attachment" is default, other type is "inline")
135134
*
136135
* @return BinaryFileResponse
137136
*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp