Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .led/scripts/tests
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $composer = \array_filter(\explode(\PHP_EOL, $action['runs']['steps'][1]['run'])

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

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

if ($php === null && $symfony === null) {
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class DoctrineDBALInsertWriter implements ItemWriterInterface
public function __construct(
ConnectionRegistry $doctrine,
private string $table,
string $connection = null,
string|null $connection = null,
) {
$connection ??= $doctrine->getDefaultConnectionName();
/** @var Connection $connection */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(
private string $sql,
private string $column,
private mixed $start,
string $connection = null,
string|null $connection = null,
private int $batch = 500,
) {
if (!\str_contains($sql, '{after}') || !\str_contains($sql, '{limit}')) {
Expand Down
8 changes: 6 additions & 2 deletions src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ final class DoctrineDBALQueryOffsetReader implements ItemReaderInterface
private string $sql;
private int $batch;

public function __construct(ConnectionRegistry $doctrine, string $sql, string $connection = null, int $batch = 500)
{
public function __construct(
ConnectionRegistry $doctrine,
string $sql,
string|null $connection = null,
int $batch = 500,
) {
if (\mb_strpos($sql, '{limit}') === false || \mb_strpos($sql, '{offset}') === false) {
throw new InvalidArgumentException(
\sprintf('%s $sql argument must contains "{limit}" and "{offset}" for pagination.', __METHOD__),
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-dbal/src/DoctrineDBALUpsertWriter.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final class DoctrineDBALUpsertWriter implements

private Connection $connection;

public function __construct(ConnectionRegistry $doctrine, string $connection = null)
public function __construct(ConnectionRegistry $doctrine, string|null $connection = null)
{
$connection ??= $doctrine->getDefaultConnectionName();
/** @var Connection $connection */
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-dbal/src/JobExecutionRowNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function toRow(JobExecution $jobExecution): array
*
* @param array<string, mixed> $data
*/
public function fromRow(array $data, JobExecution $parent = null): JobExecution
public function fromRow(array $data, JobExecution|null $parent = null): JobExecution
{
$data['status'] = \intval($data['status']);
$data['parameters'] = $this->jsonFromString($data['parameters']);
Expand Down
2 changes: 1 addition & 1 deletion src/batch-doctrine-persistence/src/ObjectRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function ($repository) use ($criteria) {
*
* @return T|null
*/
public function findOneUsing(string $class, \Closure $closure, string $key = null): null|object
public function findOneUsing(string $class, \Closure $closure, string|null $key = null): null|object
{
$manager = $this->doctrine->getManagerForClass($class);
if ($manager === null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function findAll()
return $this->decorated->findAll();
}

public function findBy(array $criteria, null|array $orderBy = null, $limit = null, $offset = null)
public function findBy(array $criteria, array|null $orderBy = null, $limit = null, $offset = null)
{
return $this->decorated->findBy($criteria, $orderBy, $limit, $offset);
}
Expand Down
2 changes: 1 addition & 1 deletion src/batch-league-flysystem/src/Job/CopyFilesJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function __construct(
private JobParameterAccessorInterface $location,
private FilesystemReader $source,
private FilesystemWriter $destination,
private null|Closure $transformLocation = null,
private Closure|null $transformLocation = null,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/batch-league-flysystem/src/Job/MoveFilesJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function __construct(
private JobParameterAccessorInterface $location,
private FilesystemOperator $source,
private FilesystemWriter $destination,
private null|Closure $transformLocation = null,
private Closure|null $transformLocation = null,
) {
}

Expand Down
4 changes: 2 additions & 2 deletions src/batch-openspout/src/Reader/FlatFileReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ final class FlatFileReader implements
public function __construct(
private JobParameterAccessorInterface $filePath,
private CSVOptions|ODSOptions|XLSXOptions|null $options = null,
SheetFilter $sheetFilter = null,
HeaderStrategy $headerStrategy = null,
SheetFilter|null $sheetFilter = null,
HeaderStrategy|null $headerStrategy = null,
) {
$this->sheetFilter = $sheetFilter ?? SheetFilter::all();
$this->headerStrategy = $headerStrategy ?? HeaderStrategy::none();
Expand Down
4 changes: 2 additions & 2 deletions src/batch-openspout/src/Reader/HeaderStrategy.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private function __construct(
*
* @param list<string>|null $headers
*/
public static function skip(array $headers = null): self
public static function skip(array|null $headers = null): self
{
return new self(self::SKIP, $headers);
}
Expand All @@ -50,7 +50,7 @@ public static function combine(): self
*
* @param list<string>|null $headers
*/
public static function none(array $headers = null): self
public static function none(array|null $headers = null): self
{
return new self(self::NONE, $headers);
}
Expand Down
4 changes: 2 additions & 2 deletions src/batch-openspout/src/Writer/FlatFileWriter.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ final class FlatFileWriter implements
{
use JobExecutionAwareTrait;

private null|WriterInterface $writer = null;
private WriterInterface|null $writer = null;
private bool $headersAdded = false;

public function __construct(
Expand All @@ -46,7 +46,7 @@ public function __construct(
/**
* @var list<string>|null
*/
private null|array $headers = null,
private array|null $headers = null,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/batch-openspout/src/Writer/WriteToSheetItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ private function __construct(
*
* @param array<int, bool|\DateInterval|\DateTimeInterface|float|int|string> $item
*/
public static function array(string $sheet, array $item, Style $style = null): self
public static function array(string $sheet, array $item, Style|null $style = null): self
{
return new self($sheet, Row::fromValues($item, $style));
}
Expand Down
2 changes: 1 addition & 1 deletion src/batch-symfony-console/src/CommandRunner.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CommandRunner
public function __construct(
string $binDir,
private string $logDir,
PhpExecutableFinder $phpLocator = null,
PhpExecutableFinder|null $phpLocator = null,
) {
$this->consolePath = \implode(DIRECTORY_SEPARATOR, [$binDir, 'console']);
if (\class_exists(PhpExecutableFinder::class)) {
Expand Down
6 changes: 4 additions & 2 deletions src/batch-symfony-console/tests/RunJobCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,10 @@ public function verbosity(): \Generator
yield 'debug' => [OutputInterface::VERBOSITY_DEBUG];
}

private function execute(string $configuration = null, int $verbosity = OutputInterface::VERBOSITY_NORMAL): array
{
private function execute(
string|null $configuration = null,
int $verbosity = OutputInterface::VERBOSITY_NORMAL,
): array {
$options = ['verbosity' => $verbosity];
$input = ['job' => self::JOBNAME];
if ($configuration !== null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function list(Request $request): Response
/**
* View {@see JobExecution} details in a Twig template.
*/
public function view(string $job, string $id, null|string $path = null): Response
public function view(string $job, string $id, string|null $path = null): Response
{
try {
$execution = $this->jobExecutionStorage->retrieve($job, $id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class DenormalizeItemProcessor implements ItemProcessorInterface
public function __construct(
private DenormalizerInterface $denormalizer,
private string $type,
private null|string $format = null,
private string|null $format = null,
/**
* @var array<string, mixed>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ final class NormalizeItemProcessor implements ItemProcessorInterface
{
public function __construct(
private NormalizerInterface $normalizer,
private null|string $format = null,
private string|null $format = null,
/**
* @var array<string, mixed>
*/
Expand Down
14 changes: 9 additions & 5 deletions src/batch-symfony-serializer/tests/Dummy/DummyNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,29 @@ public function __construct(
) {
}

public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
public function supportsNormalization(mixed $data, string|null $format = null, array $context = []): bool
{
return $this->supports;
}

public function normalize(
mixed $object,
string $format = null,
string|null $format = null,
array $context = [],
): array|string|int|float|bool|\ArrayObject|null {
return $this->value;
}

public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
{
public function supportsDenormalization(
mixed $data,
string $type,
string|null $format = null,
array $context = [],
): bool {
return $this->supports;
}

public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
public function denormalize(mixed $data, string $type, string|null $format = null, array $context = []): mixed
{
return $this->value;
}
Expand Down
14 changes: 9 additions & 5 deletions src/batch-symfony-serializer/tests/Dummy/FailingNormalizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,29 @@ public function __construct(
) {
}

public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
public function supportsNormalization(mixed $data, string|null $format = null, array $context = []): bool
{
return true;
}

public function normalize(
mixed $object,
string $format = null,
string|null $format = null,
array $context = [],
): array|string|int|float|bool|\ArrayObject|null {
throw $this->exception;
}

public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
{
public function supportsDenormalization(
mixed $data,
string $type,
string|null $format = null,
array $context = [],
): bool {
return true;
}

public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
public function denormalize(mixed $data, string $type, string|null $format = null, array $context = []): mixed
{
throw $this->exception;
}
Expand Down
4 changes: 2 additions & 2 deletions src/batch-symfony-validator/src/SkipInvalidItemProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ public function __construct(
/**
* @var Constraint[]|null
*/
private null|array $contraints = null,
private array|null $contraints = null,
/**
* @var string[]|null
*/
private null|array $groups = null,
private array|null $groups = null,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/Exception/BadMethodCallException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
{
public function __construct(string $message = '', Throwable $previous = null)
public function __construct(string $message = '', Throwable|null $previous = null)
{
parent::__construct($message, 0, $previous);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class CannotRemoveJobExecutionException extends RuntimeException
{
public function __construct(string $jobName, string $executionId, Throwable $previous = null)
public function __construct(string $jobName, string $executionId, Throwable|null $previous = null)
{
parent::__construct(
\sprintf('Cannot remove job execution "%s" of job "%s"', $executionId, $jobName),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class CannotStoreJobExecutionException extends RuntimeException
{
public function __construct(string $jobName, string $executionId, Throwable $previous = null)
public function __construct(string $jobName, string $executionId, Throwable|null $previous = null)
{
parent::__construct(
\sprintf('Cannot store job execution "%s" of job "%s"', $executionId, $jobName),
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
public function __construct(string $message = '', Throwable $previous = null)
public function __construct(string $message = '', Throwable|null $previous = null)
{
parent::__construct($message, 0, $previous);
}
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/Exception/JobExecutionNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class JobExecutionNotFoundException extends \InvalidArgumentException implements ExceptionInterface
{
public function __construct(string $jobName, string $executionId, Throwable $previous = null)
public function __construct(string $jobName, string $executionId, Throwable|null $previous = null)
{
parent::__construct(
\sprintf('Job execution "%s" of job "%s" cannot be found', $executionId, $jobName),
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/Exception/LogicException.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class LogicException extends \LogicException implements ExceptionInterface
{
public function __construct(string $message = '', Throwable $previous = null)
public function __construct(string $message = '', Throwable|null $previous = null)
{
parent::__construct($message, 0, $previous);
}
Expand Down
4 changes: 2 additions & 2 deletions src/batch/src/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

class RuntimeException extends \RuntimeException implements ExceptionInterface
{
public function __construct(string $message = '', Throwable $previous = null)
public function __construct(string $message = '', Throwable|null $previous = null)
{
parent::__construct($message, 0, $previous);
}

public static function error(Throwable $error, string $message = null): self
public static function error(Throwable $error, string|null $message = null): self
{
return new self(\sprintf('%sAn error occurred.', $message ? \rtrim($message, '. ') . '. ' : ''), $error);
}
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/Exception/UndefinedJobException.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class UndefinedJobException extends InvalidArgumentException
{
public function __construct(string $name, Throwable $previous = null)
public function __construct(string $name, Throwable|null $previous = null)
{
parent::__construct(\sprintf('Job "%s" is undefined', $name), $previous);
}
Expand Down
Loading
Loading