Skip to content

Commit 2890e3a

Browse files
Merge branch '6.4' into 7.0
* 6.4: 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 7da8ea2 + 7f3b175 commit 2890e3a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Exception/FileNotFoundException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class FileNotFoundException extends IOException
2121
{
22-
public function __construct(string $message = null, int $code = 0, \Throwable $previous = null, string $path = null)
22+
public function __construct(?string $message = null, int $code = 0, ?\Throwable $previous = null, ?string $path = null)
2323
{
2424
if (null === $message) {
2525
if (null === $path) {

Exception/IOException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class IOException extends \RuntimeException implements IOExceptionInterface
2222
{
2323
private ?string $path;
2424

25-
public function __construct(string $message, int $code = 0, \Throwable $previous = null, string $path = null)
25+
public function __construct(string $message, int $code = 0, ?\Throwable $previous = null, ?string $path = null)
2626
{
2727
$this->path = $path;
2828

Filesystem.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function exists(string|iterable $files): bool
125125
*
126126
* @throws IOException When touch fails
127127
*/
128-
public function touch(string|iterable $files, int $time = null, int $atime = null): void
128+
public function touch(string|iterable $files, ?int $time = null, ?int $atime = null): void
129129
{
130130
foreach ($this->toIterable($files) as $file) {
131131
if (!($time ? self::box('touch', $file, $time, $atime) : self::box('touch', $file))) {
@@ -508,7 +508,7 @@ public function makePathRelative(string $endPath, string $startPath): string
508508
*
509509
* @throws IOException When file type is unknown
510510
*/
511-
public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = []): void
511+
public function mirror(string $originDir, string $targetDir, ?\Traversable $iterator = null, array $options = []): void
512512
{
513513
$targetDir = rtrim($targetDir, '/\\');
514514
$originDir = rtrim($originDir, '/\\');

Path.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public static function getRoot(string $path): string
254254
* @param string|null $extension if specified, only that extension is cut
255255
* off (may contain leading dot)
256256
*/
257-
public static function getFilenameWithoutExtension(string $path, string $extension = null): string
257+
public static function getFilenameWithoutExtension(string $path, ?string $extension = null): string
258258
{
259259
if ('' === $path) {
260260
return '';

0 commit comments

Comments
 (0)