From 406201a7bb42dd363e9e97e3cecbd7cff13a69ac Mon Sep 17 00:00:00 2001 From: Guillaume Loulier Date: Wed, 4 May 2022 09:36:52 +0200 Subject: [PATCH] refactor(core): improvements on AbstractFiberHandler --- src/Fiber/AbstractFiberHandler.php | 9 ++++++++- tests/Task/Builder/ChainedBuilderTest.php | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Fiber/AbstractFiberHandler.php b/src/Fiber/AbstractFiberHandler.php index b26f9e7a..38caa893 100644 --- a/src/Fiber/AbstractFiberHandler.php +++ b/src/Fiber/AbstractFiberHandler.php @@ -5,9 +5,16 @@ namespace SchedulerBundle\Fiber; use Closure; +use DateTimeZone; use Fiber; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; +use SchedulerBundle\Pool\Configuration\SchedulerConfiguration; +use SchedulerBundle\Task\LazyTask; +use SchedulerBundle\Task\LazyTaskList; +use SchedulerBundle\Task\TaskInterface; +use SchedulerBundle\Task\TaskListInterface; +use SchedulerBundle\Transport\Configuration\ConfigurationInterface; use Throwable; use function sprintf; @@ -23,7 +30,7 @@ public function __construct(?LoggerInterface $logger = null) $this->logger = $logger ?? new NullLogger(); } - protected function handleOperationViaFiber(Closure $func): mixed + protected function handleOperationViaFiber(Closure $func): TaskListInterface|LazyTaskList|TaskInterface|LazyTask|SchedulerConfiguration|ConfigurationInterface|DateTimeZone|string|float|int|bool|array|null { $fiber = new Fiber(callback: function (Closure $operation): void { $value = $operation(); diff --git a/tests/Task/Builder/ChainedBuilderTest.php b/tests/Task/Builder/ChainedBuilderTest.php index b147df10..e6e9fd6f 100644 --- a/tests/Task/Builder/ChainedBuilderTest.php +++ b/tests/Task/Builder/ChainedBuilderTest.php @@ -110,6 +110,7 @@ public function testBuilderCanBuild(array $configuration): void self::assertInstanceOf(ChainedTask::class, $task); self::assertCount(3, $task->getTasks()); + self::assertIsArray($configuration['tasks']); self::assertInstanceOf(ShellTask::class, $task->getTask($configuration['tasks'][0]['name'])); self::assertSame('foo', $task->getTask($configuration['tasks'][0]['name'])->getName()); self::assertInstanceOf(NullTask::class, $task->getTask($configuration['tasks'][1]['name']));