Skip to content

Commit d27610f

Browse files
Merge branch '4.4' into 5.2
* 4.4: Backport type fixes uzb translation [DependencyInjection] Fix doc blocks [DependencyInjection] Turn $defaultDeprecationTemplate into a constant [Form] better form doc types to support static analysis
2 parents a8486d0 + c59bb66 commit d27610f

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

ControllerMetadata/ArgumentMetadataFactoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
interface ArgumentMetadataFactoryInterface
2020
{
2121
/**
22-
* @param mixed $controller The controller to resolve the arguments for
22+
* @param string|object|array $controller The controller to resolve the arguments for
2323
*
2424
* @return ArgumentMetadata[]
2525
*/

DataCollector/LoggerDataCollector.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
1919

2020
/**
21-
* LogDataCollector.
22-
*
2321
* @author Fabien Potencier <fabien@symfony.com>
2422
*
2523
* @final

DataCollector/RequestDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ public function collectSessionUsage(): void
433433
/**
434434
* Parse a controller.
435435
*
436-
* @param mixed $controller The controller to parse
436+
* @param string|object|array|null $controller The controller to parse
437437
*
438438
* @return array|string An array of controller data or a simple string
439439
*/

Debug/FileLinkFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class FileLinkFormatter
3232
/**
3333
* @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
3434
*/
35-
public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
35+
public function __construct(string $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
3636
{
3737
$fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
3838
if ($fileLinkFormat && !\is_array($fileLinkFormat)) {

0 commit comments

Comments
 (0)