Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents 7da8ea2 + 7f3b175 commit 2890e3a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Exception/FileNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
class FileNotFoundException extends IOException
{
public function __construct(string $message = null, int $code = 0, \Throwable $previous = null, string $path = null)
public function __construct(?string $message = null, int $code = 0, ?\Throwable $previous = null, ?string $path = null)
{
if (null === $message) {
if (null === $path) {
Expand Down
2 changes: 1 addition & 1 deletion Exception/IOException.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class IOException extends \RuntimeException implements IOExceptionInterface
{
private ?string $path;

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

Expand Down
4 changes: 2 additions & 2 deletions Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function exists(string|iterable $files): bool
*
* @throws IOException When touch fails
*/
public function touch(string|iterable $files, int $time = null, int $atime = null): void
public function touch(string|iterable $files, ?int $time = null, ?int $atime = null): void
{
foreach ($this->toIterable($files) as $file) {
if (!($time ? self::box('touch', $file, $time, $atime) : self::box('touch', $file))) {
Expand Down Expand Up @@ -508,7 +508,7 @@ public function makePathRelative(string $endPath, string $startPath): string
*
* @throws IOException When file type is unknown
*/
public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = []): void
public function mirror(string $originDir, string $targetDir, ?\Traversable $iterator = null, array $options = []): void
{
$targetDir = rtrim($targetDir, '/\\');
$originDir = rtrim($originDir, '/\\');
Expand Down
2 changes: 1 addition & 1 deletion Path.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public static function getRoot(string $path): string
* @param string|null $extension if specified, only that extension is cut
* off (may contain leading dot)
*/
public static function getFilenameWithoutExtension(string $path, string $extension = null): string
public static function getFilenameWithoutExtension(string $path, ?string $extension = null): string
{
if ('' === $path) {
return '';
Expand Down

0 comments on commit 2890e3a

Please sign in to comment.