Merge pull request vyuldashev#525 from vyuldashev/lara10

khepin · web-flow · commit 149f9c5cad2f · 2023-02-22T10:40:03.000-08:00
Enable Laravel 10
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,10 +13,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', '8.1']
-        stability: [prefer-lowest, prefer-stable]
+        php: ['8.0', '8.1', '8.2']
+        stability: ['prefer-lowest', prefer-stable]
+        laravel: ['^9.0', '^10.0']
+        exclude:
+          - php: '8.0'
+            laravel: '^10.0'
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+    name: 'PHP ${{ matrix.php }} - Laravel: ${{matrix.laravel}} - ${{ matrix.stability }}'
 
     steps:
       - name: Checkout code
@@ -40,7 +44,7 @@ jobs:
         run: docker-compose up -d rabbitmq
 
       - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+        run: composer update --with='laravel/framework:${{matrix.laravel}}' --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Run Laravel Pint
         run: ./vendor/bin/pint --test
diff --git a/composer.json b/composer.json
@@ -11,15 +11,16 @@
   "require": {
     "php": "^8.0",
     "ext-json": "*",
-    "illuminate/queue": "^9.0",
+    "illuminate/queue": "^9.0|^10.0",
     "php-amqplib/php-amqplib": "^3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.3",
     "mockery/mockery": "^1.0",
     "laravel/horizon": "^5.0",
-    "orchestra/testbench": "^7.0",
-    "laravel/pint": "^1.2"
+    "orchestra/testbench": "^7.0|^8.0",
+    "laravel/pint": "^1.2",
+    "laravel/framework": "^9.0|^10.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Console/ExchangeDeclareCommand.php b/src/Console/ExchangeDeclareCommand.php
@@ -18,8 +18,6 @@ class ExchangeDeclareCommand extends Command
     protected $description = 'Declare exchange';
 
     /**
-     * @param  RabbitMQConnector  $connector
-     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void
diff --git a/src/Console/ExchangeDeleteCommand.php b/src/Console/ExchangeDeleteCommand.php
@@ -16,8 +16,6 @@ class ExchangeDeleteCommand extends Command
     protected $description = 'Delete exchange';
 
     /**
-     * @param  RabbitMQConnector  $connector
-     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void
diff --git a/src/Console/QueueBindCommand.php b/src/Console/QueueBindCommand.php
@@ -17,8 +17,6 @@ class QueueBindCommand extends Command
     protected $description = 'Bind queue to exchange';
 
     /**
-     * @param  RabbitMQConnector  $connector
-     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void
diff --git a/src/Console/QueueDeclareCommand.php b/src/Console/QueueDeclareCommand.php
@@ -19,8 +19,6 @@ class QueueDeclareCommand extends Command
     protected $description = 'Declare queue';
 
     /**
-     * @param  RabbitMQConnector  $connector
-     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void
diff --git a/src/Console/QueueDeleteCommand.php b/src/Console/QueueDeleteCommand.php
@@ -17,8 +17,6 @@ class QueueDeleteCommand extends Command
     protected $description = 'Delete queue';
 
     /**
-     * @param  RabbitMQConnector  $connector
-     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void
diff --git a/src/Console/QueuePurgeCommand.php b/src/Console/QueuePurgeCommand.php
@@ -19,8 +19,6 @@ class QueuePurgeCommand extends Command
     protected $description = 'Purge all messages in queue';
 
     /**
-     * @param  RabbitMQConnector  $connector
-     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void
diff --git a/src/Consumer.php b/src/Consumer.php
@@ -65,7 +65,6 @@ public function setPrefetchCount(int $value): void
      *
      * @param  string  $connectionName
      * @param  string  $queue
-     * @param  WorkerOptions  $options
      * @return int
      *
      * @throws Throwable
@@ -181,10 +180,8 @@ function (AMQPMessage $message) use ($connection, $options, $connectionName, $qu
     /**
      * Determine if the daemon should process on this iteration.
      *
-     * @param  WorkerOptions  $options
      * @param  string  $connectionName
      * @param  string  $queue
-     * @return bool
      */
     protected function daemonShouldRun(WorkerOptions $options, $connectionName, $queue): bool
     {
diff --git a/src/Horizon/Listeners/RabbitMQFailedEvent.php b/src/Horizon/Listeners/RabbitMQFailedEvent.php
@@ -19,7 +19,6 @@ class RabbitMQFailedEvent
     /**
      * Create a new listener instance.
      *
-     * @param  Dispatcher  $events
      * @return void
      */
     public function __construct(Dispatcher $events)
@@ -29,9 +28,6 @@ public function __construct(Dispatcher $events)
 
     /**
      * Handle the event.
-     *
-     * @param  LaravelJobFailed  $event
-     * @return void
      */
     public function handle(LaravelJobFailed $event): void
     {
diff --git a/src/Horizon/RabbitMQQueue.php b/src/Horizon/RabbitMQQueue.php
@@ -26,7 +26,6 @@ class RabbitMQQueue extends BaseRabbitMQQueue
      * Get the number of queue jobs that are ready to process.
      *
      * @param  string|null  $queue
-     * @return int
      *
      * @throws AMQPProtocolChannelException
      */
@@ -96,7 +95,6 @@ public function release($delay, $job, $data, $queue, $attempts = 0)
      *
      * @param  string  $queue
      * @param  RabbitMQJob  $job
-     * @return void
      *
      * @throws BindingResolutionException
      */
@@ -110,7 +108,6 @@ public function deleteReserved($queue, $job): void
      *
      * @param  string  $queue
      * @param  mixed  $event
-     * @return void
      *
      * @throws BindingResolutionException
      */
diff --git a/src/LaravelQueueRabbitMQServiceProvider.php b/src/LaravelQueueRabbitMQServiceProvider.php
@@ -12,8 +12,6 @@ class LaravelQueueRabbitMQServiceProvider extends ServiceProvider
 {
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function register(): void
     {
@@ -60,8 +58,6 @@ public function register(): void
 
     /**
      * Register the application's event listeners.
-     *
-     * @return void
      */
     public function boot(): void
     {
diff --git a/src/Queue/Connectors/RabbitMQConnector.php b/src/Queue/Connectors/RabbitMQConnector.php
@@ -31,7 +31,6 @@ public function __construct(Dispatcher $dispatcher)
     /**
      * Establish a queue connection.
      *
-     * @param  array  $config
      * @return RabbitMQQueue
      *
      * @throws Exception
@@ -64,9 +63,6 @@ public function connect(array $config): Queue
     }
 
     /**
-     * @param  array  $config
-     * @return AbstractConnection
-     *
      * @throws Exception
      */
     protected function createConnection(array $config): AbstractConnection
@@ -86,11 +82,6 @@ protected function createConnection(array $config): AbstractConnection
     /**
      * Create a queue for the worker.
      *
-     * @param  string  $worker
-     * @param  AbstractConnection  $connection
-     * @param  string  $queue
-     * @param  bool  $dispatchAfterCommit
-     * @param  array  $options
      * @return HorizonRabbitMQQueue|RabbitMQQueue|Queue
      */
     protected function createQueue(
@@ -112,9 +103,6 @@ protected function createQueue(
 
     /**
      * Recursively filter only null values.
-     *
-     * @param  array  $array
-     * @return array
      */
     private function filter(array $array): array
     {
diff --git a/src/Queue/Jobs/RabbitMQJob.php b/src/Queue/Jobs/RabbitMQJob.php
@@ -137,8 +137,6 @@ public function release($delay = 0): void
 
     /**
      * Get the underlying RabbitMQ connection.
-     *
-     * @return RabbitMQQueue
      */
     public function getRabbitMQ(): RabbitMQQueue
     {
@@ -147,8 +145,6 @@ public function getRabbitMQ(): RabbitMQQueue
 
     /**
      * Get the underlying RabbitMQ message.
-     *
-     * @return AMQPMessage
      */
     public function getRabbitMQMessage(): AMQPMessage
     {
@@ -157,8 +153,6 @@ public function getRabbitMQMessage(): AMQPMessage
 
     /**
      * Get the headers from the rabbitMQ message.
-     *
-     * @return array|null
      */
     protected function getRabbitMQMessageHeaders(): ?array
     {
diff --git a/src/Queue/RabbitMQQueue.php b/src/Queue/RabbitMQQueue.php
diff --git a/tests/Functional/TestCase.php b/tests/Functional/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ public function setPrefetchCount(int $value): void`
`65`	`65`	`*`
`66`	`66`	`* @param string $connectionName`
`67`	`67`	`* @param string $queue`
`68`		`- * @param WorkerOptions $options`
`69`	`68`	`* @return int`
`70`	`69`	`*`
`71`	`70`	`* @throws Throwable`
`@@ -181,10 +180,8 @@ function (AMQPMessage $message) use ($connection, $options, $connectionName, $qu`
`181`	`180`	`/**`
`182`	`181`	`* Determine if the daemon should process on this iteration.`
`183`	`182`	`*`
`184`		`- * @param WorkerOptions $options`
`185`	`183`	`* @param string $connectionName`
`186`	`184`	`* @param string $queue`
`187`		`- * @return bool`
`188`	`185`	`*/`
`189`	`186`	`protected function daemonShouldRun(WorkerOptions $options, $connectionName, $queue): bool`
`190`	`187`	`{`