Merge pull request #46 from nonanerz/dev

Removed abandoned sensio bundle
mcfedr · Dec 6, 2023 · e7aa12c · e7aa12c
2 parents 562f1a3 + 3daaacd
commit e7aa12c
Show file tree

Hide file tree

Showing 46 changed files with 2,014 additions and 2,191 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,6 @@
  "php": ">=8.0",
  "ext-json": "*",
  "symfony/framework-bundle": "^5.0|^6.0",
- "sensio/framework-extra-bundle": "^5.0|^6.0",
  "nesbot/carbon": "^1|^2",
  "ramsey/uuid": "^3.7|^4.1"
  },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Mcfedr/QueueManagerBundle/Command/BeanstalkCommand.php b/src/Mcfedr/QueueManagerBundle/Command/BeanstalkCommand.php
@@ -37,7 +37,7 @@ protected function configure(): void
 
  protected function handleInput(InputInterface $input): void
  {
- if (($queues = $input->getOption('queue'))) {
+ if ($queues = $input->getOption('queue')) {
  foreach (explode(',', $queues) as $queue) {
  $this->pheanstalk->watch($queue);
  }

diff --git a/src/Mcfedr/QueueManagerBundle/Command/DoctrineDelayRunnerCommand.php b/src/Mcfedr/QueueManagerBundle/Command/DoctrineDelayRunnerCommand.php
@@ -82,7 +82,7 @@ protected function getJobs(): ?JobBatch
  $em->getConnection()->commit();
 
  if (\count($jobs)) {
- return new JobBatch(array_map(function (DoctrineDelayJob $job) {
+ return new JobBatch(array_map(static function (DoctrineDelayJob $job) {
  return new DoctrineDelayWorkerJob($job);
  }, $jobs));
  }
@@ -152,7 +152,7 @@ protected function finishJobs(JobBatch $batch): void
 
  protected function handleInput(InputInterface $input): void
  {
- if (($batch = $input->getOption('batch-size'))) {
+ if ($batch = $input->getOption('batch-size')) {
  $this->batchSize = (int) $batch;
  }
  $this->reverse = $input->getOption('reverse');

diff --git a/src/Mcfedr/QueueManagerBundle/Command/PubSubRunnerCommand.php b/src/Mcfedr/QueueManagerBundle/Command/PubSubRunnerCommand.php
@@ -58,7 +58,7 @@ protected function finishJobs(JobBatch $batch): void
  $topic = $this->pubSub->topic($batch->getOption('topic'));
 
  $topic->publishBatch(
- array_map(function (PubSubJob $retryJob) {
+ array_map(static function (PubSubJob $retryJob) {
  $retryJob->incrementRetryCount();
 
  return ['data' => $retryJob->getMessageBody()];
@@ -69,7 +69,7 @@ protected function finishJobs(JobBatch $batch): void
  /** @var PubSubJob[] $toAcknowledge */
  $toAcknowledge = array_merge($batch->getOks(), $batch->getRetries(), $batch->getFails());
  if (\count($toAcknowledge)) {
- $toAcknowledge = array_map(function (PubSubJob $message) {
+ $toAcknowledge = array_map(static function (PubSubJob $message) {
  return $pubSubMessage = (new Message(['messageId' => $message->getId()], ['ackId' => $message->getAckId()]));
  }, $toAcknowledge);
 
@@ -89,7 +89,7 @@ protected function handleInput(InputInterface $input): void
  $this->pubSubQueues = ['default' => $this->defaultQueue];
  }
 
- if (($batch = $input->getOption('batch-size'))) {
+ if ($batch = $input->getOption('batch-size')) {
  $this->batchSize = (int) $batch;
  }
  }

diff --git a/src/Mcfedr/QueueManagerBundle/Command/RunnerCommand.php b/src/Mcfedr/QueueManagerBundle/Command/RunnerCommand.php
@@ -147,7 +147,7 @@ private function executeBatch(): void
  $this->jobs = $this->getJobs();
  if ($this->jobs) {
  $this->jobExecutor->startBatch($this->jobs);
- while (($job = $this->jobs->next())) {
+ while ($job = $this->jobs->next()) {
  $result = $this->executeJob($job);
  $this->jobs->result($result);
  }
@@ -174,7 +174,7 @@ private function executeBatchWithProcess(InputInterface $input, OutputInterface
  {
  $process = $this->getProcess($input);
 
- $process->run(function ($type, $data) use ($output): void {
+ $process->run(static function ($type, $data) use ($output): void {
  $output->write($data);
  });
  }

diff --git a/src/Mcfedr/QueueManagerBundle/Command/SqsRunnerCommand.php b/src/Mcfedr/QueueManagerBundle/Command/SqsRunnerCommand.php
@@ -86,7 +86,7 @@ protected function finishJobs(JobBatch $batch): void
  $count = 0;
  $this->sqs->deleteMessageBatch([
  'QueueUrl' => $batch->getOption('url'),
- 'Entries' => array_map(function (SqsJob $job) use (&$count) {
+ 'Entries' => array_map(static function (SqsJob $job) use (&$count) {
  ++$count;
 
  return [
@@ -103,7 +103,7 @@ protected function finishJobs(JobBatch $batch): void
  $count = 0;
  $this->sqs->changeMessageVisibilityBatch([
  'QueueUrl' => $batch->getOption('url'),
- 'Entries' => array_map(function (SqsJob $job) use (&$count) {
+ 'Entries' => array_map(static function (SqsJob $job) use (&$count) {
  ++$count;
  $job->incrementRetryCount();
 
@@ -119,9 +119,9 @@ protected function finishJobs(JobBatch $batch): void
 
  protected function handleInput(InputInterface $input): void
  {
- if (($url = $input->getOption('url'))) {
+ if ($url = $input->getOption('url')) {
  $this->urls = explode(',', $url);
- } elseif (($queue = $input->getOption('queue'))) {
+ } elseif ($queue = $input->getOption('queue')) {
  $this->urls = array_map(function ($queue) {
  return $this->queues[$queue];
  }, explode(',', $queue));
@@ -133,15 +133,15 @@ protected function handleInput(InputInterface $input): void
  $this->waitTime = 0;
  }
 
- if (($timeout = $input->getOption('timeout'))) {
+ if ($timeout = $input->getOption('timeout')) {
  $this->visibilityTimeout = (int) $timeout;
  }
 
- if (($batch = $input->getOption('batch-size'))) {
+ if ($batch = $input->getOption('batch-size')) {
  $this->batchSize = (int) $batch;
  }
 
- if (($waitTime = $input->getOption('wait-time'))) {
+ if ($waitTime = $input->getOption('wait-time')) {
  $this->waitTime = (int) $waitTime;
  }
  }
@@ -195,7 +195,7 @@ private function getJobsFromUrl($url): ?JobBatch
  $count = 0;
  $this->sqs->deleteMessageBatch([
  'QueueUrl' => $url,
- 'Entries' => array_map(function ($handle) use (&$count) {
+ 'Entries' => array_map(static function ($handle) use (&$count) {
  ++$count;
 
  return [
@@ -210,7 +210,7 @@ private function getJobsFromUrl($url): ?JobBatch
  $count = 0;
  $this->sqs->changeMessageVisibilityBatch([
  'QueueUrl' => $url,
- 'Entries' => array_map(function (SqsJob $job) use (&$count) {
+ 'Entries' => array_map(static function (SqsJob $job) use (&$count) {
  ++$count;
 
  return [

diff --git a/src/Mcfedr/QueueManagerBundle/DependencyInjection/McfedrQueueManagerExtension.php b/src/Mcfedr/QueueManagerBundle/DependencyInjection/McfedrQueueManagerExtension.php
@@ -230,7 +230,7 @@ private function createManager(ContainerBuilder $container, array $config, strin
  break;
 
  case 'doctrine_delay':
- if (!isset(($container->getParameter('kernel.bundles'))['DoctrineBundle'])) {
+ if (!isset($container->getParameter('kernel.bundles')['DoctrineBundle'])) {
  throw new \LogicException('"doctrine_delay" requires doctrine/doctrine-bundle to be installed.');
  }
 

diff --git a/src/Mcfedr/QueueManagerBundle/DependencyInjection/QueueManagerCompilerPass.php b/src/Mcfedr/QueueManagerBundle/DependencyInjection/QueueManagerCompilerPass.php
@@ -28,7 +28,7 @@ private function createMap(ContainerBuilder $container, string $callerId, int $a
  foreach ($tags as $attributes) {
  if (isset($attributes['id'])) {
  $serviceMap[$attributes['id']] = new Reference($id);
- } elseif ($method && method_exists(($class = $container->getDefinition($id)->getClass()), $method)) {
+ } elseif ($method && method_exists($class = $container->getDefinition($id)->getClass(), $method)) {
  $serviceMap[$class::$method()] = new Reference($id);
  } else {
  $serviceMap[$id] = new Reference($id);

diff --git a/src/Mcfedr/QueueManagerBundle/Entity/DoctrineDelayJob.php b/src/Mcfedr/QueueManagerBundle/Entity/DoctrineDelayJob.php
@@ -8,60 +8,36 @@
 use Doctrine\ORM\Mapping as ORM;
 use Mcfedr\QueueManagerBundle\Queue\RetryableJob;
 
-/**
- * @ORM\Entity
- * @ORM\Table(name="DoctrineDelayJob", indexes={
- * @ORM\Index(columns={"time"}),
- * @ORM\Index(columns={"processing"})
- * })
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'DoctrineDelayJob')]
+#[ORM\Index(columns: ['time'])]
+#[ORM\Index(columns: ['processing'])]
 class DoctrineDelayJob implements RetryableJob
 {
- /**
- * @ORM\Column(name="id", type="integer")
- * @ORM\Id
- * @ORM\GeneratedValue(strategy="AUTO")
- */
+ #[ORM\Column(name: 'id', type: 'integer')]
+ #[ORM\Id]
+ #[ORM\GeneratedValue(strategy: 'AUTO')]
  private ?int $id = null;
 
- /**
- * @ORM\Column(type="string", length=255)
- */
+ #[ORM\Column(type: 'string', length: 255)]
  private string $name;
 
- /**
- * @ORM\Column(type="json")
- */
+ #[ORM\Column(type: 'json')]
  private array $arguments;
 
- /**
- * @ORM\Column(type="json")
- */
+ #[ORM\Column(type: 'json')]
  private array $options;
-
- /**
- * @ORM\Column(type="string", length=255, nullable=true)
- */
+ #[ORM\Column(type: 'string', length: 255, nullable: true)]
  private ?string $manager;
 
- /**
- * @ORM\Column(name="time", type="datetime")
- */
+ #[ORM\Column(name: 'time', type: 'datetime')]
  private \DateTime $time;
-
- /**
- * @ORM\Column(type="datetime")
- */
+ #[ORM\Column(type: 'datetime')]
  private \DateTime $createdAt;
-
- /**
- * @ORM\Column(name="processing", type="boolean")
- */
+ #[ORM\Column(name: 'processing', type: 'boolean')]
  private bool $processing = false;
 
- /**
- * @ORM\Column(type="integer")
- */
+ #[ORM\Column(type: 'integer')]
  private int $retryCount;
 
  public function __construct(string $name, array $arguments, array $options, ?string $manager, \DateTime $time, int $retryCount = 0)

diff --git a/src/Mcfedr/QueueManagerBundle/Event/FinishedJobEvent.php b/src/Mcfedr/QueueManagerBundle/Event/FinishedJobEvent.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Event;
 
-class FinishedJobEvent extends JobEvent
-{
-}
+class FinishedJobEvent extends JobEvent {}
diff --git a/src/Mcfedr/QueueManagerBundle/Event/StartJobEvent.php b/src/Mcfedr/QueueManagerBundle/Event/StartJobEvent.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Event;
 
-class StartJobEvent extends JobEvent
-{
-}
+class StartJobEvent extends JobEvent {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/FailedToForkException.php b/src/Mcfedr/QueueManagerBundle/Exception/FailedToForkException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class FailedToForkException extends QueueManagerException
-{
-}
+class FailedToForkException extends QueueManagerException {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/InvalidWorkerException.php b/src/Mcfedr/QueueManagerBundle/Exception/InvalidWorkerException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class InvalidWorkerException extends QueueManagerException implements UnrecoverableJobExceptionInterface
-{
-}
+class InvalidWorkerException extends QueueManagerException implements UnrecoverableJobExceptionInterface {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/JobNotDeletableException.php b/src/Mcfedr/QueueManagerBundle/Exception/JobNotDeletableException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class JobNotDeletableException extends QueueManagerException
-{
-}
+class JobNotDeletableException extends QueueManagerException {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/NoSuchJobException.php b/src/Mcfedr/QueueManagerBundle/Exception/NoSuchJobException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class NoSuchJobException extends JobNotDeletableException
-{
-}
+class NoSuchJobException extends JobNotDeletableException {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/QueueManagerException.php b/src/Mcfedr/QueueManagerBundle/Exception/QueueManagerException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class QueueManagerException extends \Exception
-{
-}
+class QueueManagerException extends \Exception {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/UnexpectedJobDataException.php b/src/Mcfedr/QueueManagerBundle/Exception/UnexpectedJobDataException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class UnexpectedJobDataException extends QueueManagerException
-{
-}
+class UnexpectedJobDataException extends QueueManagerException {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/UnrecoverableJobException.php b/src/Mcfedr/QueueManagerBundle/Exception/UnrecoverableJobException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class UnrecoverableJobException extends QueueManagerException implements UnrecoverableJobExceptionInterface
-{
-}
+class UnrecoverableJobException extends QueueManagerException implements UnrecoverableJobExceptionInterface {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/UnrecoverableJobExceptionInterface.php b/src/Mcfedr/QueueManagerBundle/Exception/UnrecoverableJobExceptionInterface.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-interface UnrecoverableJobExceptionInterface extends \Throwable
-{
-}
+interface UnrecoverableJobExceptionInterface extends \Throwable {}
diff --git a/src/Mcfedr/QueueManagerBundle/Exception/WrongJobException.php b/src/Mcfedr/QueueManagerBundle/Exception/WrongJobException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class WrongJobException extends JobNotDeletableException
-{
-}
+class WrongJobException extends JobNotDeletableException {}
diff --git a/src/Mcfedr/QueueManagerBundle/Manager/BeanstalkQueueManager.php b/src/Mcfedr/QueueManagerBundle/Manager/BeanstalkQueueManager.php
@@ -49,7 +49,7 @@ public function put(string $name, array $arguments = [], array $options = []): J
 
  public function delete(Job $job): void
  {
- if (!($job instanceof BeanstalkJob)) {
+ if (!$job instanceof BeanstalkJob) {
  throw new WrongJobException('Beanstalk manager can only delete beanstalk jobs');
  }
 

diff --git a/src/Mcfedr/QueueManagerBundle/Queue/InternalWorker.php b/src/Mcfedr/QueueManagerBundle/Queue/InternalWorker.php
@@ -9,6 +9,4 @@
  *
  * @internal
  */
-interface InternalWorker extends Worker
-{
-}
+interface InternalWorker extends Worker {}
diff --git a/src/Mcfedr/QueueManagerBundle/Runner/JobExecutor.php b/src/Mcfedr/QueueManagerBundle/Runner/JobExecutor.php
@@ -147,7 +147,7 @@ protected function failedJob(Job $job, \Throwable $exception, bool $internal): v
  'retryable' => !$exception instanceof UnrecoverableJobExceptionInterface,
  'internal' => $internal,
  ];
- if (($p = $exception->getPrevious())) {
+ if ($p = $exception->getPrevious()) {
  $context['cause'] = $p->getMessage();
  }
  $this->logger->error('Job failed.', $context);

diff --git a/tests/Mcfedr/QueueManagerBundle/Command/PeriodicDistributionCommand.php b/tests/Mcfedr/QueueManagerBundle/Command/PeriodicDistributionCommand.php
@@ -21,7 +21,7 @@ protected function job($period)
  {
  $time = new Carbon();
 
- return function () use (&$time, $period) {
+ return static function () use (&$time, $period) {
  Carbon::setTestNow($time);
  $time = Carbon::createFromTimestamp(PeriodicWorker::nextRun($period)->getTimestamp());
 

diff --git a/tests/Mcfedr/QueueManagerBundle/Command/RandAddDistributionCommand.php b/tests/Mcfedr/QueueManagerBundle/Command/RandAddDistributionCommand.php
@@ -18,7 +18,7 @@ protected function job($period)
  {
  $currentTime = 0;
 
- return function () use (&$currentTime, $period) {
+ return static function () use (&$currentTime, $period) {
  $currentTime += random_int($period, $period * 2);
 
  return $currentTime;

diff --git a/tests/Mcfedr/QueueManagerBundle/Driver/TestRetryQueueManager.php b/tests/Mcfedr/QueueManagerBundle/Driver/TestRetryQueueManager.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Driver;
 
-class TestRetryQueueManager extends TestQueueManager
-{
-}
+class TestRetryQueueManager extends TestQueueManager {}
diff --git a/tests/Mcfedr/QueueManagerBundle/Exception/TestException.php b/tests/Mcfedr/QueueManagerBundle/Exception/TestException.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Exception;
 
-class TestException extends \Exception implements UnrecoverableJobExceptionInterface
-{
-}
+class TestException extends \Exception implements UnrecoverableJobExceptionInterface {}
diff --git a/tests/Mcfedr/QueueManagerBundle/Queue/TestJob.php b/tests/Mcfedr/QueueManagerBundle/Queue/TestJob.php
@@ -4,6 +4,4 @@
 
 namespace Mcfedr\QueueManagerBundle\Queue;
 
-class TestJob extends AbstractJob
-{
-}
+class TestJob extends AbstractJob {}