Improve code style

.github/workflows/rector-cs.yml

@@ -0,0 +1,27 @@
+name: Rector + PHP CS Fixer
+
+on:
+  pull_request:
+    paths:
+      - 'config/**'
+      - 'src/**'
+      - 'tests/**'
+      - '.github/workflows/rector-cs.yml'
+      - 'composer.json'
+      - 'rector.php'
+      - '.php-cs-fixer.dist.php'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rector:
+    permissions:
+      contents: write # Required to commit automated Rector and CS fixes
+    uses: yiisoft/actions/.github/workflows/rector-cs.yml@master
+    with:
+      php: '8.1'

.gitignore

@@ -33,7 +33,7 @@ phpunit.phar
 coverage.xml
 /coverage.html
 
-# Phan
-analysis.txt
+# PHP CS Fixer
+/.php-cs-fixer.cache
 
 tests/.env

.php-cs-fixer.dist.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+use Yiisoft\CodeStyle\ConfigBuilder;
+
+$finder = (new Finder())->in([
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+]);
+
+return ConfigBuilder::build()
+    ->setRiskyAllowed(true)
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
+        '@Yiisoft/Core' => true,
+        '@Yiisoft/Core:risky' => true,
+    ])
+    ->setFinder($finder);

composer.json

@@ -31,16 +31,18 @@
         "yiisoft/queue": "dev-master"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.95",
         "infection/infection": "^0.27.8||^0.29.0",
         "maglnet/composer-require-checker": "^4.4",
         "phpbench/phpbench": "^1.4",
         "phpunit/phpunit": "^9.5",
-        "rector/rector": "^2.0.15",
+        "rector/rector": "^2.5.5",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
         "symfony/console": "^6.0",
         "symfony/process": "^6.0",
         "vimeo/psalm": "^5.26.1 || ^6.10.3",
+        "yiisoft/code-style": "^1.0",
         "yiisoft/test-support": "^3.0"
     },
     "autoload": {
@@ -70,5 +72,10 @@
             "infection/extension-installer": true,
             "composer/package-versions-deprecated": true
         }
+    },
+    "scripts": {
+        "cs-fix": "php-cs-fixer fix",
+        "psalm": "psalm",
+        "rector": "rector"
     }
 }

rector.php

@@ -7,7 +7,6 @@
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 
 return RectorConfig::configure()
     ->withPaths([
@@ -22,5 +21,4 @@
         ClosureToArrowFunctionRector::class,
         ReadOnlyPropertyRector::class,
         NullToStrictStringFuncCallArgRector::class,
-        ReturnNeverTypeRector::class,
     ]);

src/Adapter.php

@@ -19,14 +19,15 @@
 use Yiisoft\Queue\Message\Serializer\MessageSerializerInterface;
 use Yiisoft\Queue\MessageStatus;
 
+use function is_string;
+
 final class Adapter implements AdapterInterface
 {
     public function __construct(
         private QueueProviderInterface $queueProvider,
         private readonly MessageSerializerInterface $serializer,
         private readonly LoopInterface $loop,
-    ) {
-    }
+    ) {}
 
     public function withChannel(BackedEnum|string $channel): self
     {
@@ -74,7 +75,7 @@
                 $exchangeSettings?->getName() ?? '',
                 $exchangeSettings ? '' : $queueProvider
                     ->getQueueSettings()
-                    ->getName()
+                    ->getName(),
             );
 
         return $message;
@@ -108,16 +109,16 @@
             function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
                 try {
                     $handlerCallback($this->serializer->unserialize($amqpMessage->getBody()));
                     $channel->basic_ack($amqpMessage->getDeliveryTag());
                 } catch (Throwable $exception) {
                     $consumerTag = $amqpMessage->getConsumerTag();
                     if ($consumerTag !== null) {
                         $channel->basic_cancel($consumerTag);
                     }
 
                     throw $exception;
                 }
-            }
+            },
         );
 
         while ($this->loop->canContinue()) {
@@ -155,7 +156,7 @@
             throw new InvalidArgumentException('Message cannot be delayed to a queue without an exchange. Exchange is mandatory.');
         }
 
         $delayMilliseconds = (int) ceil($delaySeconds * 1000);
 
         return $this->queueProvider
             ->withMessageProperties($this->getDelayMessageProperties($delayMilliseconds))
@@ -165,7 +166,7 @@
                     $this->queueProvider->getQueueSettings(),
                     $exchangeSettings,
                     $delayMilliseconds,
-                )
+                ),
             );
     }
 
@@ -174,7 +175,7 @@
      */
     private function getDelayMessageProperties(int $delayMilliseconds): array
     {
         return array_merge(
             $this->queueProvider->getMessageProperties(),
             [
                 'expiration' => (string) $delayMilliseconds,
@@ -188,7 +189,7 @@
         ExchangeSettingsInterface $exchangeSettings,
         int $delayMilliseconds,
     ): QueueSettingsInterface {
         $deliveryTime = time() + (int) ceil($delayMilliseconds / 1000);
 
         return $queueSettings
             ->withName("{$queueSettings->getName()}.dlx.$deliveryTime")
@@ -198,7 +199,7 @@
                     'x-dead-letter-exchange' => ['S', $exchangeSettings->getName()],
                     'x-expires' => ['I', $delayMilliseconds + 30000],
                     'x-message-ttl' => ['I', $delayMilliseconds],
-                ]
+                ],
             );
     }
 

src/Exception/NotImplementedException.php

@@ -6,6 +6,4 @@
 
 use RuntimeException;
 
-final class NotImplementedException extends RuntimeException
-{
-}
+final class NotImplementedException extends RuntimeException {}

src/ExistingMessagesConsumer.php

@@ -18,9 +18,8 @@ final class ExistingMessagesConsumer
 
     public function __construct(
         private readonly QueueProviderInterface $queueProvider,
-        private readonly MessageSerializerInterface $serializer
-    ) {
-    }
+        private readonly MessageSerializerInterface $serializer,
+    ) {}
 
     /**
      * @param callable(MessageInterface): bool  $callback
@@ -51,7 +50,7 @@ function (AMQPMessage $amqpMessage) use ($callback, $channel): void {
 
                         throw $exception;
                     }
-                }
+                },
             );
 
             do {

src/Middleware/DelayMiddleware.php

@@ -11,9 +11,7 @@
 
 final class DelayMiddleware implements PushMiddlewareInterface
 {
-    public function __construct(private float $delayInSeconds)
-    {
-    }
+    public function __construct(private float $delayInSeconds) {}
 
     /**
      * @param float $seconds

src/QueueProvider.php

@@ -24,13 +24,7 @@ public function __construct(
         private QueueSettingsInterface $queueSettings,
         private ?ExchangeSettingsInterface $exchangeSettings = null,
         private array $messageProperties = [],
-    ) {
-    }
-
-    public function __clone()
-    {
-        $this->channelId = null;
-    }
+    ) {}
 
     public function __destruct()
     {
@@ -39,6 +33,11 @@ public function __destruct()
         }
     }
 
+    public function __clone()
+    {
+        $this->channelId = null;
+    }
+
     /**
      * Returns an AMQPChannel instance.
      * IMPORTANT: Do NOT memorise the channel instance, as this will cause memory leaks on channel close!

src/Settings/Exchange.php

@@ -18,9 +18,8 @@ public function __construct(
         private bool $internal = false,
         private bool $nowait = false,
         private AMQPTable|array $arguments = [],
-        private ?int $ticket = null
-    ) {
-    }
+        private ?int $ticket = null,
+    ) {}
 
     public function getArguments(): AMQPTable|array
     {

src/Settings/ExchangeSettingsInterface.php

@@ -5,6 +5,8 @@
 namespace Yiisoft\Queue\Amqp\Settings;
 
 use PhpAmqpLib\Wire\AMQPTable;
+use PhpAmqpLib\Channel\AMQPChannel;
+use Yiisoft\Queue\Amqp\QueueProvider;
 
 interface ExchangeSettingsInterface
 {
@@ -27,9 +29,9 @@ public function hasNowait(): bool;
     public function isPassive(): bool;
 
     /**
-     * Positional arguments to be used with {@see \PhpAmqpLib\Channel\AMQPChannel::exchange_declare()}
+     * Positional arguments to be used with {@see AMQPChannel::exchange_declare()}
      *
-     * @see \Yiisoft\Queue\Amqp\QueueProvider::getChannel()
+     * @see QueueProvider::getChannel()
      *
      * @return (AMQPTable|array|bool|int|string|null)[]
      *

src/Settings/QosSettings.php

@@ -5,11 +5,12 @@
 namespace Yiisoft\Queue\Amqp\Settings;
 
 use InvalidArgumentException;
+use PhpAmqpLib\Channel\AMQPChannel;
 
 /**
  * Quality of Service settings for AMQP consumers.
  *
- * @see \PhpAmqpLib\Channel\AMQPChannel::basic_qos()
+ * @see AMQPChannel::basic_qos()
  */
 final class QosSettings
 {

src/Settings/Queue.php

@@ -19,8 +19,7 @@ public function __construct(
         private AMQPTable|array $arguments = [],
         private ?int $ticket = null,
         private ?QosSettings $qosSettings = null,
-    ) {
-    }
+    ) {}
 
     public function getArguments(): AMQPTable|array
     {