Skip to content

Commit 966ce40

Browse files
committed
refactor(core): style improvements
1 parent 5b36a41 commit 966ce40

File tree

164 files changed

+802
-539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+802
-539
lines changed

.php-cs-fixer.dist.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,17 @@
3737
'no_trailing_comma_in_singleline_array' => true,
3838
'no_unused_imports' => true,
3939
'no_useless_return' => true,
40+
'ordered_imports' => true,
4041
'return_assignment' => true,
42+
'semicolon_after_instruction' => true,
4143
'short_scalar_cast' => true,
4244
'simplified_null_return' => true,
4345
'single_line_throw' => true,
46+
'static_lambda' => true,
4447
'strict_comparison' => true,
4548
'strict_param' => true,
49+
'ternary_to_null_coalescing' => true,
4650
'use_arrow_functions' => true,
4751
'void_return' => true,
52+
'yoda_style' => true,
4853
])->setFinder($finder);

src/Bridge/Doctrine/Transport/Configuration/Connection.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
namespace SchedulerBundle\Bridge\Doctrine\Transport\Configuration;
66

7+
use function array_map;
8+
use function array_walk;
9+
710
use Closure;
811
use Doctrine\DBAL\Connection as DbalConnection;
912
use Doctrine\DBAL\Exception;
@@ -18,12 +21,10 @@
1821
use SchedulerBundle\Exception\LogicException;
1922
use SchedulerBundle\Exception\RuntimeException;
2023
use SchedulerBundle\Exception\TransportException;
24+
2125
use SchedulerBundle\Transport\Configuration\ExternalConnectionInterface;
2226
use Throwable;
2327

24-
use function array_map;
25-
use function array_walk;
26-
2728
/**
2829
* @author Guillaume Loulier <[email protected]>
2930
*/

src/Bridge/Doctrine/Transport/Configuration/DoctrineConfigurationFactory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
use SchedulerBundle\Exception\InvalidArgumentException;
1212
use SchedulerBundle\Transport\Configuration\ConfigurationFactoryInterface;
1313
use SchedulerBundle\Transport\Dsn;
14-
use Symfony\Component\Serializer\SerializerInterface;
1514

1615
use function sprintf;
1716

17+
use Symfony\Component\Serializer\SerializerInterface;
18+
1819
/**
1920
* @author Guillaume Loulier <[email protected]>
2021
*/

src/Bridge/Doctrine/Transport/Connection.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44

55
namespace SchedulerBundle\Bridge\Doctrine\Transport;
66

7+
use function array_map;
8+
79
use Doctrine\DBAL\Connection as DBALConnection;
810
use Doctrine\DBAL\ParameterType;
911
use Doctrine\DBAL\Result;
1012
use Doctrine\DBAL\Schema\Schema;
1113
use Doctrine\DBAL\Types\Types;
1214
use Doctrine\ORM\Query\Expr;
1315
use Exception;
16+
17+
use const FILTER_VALIDATE_BOOLEAN;
18+
19+
use function filter_var;
20+
1421
use SchedulerBundle\Bridge\Doctrine\Connection\AbstractDoctrineConnection;
1522
use SchedulerBundle\Exception\InvalidArgumentException;
1623
use SchedulerBundle\Exception\LogicException;
@@ -20,15 +27,14 @@
2027
use SchedulerBundle\Task\TaskList;
2128
use SchedulerBundle\Task\TaskListInterface;
2229
use SchedulerBundle\Transport\Configuration\ConfigurationInterface;
30+
2331
use SchedulerBundle\Transport\ConnectionInterface;
24-
use Symfony\Component\Serializer\SerializerInterface;
25-
use Throwable;
2632

27-
use function array_map;
28-
use function filter_var;
2933
use function sprintf;
3034

31-
use const FILTER_VALIDATE_BOOLEAN;
35+
use Symfony\Component\Serializer\SerializerInterface;
36+
37+
use Throwable;
3238

3339
/**
3440
* @author Guillaume Loulier <[email protected]>
@@ -49,7 +55,7 @@ public function __construct(
4955
*/
5056
public function list(): TaskListInterface
5157
{
52-
$existingTasksCount = $this->createQueryBuilder(table: $this->configuration->get(key: 'table_name'), alias: 't')
58+
$existingTasksCount = $this->createQueryBuilder(table: (string) $this->configuration->get(key: 'table_name'), alias: 't')
5359
->select(select: (new Expr())->countDistinct(x: 't.id'))
5460
;
5561

src/Bridge/Doctrine/Transport/DoctrineTransportFactory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
use SchedulerBundle\Transport\Configuration\ConfigurationInterface;
1414
use SchedulerBundle\Transport\Dsn;
1515
use SchedulerBundle\Transport\TransportFactoryInterface;
16-
use Symfony\Component\Serializer\SerializerInterface;
1716

1817
use function sprintf;
1918

19+
use Symfony\Component\Serializer\SerializerInterface;
20+
2021
/**
2122
* @author Guillaume Loulier <[email protected]>
2223
*/

src/Bridge/Redis/Transport/Connection.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace SchedulerBundle\Bridge\Redis\Transport;
66

7+
use function array_map;
8+
79
use Redis;
810
use SchedulerBundle\Exception\InvalidArgumentException;
911
use SchedulerBundle\Exception\TransportException;
@@ -12,12 +14,12 @@
1214
use SchedulerBundle\Task\TaskListInterface;
1315
use SchedulerBundle\Transport\Configuration\ConfigurationInterface;
1416
use SchedulerBundle\Transport\ConnectionInterface;
15-
use Symfony\Component\Serializer\SerializerInterface;
16-
use Throwable;
1717

18-
use function array_map;
1918
use function sprintf;
2019

20+
use Symfony\Component\Serializer\SerializerInterface;
21+
use Throwable;
22+
2123
/**
2224
* @author Guillaume Loulier <[email protected]>
2325
*/

src/Bridge/Redis/Transport/RedisTransportFactory.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@
44

55
namespace SchedulerBundle\Bridge\Redis\Transport;
66

7+
use function class_exists;
8+
use function phpversion;
9+
710
use Redis;
811
use SchedulerBundle\Exception\LogicException;
912
use SchedulerBundle\Exception\RuntimeException;
1013
use SchedulerBundle\SchedulePolicy\SchedulePolicyOrchestratorInterface;
1114
use SchedulerBundle\Transport\Configuration\ConfigurationInterface;
1215
use SchedulerBundle\Transport\Dsn;
16+
1317
use SchedulerBundle\Transport\TransportFactoryInterface;
1418
use Symfony\Component\Serializer\SerializerInterface;
1519

16-
use function class_exists;
17-
use function phpversion;
1820
use function version_compare;
1921

2022
/**

src/Command/ConsumeTasksCommand.php

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,40 @@
44

55
namespace SchedulerBundle\Command;
66

7+
use function array_pop;
8+
79
use DateTimeImmutable;
10+
11+
use function implode;
12+
use function in_array;
13+
814
use Psr\Log\LoggerInterface;
915
use Psr\Log\NullLogger;
16+
use SchedulerBundle\Event\TaskExecutedEvent;
1017
use SchedulerBundle\Event\WorkerSleepingEvent;
18+
use SchedulerBundle\EventListener\StopWorkerOnFailureLimitSubscriber;
19+
use SchedulerBundle\EventListener\StopWorkerOnTaskLimitSubscriber;
20+
use SchedulerBundle\EventListener\StopWorkerOnTimeLimitSubscriber;
21+
use SchedulerBundle\SchedulerInterface;
22+
use SchedulerBundle\Task\Output;
1123
use SchedulerBundle\Task\ProbeTask;
1224
use SchedulerBundle\Task\TaskInterface;
1325
use SchedulerBundle\Worker\WorkerConfiguration;
26+
use SchedulerBundle\Worker\WorkerInterface;
27+
28+
use function sprintf;
29+
1430
use Symfony\Component\Console\Attribute\AsCommand;
1531
use Symfony\Component\Console\Command\Command;
1632
use Symfony\Component\Console\Helper\Helper;
1733
use Symfony\Component\Console\Input\InputInterface;
1834
use Symfony\Component\Console\Input\InputOption;
35+
1936
use Symfony\Component\Console\Output\OutputInterface;
2037
use Symfony\Component\Console\Style\SymfonyStyle;
21-
use SchedulerBundle\Event\TaskExecutedEvent;
22-
use SchedulerBundle\EventListener\StopWorkerOnFailureLimitSubscriber;
23-
use SchedulerBundle\EventListener\StopWorkerOnTaskLimitSubscriber;
24-
use SchedulerBundle\EventListener\StopWorkerOnTimeLimitSubscriber;
25-
use SchedulerBundle\SchedulerInterface;
26-
use SchedulerBundle\Task\Output;
27-
use SchedulerBundle\Worker\WorkerInterface;
2838
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
2939
use Throwable;
3040

31-
use function array_pop;
32-
use function implode;
33-
use function in_array;
34-
use function sprintf;
35-
3641
/**
3742
* @author Guillaume Loulier <[email protected]>
3843
*/
@@ -123,7 +128,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
123128
}
124129

125130
if (false === $force) {
126-
$nonPausedTasks = $dueTasks->filter(static fn (TaskInterface $task): bool => $task->getState() !== TaskInterface::PAUSED);
131+
$nonPausedTasks = $dueTasks->filter(static fn (TaskInterface $task): bool => TaskInterface::PAUSED !== $task->getState());
127132
if (0 === $nonPausedTasks->count()) {
128133
$symfonyStyle->warning([
129134
'Each tasks has already been executed for the current minute',

src/Command/DebugConfigurationCommand.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
namespace SchedulerBundle\Command;
66

77
use SchedulerBundle\Transport\Configuration\ConfigurationInterface;
8+
9+
use function sprintf;
10+
811
use Symfony\Component\Console\Attribute\AsCommand;
912
use Symfony\Component\Console\Command\Command;
1013
use Symfony\Component\Console\Helper\Table;
1114
use Symfony\Component\Console\Input\InputInterface;
1215
use Symfony\Component\Console\Output\OutputInterface;
13-
use Symfony\Component\Console\Style\SymfonyStyle;
1416

15-
use function sprintf;
17+
use Symfony\Component\Console\Style\SymfonyStyle;
1618

1719
/**
1820
* @author Guillaume Loulier <[email protected]>

src/Command/DebugMiddlewareCommand.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
namespace SchedulerBundle\Command;
66

7+
use function array_map;
8+
use function count;
9+
710
use ReflectionClass;
811
use SchedulerBundle\Middleware\OrderedMiddlewareInterface;
912
use SchedulerBundle\Middleware\PostExecutionMiddlewareInterface;
@@ -13,17 +16,17 @@
1316
use SchedulerBundle\Middleware\RequiredMiddlewareInterface;
1417
use SchedulerBundle\Middleware\SchedulerMiddlewareStackInterface;
1518
use SchedulerBundle\Middleware\WorkerMiddlewareStackInterface;
19+
20+
use function sprintf;
21+
1622
use Symfony\Component\Console\Attribute\AsCommand;
1723
use Symfony\Component\Console\Command\Command;
1824
use Symfony\Component\Console\Helper\Table;
25+
1926
use Symfony\Component\Console\Input\InputInterface;
2027
use Symfony\Component\Console\Output\OutputInterface;
2128
use Symfony\Component\Console\Style\SymfonyStyle;
2229

23-
use function array_map;
24-
use function count;
25-
use function sprintf;
26-
2730
/**
2831
* @author Guillaume Loulier <[email protected]>
2932
*/

0 commit comments

Comments
 (0)