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 6ae74d3

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.0' into 7.1
* 7.0: List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 262efc3 + 6cd40ea commit 6ae74d3
Copy full SHA for 6ae74d3

File tree

Expand file treeCollapse file tree

1,372 files changed

+2408
-2362
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

1,372 files changed

+2408
-2362
lines changed

‎.git-blame-ignore-revs

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
2+
f4118e110a46de3ffb799e7d79bf15128d1646ea
3+
9519b54417c09c49496a4a6be238e63be9a73465
4+
ae0a783425b80b78376488619bf9106e69193fa4
5+
9c1e36257c4df0929179462d6b2bdd00453ac8aa

‎.github/workflows/integration-tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/integration-tests.yml
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ jobs:
9595
- 8094:8094
9696
- 11210:11210
9797
sqs:
98-
image: asyncaws/testing-sqs
98+
image: localstack/localstack:3.0.2
9999
ports:
100-
- 9494:9494
100+
- 4566:4566
101101
zookeeper:
102102
image: wurstmeister/zookeeper:3.4.6
103103
kafka:
@@ -182,8 +182,8 @@ jobs:
182182
REDIS_SENTINEL_SERVICE: redis_sentinel
183183
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
184184
MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
185-
MESSENGER_SQS_DSN: "sqs://localhost:9494/messages?sslmode=disable&poll_timeout=0.01"
186-
MESSENGER_SQS_FIFO_QUEUE_DSN: "sqs://localhost:9494/messages.fifo?sslmode=disable&poll_timeout=0.01"
185+
MESSENGER_SQS_DSN: "sqs://localhost:4566/messages?sslmode=disable&poll_timeout=0.01"
186+
MESSENGER_SQS_FIFO_QUEUE_DSN: "sqs://localhost:4566/messages.fifo?sslmode=disable&poll_timeout=0.01"
187187
KAFKA_BROKER: 127.0.0.1:9092
188188
POSTGRES_HOST: localhost
189189

‎.php-cs-fixer.dist.php

Copy file name to clipboardExpand all lines: .php-cs-fixer.dist.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'remove_inheritdoc' => true,
3535
'allow_unused_params' => true, // for future-ready params, to be replaced with https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7377
3636
],
37+
'nullable_type_declaration_for_default_null_value' => true,
3738
'header_comment' => ['header' => $fileHeaderComment],
3839
'modernize_strpos' => true,
3940
'get_class_to_class_keyword' => true,

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"amphp/http-client": "^4.2.1",
125125
"amphp/http-tunnel": "^1.0",
126126
"async-aws/ses": "^1.0",
127-
"async-aws/sqs": "^1.0",
127+
"async-aws/sqs": "^1.0|^2.0",
128128
"async-aws/sns": "^1.0",
129129
"cache/integration-tests": "dev-master",
130130
"doctrine/collections": "^1.0|^2.0",

‎src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function isOptional(): bool
3939
return false;
4040
}
4141

42-
public function warmUp(string $cacheDir, string $buildDir = null): array
42+
public function warmUp(string $cacheDir, ?string $buildDir = null): array
4343
{
4444
$files = [];
4545
foreach ($this->registry->getManagers() as $em) {

‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, array $listeners = []
4444
$this->listeners = $listeners;
4545
}
4646

47-
public function dispatchEvent(string $eventName, EventArgs $eventArgs = null): void
47+
public function dispatchEvent(string $eventName, ?EventArgs $eventArgs = null): void
4848
{
4949
if (!$this->initializedSubscribers) {
5050
$this->initializeSubscribers();

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(
3939
$this->managers = $registry->getManagerNames();
4040
}
4141

42-
public function collect(Request $request, Response $response, \Throwable $exception = null): void
42+
public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
4343
{
4444
$this->data = [
4545
'queries' => $this->collectQueries(),

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
134134
*
135135
* Returns false when autodetection failed, an array of the completed information otherwise.
136136
*/
137-
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
137+
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, ?string $bundleDir = null): array|false
138138
{
139139
$bundleClassDir = \dirname($bundle->getFileName());
140140
$bundleDir ??= $bundleClassDir;
@@ -386,7 +386,7 @@ abstract protected function getMappingObjectDefaultName(): string;
386386
/**
387387
* Relative path from the bundle root to the directory where mapping files reside.
388388
*/
389-
abstract protected function getMappingResourceConfigDirectory(string $bundleDir = null): string;
389+
abstract protected function getMappingResourceConfigDirectory(?string $bundleDir = null): string;
390390

391391
/**
392392
* Extension used by the mapping files.

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function isIntId(): bool
7676
*
7777
* This method assumes that the object has a single-column ID.
7878
*/
79-
public function getIdValue(object $object = null): string
79+
public function getIdValue(?object $object = null): string
8080
{
8181
if (!$object) {
8282
return '';

‎src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final class UuidGenerator extends AbstractIdGenerator
2626
private UuidFactory|NameBasedUuidFactory|RandomBasedUuidFactory|TimeBasedUuidFactory $factory;
2727
private ?string $entityGetter = null;
2828

29-
public function __construct(UuidFactory $factory = null)
29+
public function __construct(?UuidFactory $factory = null)
3030
{
3131
$this->protoFactory = $this->factory = $factory ?? new UuidFactory();
3232
}
@@ -52,7 +52,7 @@ public function generateId(EntityManagerInterface $em, $entity): Uuid
5252
return $this->factory->create();
5353
}
5454

55-
public function nameBased(string $entityGetter, Uuid|string $namespace = null): static
55+
public function nameBased(string $entityGetter, Uuid|string|null $namespace = null): static
5656
{
5757
$clone = clone $this;
5858
$clone->factory = $clone->protoFactory->nameBased($namespace);
@@ -70,7 +70,7 @@ public function randomBased(): static
7070
return $clone;
7171
}
7272

73-
public function timeBased(Uuid|string $node = null): static
73+
public function timeBased(Uuid|string|null $node = null): static
7474
{
7575
$clone = clone $this;
7676
$clone->factory = $clone->protoFactory->timeBased($node);

‎src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
2828
protected ManagerRegistry $managerRegistry;
2929
protected ?string $entityManagerName;
3030

31-
public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
31+
public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null)
3232
{
3333
$this->managerRegistry = $managerRegistry;
3434
$this->entityManagerName = $entityManagerName;

‎src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
2828

2929
public function __construct(
3030
ManagerRegistry $managerRegistry,
31-
string $entityManagerName = null,
31+
?string $entityManagerName = null,
3232
private readonly ?LoggerInterface $logger = null,
3333
) {
3434
parent::__construct($managerRegistry, $entityManagerName);

‎src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,12 @@ public function testAlreadyResolved()
388388
$this->assertSame([], $resolver->resolve($request, $argument));
389389
}
390390

391-
private function createArgument(string $class = null, MapEntity $entity = null, string $name = 'arg', bool $isNullable = false): ArgumentMetadata
391+
private function createArgument(?string $class = null, ?MapEntity $entity = null, string $name = 'arg', bool $isNullable = false): ArgumentMetadata
392392
{
393393
return new ArgumentMetadata($name, $class ?? \stdClass::class, false, false, null, $isNullable, $entity ? [$entity] : []);
394394
}
395395

396-
private function createRegistry(ObjectManager $manager = null): ManagerRegistry&MockObject
396+
private function createRegistry(?ObjectManager $manager = null): ManagerRegistry&MockObject
397397
{
398398
$registry = $this->getMockBuilder(ManagerRegistry::class)->getMock();
399399

‎src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class DoctrineTestHelper
3333
/**
3434
* Returns an entity manager for testing.
3535
*/
36-
public static function createTestEntityManager(Configuration $config = null): EntityManager
36+
public static function createTestEntityManager(?Configuration $config = null): EntityManager
3737
{
3838
if (!\extension_loaded('pdo_sqlite')) {
3939
TestCase::markTestSkipped('Extension pdo_sqlite is required.');

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ public function testOverrideChoicesValuesWithCallable()
766766
'em' => 'default',
767767
'class' => self::ITEM_GROUP_CLASS,
768768
'choice_label' => 'name',
769-
'choice_value' => function (GroupableEntity $entity = null) {
769+
'choice_value' => function (?GroupableEntity $entity = null) {
770770
if (null === $entity) {
771771
return '';
772772
}

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function testTestGetPropertiesWithEmbedded()
108108
/**
109109
* @dataProvider typesProvider
110110
*/
111-
public function testExtract(string $property, array $type = null)
111+
public function testExtract(string $property, ?array $type = null)
112112
{
113113
$this->assertEquals($type, $this->createExtractor()->getTypes(DoctrineDummy::class, $property, []));
114114
}

‎src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function testFieldMappingsConfiguration()
178178
/**
179179
* @dataProvider regexpProvider
180180
*/
181-
public function testClassValidator(bool $expected, string $classValidatorRegexp = null)
181+
public function testClassValidator(bool $expected, ?string $classValidatorRegexp = null)
182182
{
183183
$doctrineLoader = new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), $classValidatorRegexp, false);
184184

‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ class UniqueEntity extends Constraint
4747
*/
4848
public function __construct(
4949
array|string $fields,
50-
string $message = null,
51-
string $service = null,
52-
string $em = null,
53-
string $entityClass = null,
54-
string $repositoryMethod = null,
55-
string $errorPath = null,
56-
bool|string|array $ignoreNull = null,
57-
array $groups = null,
50+
?string $message = null,
51+
?string $service = null,
52+
?string $em = null,
53+
?string $entityClass = null,
54+
?string $repositoryMethod = null,
55+
?string $errorPath = null,
56+
bool|string|array|null $ignoreNull = null,
57+
?array $groups = null,
5858
$payload = null,
5959
array $options = [],
6060
) {

‎src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private function replacePlaceHolder(LogRecord $record): LogRecord
176176
return $record->with(message: strtr($message, $replacements));
177177
}
178178

179-
private function dumpData(mixed $data, bool $colors = null): string
179+
private function dumpData(mixed $data, ?bool $colors = null): string
180180
{
181181
if (!isset($this->dumper)) {
182182
return '';

‎src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class VarDumperFormatter implements FormatterInterface
2222
{
2323
private VarCloner $cloner;
2424

25-
public function __construct(VarCloner $cloner = null)
25+
public function __construct(?VarCloner $cloner = null)
2626
{
2727
$this->cloner = $cloner ?? new VarCloner();
2828
}

‎src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ final class ConsoleHandler extends AbstractProcessingHandler implements EventSub
6161
* @param array $verbosityLevelMap Array that maps the OutputInterface verbosity to a minimum logging
6262
* level (leave empty to use the default mapping)
6363
*/
64-
public function __construct(OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormatterOptions = [])
64+
public function __construct(?OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormatterOptions = [])
6565
{
6666
parent::__construct(Level::Debug, $bubble);
6767
$this->output = $output;

‎src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ final class ElasticsearchLogstashHandler extends AbstractHandler
5656
*/
5757
private \SplObjectStorage $responses;
5858

59-
public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', HttpClientInterface $client = null, string|int|Level $level = Level::Debug, bool $bubble = true, string $elasticsearchVersion = '1.0.0')
59+
public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', ?HttpClientInterface $client = null, string|int|Level $level = Level::Debug, bool $bubble = true, string $elasticsearchVersion = '1.0.0')
6060
{
6161
if (!interface_exists(HttpClientInterface::class)) {
6262
throw new \LogicException(sprintf('The "%s" handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__));

‎src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DebugProcessor implements DebugLoggerInterface, ResetInterface
2424
private array $errorCount = [];
2525
private ?RequestStack $requestStack;
2626

27-
public function __construct(RequestStack $requestStack = null)
27+
public function __construct(?RequestStack $requestStack = null)
2828
{
2929
$this->requestStack = $requestStack;
3030
}
@@ -54,7 +54,7 @@ public function __invoke(LogRecord $record): LogRecord
5454
return $record;
5555
}
5656

57-
public function getLogs(Request $request = null): array
57+
public function getLogs(?Request $request = null): array
5858
{
5959
if (null !== $request) {
6060
return $this->records[spl_object_id($request)] ?? [];
@@ -67,7 +67,7 @@ public function getLogs(Request $request = null): array
6767
return array_merge(...array_values($this->records));
6868
}
6969

70-
public function countErrors(Request $request = null): int
70+
public function countErrors(?Request $request = null): int
7171
{
7272
if (null !== $request) {
7373
return $this->errorCount[spl_object_id($request)] ?? 0;

‎src/Symfony/Bridge/Monolog/Processor/WebProcessor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class WebProcessor extends BaseWebProcessor implements EventSubscriberInterface
2727
{
28-
public function __construct(array $extraFields = null)
28+
public function __construct(?array $extraFields = null)
2929
{
3030
// Pass an empty array as the default null value would access $_SERVER
3131
parent::__construct([], $extraFields);

‎src/Symfony/Bridge/Monolog/Tests/Processor/ClassThatInheritDebugProcessor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Tests/Processor/ClassThatInheritDebugProcessor.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
class ClassThatInheritDebugProcessor extends DebugProcessor
1818
{
19-
public function getLogs(Request $request = null): array
19+
public function getLogs(?Request $request = null): array
2020
{
2121
return parent::getLogs($request);
2222
}
2323

24-
public function countErrors(Request $request = null): int
24+
public function countErrors(?Request $request = null): int
2525
{
2626
return parent::countErrors($request);
2727
}

‎src/Symfony/Bridge/PhpUnit/CoverageListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/CoverageListener.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class CoverageListener implements TestListener
2626
private $sutFqcnResolver;
2727
private $warningOnSutNotFound;
2828

29-
public function __construct(callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)
29+
public function __construct(?callable $sutFqcnResolver = null, bool $warningOnSutNotFound = false)
3030
{
3131
$this->sutFqcnResolver = $sutFqcnResolver ?? static function (Test $test): ?string {
3232
$class = \get_class($test);

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class Configuration
7070
* @param string $baselineFile The path to the baseline file
7171
* @param string|null $logFile The path to the log file
7272
*/
73-
private function __construct(array $thresholds = [], string $regex = '', array $verboseOutput = [], string $ignoreFile = '', bool $generateBaseline = false, string $baselineFile = '', string $logFile = null)
73+
private function __construct(array $thresholds = [], string $regex = '', array $verboseOutput = [], string $ignoreFile = '', bool $generateBaseline = false, string $baselineFile = '', ?string $logFile = null)
7474
{
7575
$groups = ['total', 'indirect', 'direct', 'self'];
7676

‎src/Symfony/Bridge/PsrHttpMessage/EventListener/PsrResponseListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PsrHttpMessage/EventListener/PsrResponseListener.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class PsrResponseListener implements EventSubscriberInterface
2828
{
2929
private readonly HttpFoundationFactoryInterface $httpFoundationFactory;
3030

31-
public function __construct(HttpFoundationFactoryInterface $httpFoundationFactory = null)
31+
public function __construct(?HttpFoundationFactoryInterface $httpFoundationFactory = null)
3232
{
3333
$this->httpFoundationFactory = $httpFoundationFactory ?? new HttpFoundationFactory();
3434
}

‎src/Symfony/Bridge/PsrHttpMessage/Factory/PsrHttpFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PsrHttpMessage/Factory/PsrHttpFactory.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class PsrHttpFactory implements HttpMessageFactoryInterface
4141
private readonly ResponseFactoryInterface $responseFactory;
4242

4343
public function __construct(
44-
ServerRequestFactoryInterface $serverRequestFactory = null,
45-
StreamFactoryInterface $streamFactory = null,
46-
UploadedFileFactoryInterface $uploadedFileFactory = null,
47-
ResponseFactoryInterface $responseFactory = null,
44+
?ServerRequestFactoryInterface $serverRequestFactory = null,
45+
?StreamFactoryInterface $streamFactory = null,
46+
?UploadedFileFactoryInterface $uploadedFileFactory = null,
47+
?ResponseFactoryInterface $responseFactory = null,
4848
) {
4949
if (null === $serverRequestFactory || null === $streamFactory || null === $uploadedFileFactory || null === $responseFactory) {
5050
$psr17Factory = match (true) {

‎src/Symfony/Bridge/PsrHttpMessage/Factory/UploadedFile.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PsrHttpMessage/Factory/UploadedFile.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(
4848
);
4949
}
5050

51-
public function move(string $directory, string $name = null): File
51+
public function move(string $directory, ?string $name = null): File
5252
{
5353
if (!$this->isValid() || $this->test) {
5454
return parent::move($directory, $name);

‎src/Symfony/Bridge/Twig/AppVariable.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/AppVariable.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function getEnabled_locales(): array
165165
* * getFlashes('notice') returns a simple array with flash messages of that type
166166
* * getFlashes(['notice', 'error']) returns a nested array of type => messages.
167167
*/
168-
public function getFlashes(string|array $types = null): array
168+
public function getFlashes(string|array|null $types = null): array
169169
{
170170
try {
171171
$session = $this->getSession();

‎src/Symfony/Bridge/Twig/Command/DebugCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Command/DebugCommand.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class DebugCommand extends Command
4848

4949
private ?FileLinkFormatter $fileLinkFormatter;
5050

51-
public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = [], string $twigDefaultPath = null, FileLinkFormatter $fileLinkFormatter = null)
51+
public function __construct(Environment $twig, ?string $projectDir = null, array $bundlesMetadata = [], ?string $twigDefaultPath = null, ?FileLinkFormatter $fileLinkFormatter = null)
5252
{
5353
parent::__construct();
5454

@@ -214,7 +214,7 @@ private function displayPathsJson(SymfonyStyle $io, string $name): void
214214
$io->writeln(json_encode($data));
215215
}
216216

217-
private function displayGeneralText(SymfonyStyle $io, string $filter = null): void
217+
private function displayGeneralText(SymfonyStyle $io, ?string $filter = null): void
218218
{
219219
$decorated = $io->isDecorated();
220220
$types = ['functions', 'filters', 'tests', 'globals'];
@@ -276,7 +276,7 @@ private function displayGeneralJson(SymfonyStyle $io, ?string $filter): void
276276
$io->writeln($decorated ? OutputFormatter::escape($data) : $data);
277277
}
278278

279-
private function getLoaderPaths(string $name = null): array
279+
private function getLoaderPaths(?string $name = null): array
280280
{
281281
$loaderPaths = [];
282282
foreach ($this->getFilesystemLoaders() as $loader) {

0 commit comments

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