diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e5323..8396c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +2.0.2 +===== + +* (bug) Add missing dependency. +* (improvement) Bump required Doctrine version. + + 2.0.1 ===== diff --git a/composer.json b/composer.json index 871fd2c..6991b24 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "php": ">= 8.3", "21torr/bundle-helpers": "^2.1", "21torr/cli": "^1.2.3", - "doctrine/orm": "^2.19", + "doctrine/doctrine-bundle": "^2.13", + "doctrine/orm": "^2.19 || ^3.0", "dragonmantank/cron-expression": "^3.3", "symfony/clock": "^7.1", "symfony/config": "^7.0", diff --git a/src/Command/DebugCommand.php b/src/Command/DebugCommand.php index 430a69f..f60c0c1 100644 --- a/src/Command/DebugCommand.php +++ b/src/Command/DebugCommand.php @@ -72,7 +72,7 @@ private function listTasks (TorrStyle $io) : void $first = false; } - $row[] = sprintf( + $row[] = \sprintf( "%s", $metaData->getKey(), ); diff --git a/src/Command/QueueTasksCommand.php b/src/Command/QueueTasksCommand.php index 282feab..8fd2251 100644 --- a/src/Command/QueueTasksCommand.php +++ b/src/Command/QueueTasksCommand.php @@ -62,7 +62,7 @@ protected function execute (InputInterface $input, OutputInterface $output) : in return self::FAILURE; } - $io->comment(sprintf( + $io->comment(\sprintf( "Queuing %d task%s", \count($tasksToQueue), 1 !== \count($tasksToQueue) ? "s" : "", @@ -70,7 +70,7 @@ protected function execute (InputInterface $input, OutputInterface $output) : in foreach ($tasksToQueue as $task) { - $io->writeln(sprintf( + $io->writeln(\sprintf( "• Queuing task %s", $this->formatTaskLabel($task), )); @@ -141,7 +141,7 @@ private function fetchTasksByKey (array $keys) : array foreach ($keys as $taskKey) { $result[] = $this->taskRegistry->getTaskByKey($taskKey) - ?? throw new UnknownTaskKeyException(sprintf( + ?? throw new UnknownTaskKeyException(\sprintf( "Unknown task key '%s'", $taskKey, )); @@ -159,7 +159,7 @@ private function formatTaskLabel (Task $task) : string if (null !== $metaData->group) { - return sprintf( + return \sprintf( "%s: %s (%s)", $metaData->group, $metaData->label, diff --git a/src/Command/TaskLogCommand.php b/src/Command/TaskLogCommand.php index 864b9f6..8844114 100644 --- a/src/Command/TaskLogCommand.php +++ b/src/Command/TaskLogCommand.php @@ -102,7 +102,7 @@ private function showTaskDetails (TorrStyle $io, int $taskId) : int if (null === $task) { - $io->error(sprintf("No task found with id '%d'", $taskId)); + $io->error(\sprintf("No task found with id '%d'", $taskId)); return self::FAILURE; } @@ -120,7 +120,7 @@ private function showTaskDetails (TorrStyle $io, int $taskId) : int if (null !== $task->getHandledBy()) { - $handled[] = sprintf( + $handled[] = \sprintf( "%s", $task->getHandledBy(), ); @@ -128,7 +128,7 @@ private function showTaskDetails (TorrStyle $io, int $taskId) : int if (null !== $task->getTransport()) { - $handled[] = sprintf( + $handled[] = \sprintf( "%s", $task->getTransport(), ); @@ -158,19 +158,19 @@ private function showTaskDetails (TorrStyle $io, int $taskId) : int : "failed"; } - $io->section(sprintf( + $io->section(\sprintf( "Run %d (%s)", $index, $status, )); - $io->writeln(sprintf( + $io->writeln(\sprintf( "Started: %s", $run->getTimeStarted()->format("c"), )); if ($run->isFinished()) { - $io->writeln(sprintf( + $io->writeln(\sprintf( "Duration: %s", $this->formatDuration((float) $run->getDuration()), )); @@ -212,7 +212,7 @@ private function showList (TorrStyle $io, int $limit) : void $rows[] = [ $task->getId(), - sprintf( + \sprintf( "%s", null !== $task->getTaskLabel() ? "yellow" : "gray", $task->getTaskLabel() ?? "—", diff --git a/src/Event/RegisterTasksEvent.php b/src/Event/RegisterTasksEvent.php index cad31bd..eae14c9 100644 --- a/src/Event/RegisterTasksEvent.php +++ b/src/Event/RegisterTasksEvent.php @@ -29,7 +29,7 @@ public function register (Task $task) : self if (\array_key_exists($key, $this->tasks)) { - throw new DuplicateTaskRegisteredException(sprintf( + throw new DuplicateTaskRegisteredException(\sprintf( "Duplicate task registered with key '%s'", $key, )); diff --git a/src/Log/LogCleaner.php b/src/Log/LogCleaner.php index f92c032..074e732 100644 --- a/src/Log/LogCleaner.php +++ b/src/Log/LogCleaner.php @@ -20,7 +20,7 @@ public function cleanLogEntries () : array foreach ($this->model->fetchOutdatedTasks($this->logTtlInDays) as $logEntry) { - $deleted[] = sprintf( + $deleted[] = \sprintf( "%s (%s)", $logEntry->getTaskLabel(), $logEntry->getTimeQueued()->format("c"), diff --git a/src/Log/Task/CleanOutdatedLogsTaskHandler.php b/src/Log/Task/CleanOutdatedLogsTaskHandler.php index 2811212..24e9d60 100644 --- a/src/Log/Task/CleanOutdatedLogsTaskHandler.php +++ b/src/Log/Task/CleanOutdatedLogsTaskHandler.php @@ -24,7 +24,7 @@ public function onCleanOutdatedLogs (CleanOutdatedLogsTask $task) : void $io = $run->getIo(); $io->title("Task Manager: Cleaning Outdated Log Entries"); - $io->comment(sprintf( + $io->comment(\sprintf( "Cleaning log entries older than %d days", $this->logCleaner->getMaxLogEntryAge(), )); @@ -42,7 +42,7 @@ public function onCleanOutdatedLogs (CleanOutdatedLogsTask $task) : void $io->writeln("Removed:"); $io->listing($deletedEntries); - $io->success(sprintf( + $io->success(\sprintf( "Deleted %d %s:", \count($deletedEntries), 1 !== \count($deletedEntries) diff --git a/src/Manager/TaskManager.php b/src/Manager/TaskManager.php index 66fccea..ed9ae07 100644 --- a/src/Manager/TaskManager.php +++ b/src/Manager/TaskManager.php @@ -98,7 +98,7 @@ public function fetchTasksInQueue (string $queueName) : iterable if (!$receiver instanceof ListableReceiverInterface) { - throw new InvalidMessageTransportException(sprintf( + throw new InvalidMessageTransportException(\sprintf( "Transport for queue '%s' must implement ListableReceiverInterface", $queueName, )); diff --git a/src/Model/TaskLogModel.php b/src/Model/TaskLogModel.php index 2eaf72a..7875c6c 100644 --- a/src/Model/TaskLogModel.php +++ b/src/Model/TaskLogModel.php @@ -22,9 +22,7 @@ public function __construct ( private readonly ClockInterface $clock, ) { - $repository = $this->entityManager->getRepository(TaskLog::class); - \assert($repository instanceof EntityRepository); - $this->repository = $repository; + $this->repository = $this->entityManager->getRepository(TaskLog::class); } /** diff --git a/src/Transport/TransportsHelper.php b/src/Transport/TransportsHelper.php index e4cd17e..aa3ea2b 100644 --- a/src/Transport/TransportsHelper.php +++ b/src/Transport/TransportsHelper.php @@ -71,7 +71,7 @@ public function getTransport (string $queueName) : TransportInterface catch (ServiceNotFoundException $exception) { throw new InvalidMessageTransportException( - message: sprintf( + message: \sprintf( "No transport found with queue name '%s'", $queueName, ),