Merge branch 'master' into no-support-for-multiple-queues

Author: mortenhauberg

.github/workflows/tests.yml

@@ -42,9 +42,8 @@ jobs:
       - name: Install dependencies
         run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
-      - name: Run PHP CS Fixer
-        if: ${{ matrix.php != 8.0 }}
-        run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --allow-risky=yes --dry-run --diff --verbose
+      - name: Run Laravel Pint
+        run: ./vendor/bin/pint --test
 
       - name: Execute tests
         run: sleep 10 && vendor/bin/phpunit --verbose

.php-cs-fixer.dist.php

@@ -2,7 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v12.0.0...master)
+## [Unreleased](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v12.0.1...master)
+
+## [12.0.1 (2022-04-06)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v12.0.0...v12.0.1)
+
+- Allow laravel to end workers with lost connection [#457](https://github.com/vyuldashev/laravel-queue-rabbitmq/pull/457)
 
 ## [12.0.0 (2022-02-23)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v11.4.0...v12.0.0)
 

.styleci.yml

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [Unreleased](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v13.1.0...master)
+
+## [13.1.0 (2023-01-25)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v13.0.1...v13.1.0)
+
+- Fix delay parameter not being used [#502](https://github.com/vyuldashev/laravel-queue-rabbitmq/pull/502)
+- Resolve Laravel 9 incompatabilities [#502](https://github.com/vyuldashev/laravel-queue-rabbitmq/pull/502)
+- Fix Horizon invalid delay property [#502](https://github.com/vyuldashev/laravel-queue-rabbitmq/pull/502)
+
+## [13.0.1 (2022-09-16)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v13.0.0...v13.0.1)
+
+- Add $dispatchAfterCommit when running via Horizon [#484](https://github.com/vyuldashev/laravel-queue-rabbitmq/pull/484)
+
+## [13.0.0 (2022-09-15)](https://github.com/vyuldashev/laravel-queue-rabbitmq/compare/v12.0.1...v13.0.0)
+
+- Dispatch a job after DB transaction commit [#468](https://github.com/vyuldashev/laravel-queue-rabbitmq/pull/468)

CHANGELOG-12x.md

@@ -10,11 +10,9 @@ RabbitMQ Queue driver for Laravel
 
 Only the latest version will get new features. Bug fixes will be provided using the following scheme:
 
-| Package Version | Laravel Version | Bug Fixes Until     |                                                                                             |
-|-----------------|-----------------|---------------------|---------------------------------------------------------------------------------------------|
-| 9               | 6               | October 5th, 2021   | [Documentation](https://github.com/vyuldashev/laravel-queue-rabbitmq/blob/v9.0/README.md)   |
-| 10              | 6, 7            | October 5th, 2021   | [Documentation](https://github.com/vyuldashev/laravel-queue-rabbitmq/blob/v10.0/README.md)  |
-| 11              | 8               | April 6th, 2021     | [Documentation](https://github.com/vyuldashev/laravel-queue-rabbitmq/blob/master/README.md) |
+| Package Version | Laravel Version | Bug Fixes Until  |                                                                                             |
+|-----------------|-----------------|------------------|---------------------------------------------------------------------------------------------|
+| 13              | 9               | August 8th, 2023 | [Documentation](https://github.com/vyuldashev/laravel-queue-rabbitmq/blob/master/README.md) |
 
 ## Installation
 
@@ -65,7 +63,7 @@ Add connection to `config/queue.php`:
         * Set to "horizon" if you wish to use Laravel Horizon.
         */
        'worker' => env('RABBITMQ_WORKER', 'default'),
-        
+       'after_commit' => false,
     ],
 
     // ...    
@@ -74,10 +72,11 @@ Add connection to `config/queue.php`:
 
 ### Optional Config
 
-Optionally add queue options to the config of a connection. 
-Every queue created for this connection, get's the properties.
+Optionally add queue options to the config of a connection.
+Every queue created for this connection, gets the properties.
 
 When you want to prioritize messages when they were delayed, then this is possible by adding extra options.
+
 - When max-priority is omitted, the max priority is set with 2 when used.
 
 ```php
@@ -101,13 +100,14 @@ When you want to prioritize messages when they were delayed, then this is possib
 ],
 ```
 
-When you want to publish messages against an exchange with routing-key's, then this is possible by adding extra options.
+When you want to publish messages against an exchange with routing-keys, then this is possible by adding extra options.
+
 - When the exchange is omitted, RabbitMQ will use the `amq.direct` exchange for the routing-key
 - When routing-key is omitted the routing-key by default is the `queue` name.
 - When using `%s` in the routing-key the queue_name will be substituted.
 
-> Note: when using exchange with routing-key, u probably create your queues with bindings yourself.
-  
+> Note: when using an exchange with routing-key, you probably create your queues with bindings yourself.
+
 ```php
 'connections' => [
     // ...
@@ -130,14 +130,18 @@ When you want to publish messages against an exchange with routing-key's, then t
 ],
 ```
 
-In Laravel failed jobs are stored into the database. But maybe you want to instruct some other process to also do something with the message.
-When you want to instruct RabbitMQ to reroute failed messages to a exchange or a specific queue, then this is possible by adding extra options.
+In Laravel failed jobs are stored into the database. But maybe you want to instruct some other process to also do
+something with the message.
+When you want to instruct RabbitMQ to reroute failed messages to a exchange or a specific queue, then this is possible
+by adding extra options.
+
 - When the exchange is omitted, RabbitMQ will use the `amq.direct` exchange for the routing-key
 - When routing-key is omitted, the routing-key by default the `queue` name is substituted with `'.failed'`.
 - When using `%s` in the routing-key the queue_name will be substituted.
 
-> Note: When using failed_job exchange with routing-key, u probably need to create your exchange/queue with bindings yourself.
-  
+> Note: When using failed_job exchange with routing-key, you probably need to create your exchange/queue with bindings
+> yourself.
+
 ```php
 'connections' => [
     // ...
@@ -161,12 +165,14 @@ When you want to instruct RabbitMQ to reroute failed messages to a exchange or a
 ```
 
 ### Use your own RabbitMQJob class
+
 Sometimes you have to work with messages published by another application.  
 Those messages probably won't respect Laravel's job payload schema.
-The problem with these messages is that, Laravel workers won't be able to determine the actual job or class to execute. 
+The problem with these messages is that, Laravel workers won't be able to determine the actual job or class to execute.
 
 You can extend the build-in `RabbitMQJob::class` and within the queue connection config, you can define your own class.
-When you specify an `job` key in the config, with your own class name, every message retrieved from the broker will get wrapped by your own class.  
+When you specify a `job` key in the config, with your own class name, every message retrieved from the broker will get
+wrapped by your own class.
 
 An example for the config:
 
@@ -250,11 +256,14 @@ class RabbitMQJob extends BaseJob
 
 ## Laravel Usage
 
-Once you completed the configuration you can use Laravel Queue API. If you used other queue drivers you do not need to change anything else. If you do not know how to use Queue API, please refer to the official Laravel documentation: http://laravel.com/docs/queues
+Once you completed the configuration you can use the Laravel Queue API. If you used other queue drivers you do not need to
+change anything else. If you do not know how to use the Queue API, please refer to the official Laravel
+documentation: http://laravel.com/docs/queues
 
 ## Laravel Horizon Usage
 
-Starting with 8.0, this package supports [Laravel Horizon](http://horizon.laravel.com) out of the box. Firstly, install Horizon and then set `RABBITMQ_WORKER` to `horizon`.
+Starting with 8.0, this package supports [Laravel Horizon](http://horizon.laravel.com) out of the box. Firstly, install
+Horizon and then set `RABBITMQ_WORKER` to `horizon`.
 
 ## Lumen Usage
 
@@ -266,7 +275,7 @@ $app->register(VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServic
 
 ## Consuming Messages
 
-There are two ways of consuming messages. 
+There are two ways of consuming messages.
 
 1. `queue:work` command which is Laravel's built-in command. This command utilizes `basic_get`. Use this if you want to consume multiple queues.
 
@@ -302,4 +311,5 @@ composer fix:style
 
 ## Contribution
 
-You can contribute to this package by discovering bugs and opening issues. Please, add to which version of package you create pull request or issue. (e.g. [5.2] Fatal error on delayed job)
+You can contribute to this package by discovering bugs and opening issues. Please, add to which version of package you
+create pull request or issue. (e.g. [5.2] Fatal error on delayed job)

CHANGELOG-13x.md

@@ -18,8 +18,8 @@
     "phpunit/phpunit": "^9.3",
     "mockery/mockery": "^1.0",
     "laravel/horizon": "^5.0",
-    "friendsofphp/php-cs-fixer": "^3.6",
-    "orchestra/testbench": "^7.0"
+    "orchestra/testbench": "^7.0",
+    "laravel/pint": "^1.2"
   },
   "autoload": {
     "psr-4": {
@@ -33,7 +33,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "11.0-dev"
+      "dev-master": "13.0-dev"
     },
     "laravel": {
       "providers": [

README.md

@@ -18,7 +18,8 @@ class ExchangeDeclareCommand extends Command
     protected $description = 'Declare exchange';
 
     /**
-     * @param RabbitMQConnector $connector
+     * @param  RabbitMQConnector  $connector
+     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void

composer.json

@@ -16,7 +16,8 @@ class ExchangeDeleteCommand extends Command
     protected $description = 'Delete exchange';
 
     /**
-     * @param RabbitMQConnector $connector
+     * @param  RabbitMQConnector  $connector
+     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void

src/Console/ExchangeDeclareCommand.php

@@ -17,7 +17,8 @@ class QueueBindCommand extends Command
     protected $description = 'Bind queue to exchange';
 
     /**
-     * @param RabbitMQConnector $connector
+     * @param  RabbitMQConnector  $connector
+     *
      * @throws Exception
      */
     public function handle(RabbitMQConnector $connector): void