Skip to content

Commit 3cb7ca9

Browse files
Merge branch '6.3' into 6.4
* 6.3: 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
2 parents 835f8d2 + d9eaf69 commit 3cb7ca9

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Command/DotenvDumpCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class DotenvDumpCommand extends Command
3232
private string $projectDir;
3333
private ?string $defaultEnv;
3434

35-
public function __construct(string $projectDir, string $defaultEnv = null)
35+
public function __construct(string $projectDir, ?string $defaultEnv = null)
3636
{
3737
$this->projectDir = $projectDir;
3838
$this->defaultEnv = $defaultEnv;

Dotenv.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function load(string $path, string ...$extraPaths): void
9898
* @throws FormatException when a file has a syntax error
9999
* @throws PathException when a file does not exist or is not readable
100100
*/
101-
public function loadEnv(string $path, string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void
101+
public function loadEnv(string $path, ?string $envKey = null, string $defaultEnv = 'dev', array $testEnvs = ['test'], bool $overrideExistingVars = false): void
102102
{
103103
$k = $envKey ?? $this->envKey;
104104

Exception/FormatException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class FormatException extends \LogicException implements ExceptionInterfac
2020
{
2121
private FormatExceptionContext $context;
2222

23-
public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null)
23+
public function __construct(string $message, FormatExceptionContext $context, int $code = 0, ?\Throwable $previous = null)
2424
{
2525
$this->context = $context;
2626

Exception/PathException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
final class PathException extends \RuntimeException implements ExceptionInterface
2020
{
21-
public function __construct(string $path, int $code = 0, \Throwable $previous = null)
21+
public function __construct(string $path, int $code = 0, ?\Throwable $previous = null)
2222
{
2323
parent::__construct(sprintf('Unable to read the "%s" environment file.', $path), $code, $previous);
2424
}

0 commit comments

Comments
 (0)