Skip to content

Commit e0929a2

Browse files
Merge branch '5.2' into 5.3
* 5.2: Backport type fixes Fix CS Avoid triggering the autoloader in Deprecation::isLegacy() fix markdown markup 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 1e988d9 + 09cdfd2 commit e0929a2

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
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/DumpDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function getDumpsCount(): int
192192
return $this->dataCount;
193193
}
194194

195-
public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1): array
195+
public function getDumps(string $format, int $maxDepthLimit = -1, int $maxItemsPerDepth = -1): array
196196
{
197197
$data = fopen('php://memory', 'r+');
198198

DataCollector/LoggerDataCollector.php

Lines changed: 1 addition & 3 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
@@ -31,7 +29,7 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
3129
private $currentRequest;
3230
private $requestStack;
3331

34-
public function __construct($logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null)
32+
public function __construct(object $logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null)
3533
{
3634
if (null !== $logger && $logger instanceof DebugLoggerInterface) {
3735
$this->logger = $logger;

DataCollector/RequestDataCollector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,12 @@ public function getRequestHeaders()
214214
return new ParameterBag($this->data['request_headers']->getValue());
215215
}
216216

217-
public function getRequestServer($raw = false)
217+
public function getRequestServer(bool $raw = false)
218218
{
219219
return new ParameterBag($this->data['request_server']->getValue($raw));
220220
}
221221

222-
public function getRequestCookies($raw = false)
222+
public function getRequestCookies(bool $raw = false)
223223
{
224224
return new ParameterBag($this->data['request_cookies']->getValue($raw));
225225
}
@@ -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
@@ -42,7 +42,7 @@ class FileLinkFormatter
4242
/**
4343
* @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
4444
*/
45-
public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
45+
public function __construct(string $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
4646
{
4747
$fileLinkFormat = (self::FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
4848
if ($fileLinkFormat && !\is_array($fileLinkFormat)) {

Fragment/InlineFragmentRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function render($uri, Request $request, array $options = [])
105105
}
106106
}
107107

108-
protected function createSubRequest($uri, Request $request)
108+
protected function createSubRequest(string $uri, Request $request)
109109
{
110110
$cookies = $request->cookies->all();
111111
$server = $request->server->all();

0 commit comments

Comments
 (0)