Skip to content

Commit

Permalink
Merge branch '5.4' into 6.3
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents d5c0949 + a32a623 commit a8d2b8f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion GenericRuntime.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function __construct(array $options = [])
$this->options = $options;
}

public function getResolver(callable $callable, \ReflectionFunction $reflector = null): ResolverInterface
public function getResolver(callable $callable, ?\ReflectionFunction $reflector = null): ResolverInterface
{
$callable = $callable(...);
$parameters = ($reflector ?? new \ReflectionFunction($callable))->getParameters();
Expand Down
2 changes: 1 addition & 1 deletion Runner/Symfony/ConsoleApplicationRunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ConsoleApplicationRunner implements RunnerInterface
private $input;
private $output;

public function __construct(Application $application, ?string $defaultEnv, InputInterface $input, OutputInterface $output = null)
public function __construct(Application $application, ?string $defaultEnv, InputInterface $input, ?OutputInterface $output = null)
{
$this->application = $application;
$this->defaultEnv = $defaultEnv;
Expand Down
2 changes: 1 addition & 1 deletion RuntimeInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interface RuntimeInterface
*
* The callable itself should return an object that represents the application to pass to the getRunner() method.
*/
public function getResolver(callable $callable, \ReflectionFunction $reflector = null): ResolverInterface;
public function getResolver(callable $callable, ?\ReflectionFunction $reflector = null): ResolverInterface;

/**
* Returns a callable that knows how to run the passed object and that returns its exit status as int.
Expand Down

0 comments on commit a8d2b8f

Please sign in to comment.