Skip to content

Commit 93a8400

Browse files
Merge branch '5.4' into 6.3
* 5.4: 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 397ef13 + 39225b1 commit 93a8400

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎DebugClassLoader.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public function loadClass(string $class): void
307307
$this->checkClass($class, $file);
308308
}
309309

310-
privatefunctioncheckClass(string$class, string$file = null): void
310+
privatefunctioncheckClass(string$class, ?string$file = null): void
311311
{
312312
$exists = null === $file || class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false);
313313

@@ -794,7 +794,7 @@ private function getOwnInterfaces(string $class, ?string $parent): array
794794
return$ownInterfaces;
795795
}
796796

797-
privatefunctionsetReturnType(string$types, string$class, string$method, string$filename, ?string$parent, \ReflectionType$returnType = null): void
797+
privatefunctionsetReturnType(string$types, string$class, string$method, string$filename, ?string$parent, ?\ReflectionType$returnType = null): void
798798
{
799799
if ('__construct' === $method) {
800800
return;

‎Error/FatalError.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FatalError extends \Error
1818
/**
1919
* @param array $error An array as returned by error_get_last()
2020
*/
21-
publicfunction__construct(string$message, int$code, array$error, int$traceOffset = null, bool$traceArgs = true, array$trace = null)
21+
publicfunction__construct(string$message, int$code, array$error, ?int$traceOffset = null, bool$traceArgs = true, ?array$trace = null)
2222
{
2323
parent::__construct($message, $code);
2424

‎ErrorHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ErrorHandler
107107
/**
108108
* Registers the error handler.
109109
*/
110-
publicstaticfunctionregister(self$handler = null, bool$replace = true): self
110+
publicstaticfunctionregister(?self$handler = null, bool$replace = true): self
111111
{
112112
if (null === self::$reservedMemory) {
113113
self::$reservedMemory = str_repeat('x', 32768);
@@ -178,7 +178,7 @@ public static function call(callable $function, mixed ...$arguments): mixed
178178
}
179179
}
180180

181-
publicfunction__construct(BufferingLogger$bootstrappingLogger = null, bool$debug = false)
181+
publicfunction__construct(?BufferingLogger$bootstrappingLogger = null, bool$debug = false)
182182
{
183183
if ($bootstrappingLogger) {
184184
$this->bootstrappingLogger = $bootstrappingLogger;
@@ -565,7 +565,7 @@ public function handleException(\Throwable $exception): void
565565
*
566566
* @internal
567567
*/
568-
publicstaticfunctionhandleFatalError(array$error = null): void
568+
publicstaticfunctionhandleFatalError(?array$error = null): void
569569
{
570570
if (null === self::$reservedMemory) {
571571
return;

‎ErrorRenderer/HtmlErrorRenderer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface
4848
* @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
4949
* @param string|callable $outputBuffer The output buffer as a string or a callable that should return it
5050
*/
51-
publicfunction__construct(bool|callable$debug = false, string$charset = null, string|FileLinkFormatter$fileLinkFormat = null, string$projectDir = null, string|callable$outputBuffer = '', LoggerInterface$logger = null)
51+
publicfunction__construct(bool|callable$debug = false, ?string$charset = null, string|FileLinkFormatter|null$fileLinkFormat = null, ?string$projectDir = null, string|callable$outputBuffer = '', ?LoggerInterface$logger = null)
5252
{
5353
$this->debug = \is_bool($debug) ? $debug : $debug(...);
5454
$this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');
@@ -228,7 +228,7 @@ private function getFileLink(string $file, int $line): string|false
228228
* @param int $line The line number
229229
* @param string $text Use this text for the link rather than the file path
230230
*/
231-
privatefunctionformatFile(string$file, int$line, string$text = null): string
231+
privatefunctionformatFile(string$file, int$line, ?string$text = null): string
232232
{
233233
$file = trim($file);
234234

‎ErrorRenderer/SerializerErrorRenderer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class SerializerErrorRenderer implements ErrorRendererInterface
3434
* formats not supported by Request::getMimeTypes() should be given as mime types
3535
* @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
3636
*/
37-
publicfunction__construct(SerializerInterface$serializer, string|callable$format, ErrorRendererInterface$fallbackErrorRenderer = null, bool|callable$debug = false)
37+
publicfunction__construct(SerializerInterface$serializer, string|callable$format, ?ErrorRendererInterface$fallbackErrorRenderer = null, bool|callable$debug = false)
3838
{
3939
$this->serializer = $serializer;
4040
$this->format = \is_string($format) ? $format : $format(...);

‎Exception/FlattenException.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ class FlattenException
4242
private ?string$asString = null;
4343
privateData$dataRepresentation;
4444

45-
publicstaticfunctioncreate(\Exception$exception, int$statusCode = null, array$headers = []): static
45+
publicstaticfunctioncreate(\Exception$exception, ?int$statusCode = null, array$headers = []): static
4646
{
4747
returnstatic::createFromThrowable($exception, $statusCode, $headers);
4848
}
4949

50-
publicstaticfunctioncreateFromThrowable(\Throwable$exception, int$statusCode = null, array$headers = []): static
50+
publicstaticfunctioncreateFromThrowable(\Throwable$exception, ?int$statusCode = null, array$headers = []): static
5151
{
5252
$e = newstatic();
5353
$e->setMessage($exception->getMessage());
@@ -85,7 +85,7 @@ public static function createFromThrowable(\Throwable $exception, int $statusCod
8585
return$e;
8686
}
8787

88-
publicstaticfunctioncreateWithDataRepresentation(\Throwable$throwable, int$statusCode = null, array$headers = [], VarCloner$cloner = null): static
88+
publicstaticfunctioncreateWithDataRepresentation(\Throwable$throwable, ?int$statusCode = null, array$headers = [], ?VarCloner$cloner = null): static
8989
{
9090
$e = static::createFromThrowable($throwable, $statusCode, $headers);
9191

0 commit comments

Comments
 (0)