8000 minor #42875 [HttpKernel] Add types to private properties (derrabus) · symfony/symfony@9ced2b2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9ced2b2

Browse files
nicolas-grekasnicolas-grekas
committed
minor #42875 [HttpKernel] Add types to private properties (derrabus)
This PR was merged into the 6.0 branch. Discussion ---------- [HttpKernel] Add types to private properties | Q | A | ------------- | --- | Branch? | 6.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A ~~I'll do the backports later today.~~ ✅ Commits ------- cf2a0ef [HttpKernel] Add types to private properties
2 parents 88666b5 + cf2a0ef commit 9ced2b2

File tree

63 files changed

+176
-197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+176
-197
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class Bundle implements BundleInterface
2929
protected $name;
3030
protected $extension;
3131
protected $path;
32-
private $namespace;
32+
private string $namespace;
3333

3434
/**
3535
* {@inheritdoc}
@@ -92,7 +92,7 @@ public function getContainerExtension(): ?ExtensionInterface
9292
*/
9393
public function getNamespace(): string
9494
{
95-
if (null === $this->namespace) {
95+
if (!isset($this->namespace)) {
9696
$this->parseClassName();
9797
}
9898

‎src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class ChainCacheClearer implements CacheClearerInterface
2222
{
23-
private $clearers;
23+
private iterable $clearers;
2424

2525
/**
2626
* @param iterable<mixed, CacheClearerInterface> $clearers

‎src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
class Psr6CacheClearer implements CacheClearerInterface
2020
{
21-
private $pools = [];
21+
private array $pools = [];
2222

2323
/**
2424
* @param array<string, CacheItemPoolInterface> $pools

‎src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
*/
2121
class CacheWarmerAggregate implements CacheWarmerInterface
2222
{
23-
private $warmers;
24-
private $debug;
25-
private $deprecationLogsFilepath;
26-
private $optionalsEnabled = false;
27-
private $onlyOptionalsEnabled = false;
23+
private iterable $warmers;
24+
private bool $debug;
25+
private ?string $deprecationLogsFilepath;
26+
private bool $optionalsEnabled = false;
27+
private bool $onlyOptionalsEnabled = false;
2828

2929
/**
3030
* @param iterable<mixed, CacheWarmerInterface> $warmers

‎src/Symfony/Component/HttpKernel/Config/FileLocator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class FileLocator extends BaseFileLocator
2323
{
24-
private $kernel;
24+
private KernelInterface $kernel;
2525

2626
public function __construct(KernelInterface $kernel)
2727
{

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
*/
2828
final class ArgumentResolver implements ArgumentResolverInterface
2929
{
30-
private $argumentMetadataFactory;
31-
private $argumentValueResolvers;
30+
private ArgumentMetadataFactoryInterface $argumentMetadataFactory;
31+
private iterable $argumentValueResolvers;
3232

3333
/**
3434
* @param iterable<mixed, ArgumentValueResolverInterface> $argumentValueResolvers

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
final class NotTaggedControllerValueResolver implements ArgumentValueResolverInterface
2626
{
27-
private $container;
27+
private ContainerInterface $container;
2828

2929
public function __construct(ContainerInterface $container)
3030
{

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
final class ServiceValueResolver implements ArgumentValueResolverInterface
2626
{
27-
private $container;
27+
private ContainerInterface $container;
2828

2929
public function __construct(ContainerInterface $container)
3030
{

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
final class TraceableValueResolver implements ArgumentValueResolverInterface
2525
{
26-
private $inner;
27-
private $stopwatch;
26+
private ArgumentValueResolverInterface $inner;
27+
private Stopwatch $stopwatch;
2828

2929
public function __construct(ArgumentValueResolverInterface $inner, Stopwatch $stopwatch)
3030
{

‎src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
class ControllerResolver implements ControllerResolverInterface
2525
{
26-
private $logger;
26+
private ?LoggerInterface $logger;
2727

2828
public function __construct(LoggerInterface $logger = null)
2929
{

‎src/Symfony/Component/HttpKernel/Controller/ErrorController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
*/
2626
class ErrorController
2727
{
28-
private $kernel;
29-
private $controller;
30-
private $errorRenderer;
28+
private HttpKernelInterface $kernel;
29+
private string|object|array|null $controller;
30+
private ErrorRendererInterface $errorRenderer;
3131

3232
public function __construct(HttpKernelInterface $kernel, string|object|array|null $controller, ErrorRendererInterface $errorRenderer)
3333
{

‎src/Symfony/Component/HttpKernel/Controller/TraceableArgumentResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
*/
2020
class TraceableArgumentResolver implements ArgumentResolverInterface
2121
{
22-
private $resolver;
23-
private $stopwatch;
22+
private ArgumentResolverInterface $resolver;
23+
private Stopwatch $stopwatch;
2424

2525
public function __construct(ArgumentResolverInterface $resolver, Stopwatch $stopwatch)
2626
{

‎src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
*/
2020
class TraceableControllerResolver implements ControllerResolverInterface
2121
{
22-
private $resolver;
23-
private $stopwatch;
22+
private ControllerResolverInterface $resolver;
23+
private Stopwatch $stopwatch;
2424

2525
public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch)
2626
{

‎src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadata.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ class ArgumentMetadata
2020
{
2121
public const IS_INSTANCEOF = 2;
2222

23-
private $name;
24-
private $type;
25-
private $isVariadic;
26-
private $hasDefaultValue;
27-
private $defaultValue;
28-
private $isNullable;
29-
private $attributes;
23+
private string $name;
24+
private ?string $type;
25+
private bool $isVariadic;
26+
private bool $hasDefaultValue;
27+
private mixed $defaultValue;
28+
private bool $isNullable;
29+
private array $attributes;
3030

3131
/**
3232
* @param object[] $attributes

‎src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
*/
2525
class ConfigDataCollector extends DataCollector implements LateDataCollectorInterface
2626
{
27-
/**
28-
* @var KernelInterface
29-
*/
30-
private $kernel;
27+
private KernelInterface $kernel;
3128

3229
/**
3330
* Sets the Kernel associated with this Request.

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ abstract class DataCollector implements DataCollectorInterface
3333
*/
3434
protected $data = [];
3535

36-
/**
37-
* @var ClonerInterface
38-
*/
39-
private $cloner;
36+
private ClonerInterface $cloner;
4037

4138
/**
4239
* Converts the variable into a serializable Data instance.
@@ -49,7 +46,7 @@ protected function cloneVar(mixed $var): Data
4946
if ($var instanceof Data) {
5047
return $var;
5148
}
52-
if (null === $this->cloner) {
49+
if (!isset($this->cloner)) {
5350
$this->cloner = new VarCloner();
5451
$this->cloner->setMaxItems(-1);
5552
$this->cloner->addCasters($this->getCasters());

‎src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
*/
3232
class DumpDataCollector extends DataCollector implements DataDumperInterface
3333
{
34-
private $stopwatch;
35-
private $fileLinkFormat;
36-
private $dataCount = 0;
37-
private $isCollected = true;
38-
private $clonesCount = 0;
39-
private $clonesIndex = 0;
40-
private $rootRefs;
41-
private $charset;
42-
private $requestStack;
43-
private $dumper;
44-
private $sourceContextProvider;
34+
private ?Stopwatch $stopwatch;
35+
private string|FileLinkFormatter|false $fileLinkFormat;
36+
private int $dataCount = 0;
37+
private bool $isCollected = true;
38+
private int $clonesCount = 0;
39+
private int $clonesIndex = 0;
40+
private array $rootRefs;
41+
private string $charset;
42+
private ?RequestStack $requestStack;
43+
private DataDumperInterface|Connection|null $dumper;
44+
private mixed $sourceContextProvider;
4545

4646
public function __construct(Stopwatch $stopwatch = null, string|FileLinkFormatter $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, DataDumperInterface|Connection $dumper = null)
4747
{

‎src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
*/
2828
class EventDataCollector extends DataCollector implements LateDataCollectorInterface
2929
{
30-
protected $dispatcher;
31-
private $requestStack;
32-
private $currentRequest;
30+
private ?EventDispatcherInterface $dispatcher;
31+
private ?RequestStack $requestStack;
32+
private ?Request $currentRequest = null;
3333

3434
public function __construct(EventDispatcherInterface $dispatcher = null, RequestStack $requestStack = null)
3535
{

‎src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php

Lines changed: 8 additions & 8 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
*/
2525
class LoggerDataCollector extends DataCollector implements LateDataCollectorInterface
2626
{
27-
private $logger;
28-
private $containerPathPrefix;
29-
private $currentRequest;
30-
private $requestStack;
31-
private $processedLogs;
27+
private DebugLoggerInterface $logger;
28+
private ?string $containerPathPrefix;
29+
private ?Request $currentRequest = null;
30+
private ?RequestStack $requestStack;
31+
private ?array $processedLogs = null;
3232

3333
public function __construct(object $logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null)
3434
{
35-
if (null !== $logger && $logger instanceof DebugLoggerInterface) {
35+
if ($logger instanceof DebugLoggerInterface) {
3636
$this->logger = $logger;
3737
}
3838

@@ -53,7 +53,7 @@ public function collect(Request $request, Response $response, \Throwable $except
5353
*/
5454
public function reset()
5555
{
56-
if ($this->logger instanceof DebugLoggerInterface) {
56+
if (isset($this->logger)) {
5757
$this->logger->clear();
5858
}
5959
$this->data = [];
@@ -64,7 +64,7 @@ public function reset()
6464
*/
6565
public function lateCollect()
6666
{
67-
if (null !== $this->logger) {
67+
if (isset($this->logger)) {
6868
$containerDeprecationLogs = $this->getContainerDeprecationLogs();
6969
$this->data = $this->computeErrorsCount($containerDeprecationLogs);
7070
// get compiler logs later (only when they are needed) to improve performance

‎src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
*/
3232
class RequestDataCollector extends DataCollector implements EventSubscriberInterface, LateDataCollectorInterface
3333
{
34-
private $controllers;
35-
private $sessionUsages = [];
36-
private $requestStack;
34+
private \SplObjectStorage $controllers;
35+
private array $sessionUsages = [];
36+
private ?RequestStack $requestStack;
3737

3838
public function __construct(RequestStack $requestStack = null)
3939
{

‎src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*/
2525
class TimeDataCollector extends DataCollector implements LateDataCollectorInterface
2626
{
27-
private $kernel;
28-
private $stopwatch;
27+
private ?KernelInterface $kernel;
28+
private ?Stopwatch $stopwatch;
2929

3030
public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)
3131
{

‎src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class FileLinkFormatter
3434
'vscode' => 'vscode://file/%f:%l',
3535
];
3636

37-
private $fileLinkFormat;
38-
private $requestStack;
39-
private $baseDir;
40-
private $urlFormat;
37+
private array|false $fileLinkFormat;
38+
private ?RequestStack $requestStack;
39+
private ?string $baseDir;
40+
private \Closure|string|null $urlFormat;
4141

4242
/**
4343
* @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand

‎src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class AddAnnotatedClassesToCachePass implements CompilerPassInterface
2727
{
28-
private $kernel;
28+
private Kernel $kernel;
2929

3030
public function __construct(Kernel $kernel)
3131
{

‎src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
abstract class Extension extends BaseExtension
2222
{
23-
private $annotatedClasses = [];
23+
private array $annotatedClasses = [];
2424

2525
/**
2626
* Gets the annotated classes to cache.

‎src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
*/
2424
class LazyLoadingFragmentHandler extends FragmentHandler
2525
{
26-
private $container;
26+
private ContainerInterface $container;
2727

2828
/**
2929
* @var array<string, bool>
3030
*/
31-
private $initialized = [];
31+
private array $initialized = [];
3232

3333
public function __construct(ContainerInterface $container, RequestStack $requestStack, bool $debug = false)
3434
{

‎src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class MergeExtensionConfigurationPass extends BaseMergeExtensionConfigurationPass
2323
{
24-
private $extensions;
24+
private array $extensions;
2525

2626
/**
2727
* @param string[] $extensions

‎src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
class ServicesResetter implements ResetInterface
2525
{
26-
private $resettableServices;
27-
private $resetMethods;
26+
private \Traversable $resettableServices;
27+
private array $resetMethods;
2828

2929
/**
3030
* @param \Traversable<string, object> $resettableServices

‎src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
final class ControllerArgumentsEvent extends KernelEvent
3030
{
3131
private $controller;
32-
private $arguments;
32+
private array $arguments;
3333

3434
public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, ?int $requestType)
3535
{

‎src/Symfony/Component/HttpKernel/Event/ControllerEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
final class ControllerEvent extends KernelEvent
2929
{
30-
private $controller;
30+
private string|array|object $controller;
3131

3232
public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, ?int $requestType)
3333
{

0 commit comments

Comments
 (0)
0