Skip to content

Commit eae4e09

Browse files
authored
Make sure nullable arguments are strongly typed with null type (#163)
1 parent a39460b commit eae4e09

36 files changed

+76
-62
lines changed

.led/scripts/tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $composer = \array_filter(\explode(\PHP_EOL, $action['runs']['steps'][1]['run'])
1414

1515
$io = new SymfonyStyle(new ArrayInput([]), new ConsoleOutput());
1616

17-
$execute = function (array $job, string $php = null, string $symfony = null) use ($io, $composer) {
17+
$execute = function (array $job, string|null $php = null, string|null $symfony = null) use ($io, $composer) {
1818
$io->section($job['name']);
1919

2020
if ($php === null && $symfony === null) {

src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class DoctrineDBALInsertWriter implements ItemWriterInterface
2121
public function __construct(
2222
ConnectionRegistry $doctrine,
2323
private string $table,
24-
string $connection = null,
24+
string|null $connection = null,
2525
) {
2626
$connection ??= $doctrine->getDefaultConnectionName();
2727
/** @var Connection $connection */

src/batch-doctrine-dbal/src/DoctrineDBALQueryCursorReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(
3434
private string $sql,
3535
private string $column,
3636
private mixed $start,
37-
string $connection = null,
37+
string|null $connection = null,
3838
private int $batch = 500,
3939
) {
4040
if (!\str_contains($sql, '{after}') || !\str_contains($sql, '{limit}')) {

src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ final class DoctrineDBALQueryOffsetReader implements ItemReaderInterface
2121
private string $sql;
2222
private int $batch;
2323

24-
public function __construct(ConnectionRegistry $doctrine, string $sql, string $connection = null, int $batch = 500)
25-
{
24+
public function __construct(
25+
ConnectionRegistry $doctrine,
26+
string $sql,
27+
string|null $connection = null,
28+
int $batch = 500,
29+
) {
2630
if (\mb_strpos($sql, '{limit}') === false || \mb_strpos($sql, '{offset}') === false) {
2731
throw new InvalidArgumentException(
2832
\sprintf('%s $sql argument must contains "{limit}" and "{offset}" for pagination.', __METHOD__),

src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class DoctrineDBALUpsertWriter implements
2525

2626
private Connection $connection;
2727

28-
public function __construct(ConnectionRegistry $doctrine, string $connection = null)
28+
public function __construct(ConnectionRegistry $doctrine, string|null $connection = null)
2929
{
3030
$connection ??= $doctrine->getDefaultConnectionName();
3131
/** @var Connection $connection */

src/batch-doctrine-dbal/src/JobExecutionRowNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function toRow(JobExecution $jobExecution): array
5353
*
5454
* @param array<string, mixed> $data
5555
*/
56-
public function fromRow(array $data, JobExecution $parent = null): JobExecution
56+
public function fromRow(array $data, JobExecution|null $parent = null): JobExecution
5757
{
5858
$data['status'] = \intval($data['status']);
5959
$data['parameters'] = $this->jsonFromString($data['parameters']);

src/batch-doctrine-persistence/src/ObjectRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function ($repository) use ($criteria) {
5858
*
5959
* @return T|null
6060
*/
61-
public function findOneUsing(string $class, \Closure $closure, string $key = null): null|object
61+
public function findOneUsing(string $class, \Closure $closure, string|null $key = null): null|object
6262
{
6363
$manager = $this->doctrine->getManagerForClass($class);
6464
if ($manager === null) {

src/batch-doctrine-persistence/tests/Dummy/FindOneByCalledOnlyOnceWhenFoundRepositoryDecorator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function findAll()
2525
return $this->decorated->findAll();
2626
}
2727

28-
public function findBy(array $criteria, null|array $orderBy = null, $limit = null, $offset = null)
28+
public function findBy(array $criteria, array|null $orderBy = null, $limit = null, $offset = null)
2929
{
3030
return $this->decorated->findBy($criteria, $orderBy, $limit, $offset);
3131
}

src/batch-league-flysystem/src/Job/CopyFilesJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct(
2424
private JobParameterAccessorInterface $location,
2525
private FilesystemReader $source,
2626
private FilesystemWriter $destination,
27-
private null|Closure $transformLocation = null,
27+
private Closure|null $transformLocation = null,
2828
) {
2929
}
3030

src/batch-league-flysystem/src/Job/MoveFilesJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function __construct(
2525
private JobParameterAccessorInterface $location,
2626
private FilesystemOperator $source,
2727
private FilesystemWriter $destination,
28-
private null|Closure $transformLocation = null,
28+
private Closure|null $transformLocation = null,
2929
) {
3030
}
3131

0 commit comments

Comments
 (0)