From 5bc3a526c15e758cedd56f19a52874b5efb40d3a Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 12:57:06 -0800 Subject: [PATCH 01/11] Enable PHP 8.2 in tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 702bfe9b..5633c682 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: true matrix: - php: ['8.0', '8.1'] + php: ['8.0', '8.1', '8.2'] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} From eb397a0015c8657b7a37e8d4fe79cff9b5f0e3aa Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 12:57:42 -0800 Subject: [PATCH 02/11] fix pint linter issues --- src/Console/ExchangeDeclareCommand.php | 2 - src/Console/ExchangeDeleteCommand.php | 2 - src/Console/QueueBindCommand.php | 2 - src/Console/QueueDeclareCommand.php | 2 - src/Console/QueueDeleteCommand.php | 2 - src/Console/QueuePurgeCommand.php | 2 - src/Consumer.php | 3 - src/Horizon/Listeners/RabbitMQFailedEvent.php | 4 - src/Horizon/RabbitMQQueue.php | 3 - src/LaravelQueueRabbitMQServiceProvider.php | 4 - src/Queue/Connectors/RabbitMQConnector.php | 12 -- src/Queue/Jobs/RabbitMQJob.php | 6 - src/Queue/RabbitMQQueue.php | 106 ------------------ tests/Functional/TestCase.php | 3 - 14 files changed, 153 deletions(-) diff --git a/src/Console/ExchangeDeclareCommand.php b/src/Console/ExchangeDeclareCommand.php index 99f0b753..43aa9c5c 100644 --- 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 index 904f38ba..d5a8d8d4 100644 --- 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 index 40799460..ccbbd706 100644 --- 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 index d43f49ce..54d6ea32 100644 --- 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 index 8bca7c20..b2586ecd 100644 --- 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 index 95b765ea..49be839b 100644 --- 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 index d27b96c4..bd7f099d 100644 --- 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 index 1edfa551..00674827 100644 --- 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 index bf5b2ee2..7b038003 100644 --- 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 index 3be0fd81..ee46d6cd 100644 --- 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 index 903e1d3a..9fc8615f 100644 --- 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 index 4176d80d..abcdfab4 100644 --- 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 index 38ad1e94..030a4734 100644 --- a/src/Queue/RabbitMQQueue.php +++ b/src/Queue/RabbitMQQueue.php @@ -81,11 +81,6 @@ class RabbitMQQueue extends Queue implements QueueContract /** * RabbitMQQueue constructor. - * - * @param AbstractConnection $connection - * @param string $default - * @param bool $dispatchAfterCommit - * @param array $options */ public function __construct( AbstractConnection $connection, @@ -176,8 +171,6 @@ function ($payload, $queue, $delay) { } /** - * @param $delay - * @param $payload * @param null $queue * @param int $attempts * @return mixed @@ -227,9 +220,7 @@ public function bulk($jobs, $data = '', $queue = null): void } /** - * @param string $payload * @param null $queue - * @param array $options * @return mixed * * @throws AMQPProtocolChannelException @@ -296,17 +287,11 @@ public function pop($queue = null) return null; } - /** - * @return AbstractConnection - */ public function getConnection(): AbstractConnection { return $this->connection; } - /** - * @return AMQPChannel - */ public function getChannel(): AMQPChannel { return $this->channel; @@ -315,7 +300,6 @@ public function getChannel(): AMQPChannel /** * Job class to use. * - * @return string * * @throws Throwable */ @@ -336,7 +320,6 @@ public function getJobClass(): string * Gets a queue/destination, by default the queue option set on the connection. * * @param null $queue - * @return string */ public function getQueue($queue = null): string { @@ -347,8 +330,6 @@ public function getQueue($queue = null): string * Checks if the given exchange already present/defined in RabbitMQ. * Returns false when when the exchange is missing. * - * @param string $exchange - * @return bool * * @throws AMQPProtocolChannelException */ @@ -378,13 +359,6 @@ public function isExchangeExists(string $exchange): bool /** * Declare a exchange in rabbitMQ, when not already declared. - * - * @param string $name - * @param string $type - * @param bool $durable - * @param bool $autoDelete - * @param array $arguments - * @return void */ public function declareExchange( string $name, @@ -412,9 +386,6 @@ public function declareExchange( /** * Delete a exchange from rabbitMQ, only when present in RabbitMQ. * - * @param string $name - * @param bool $unused - * @return void * * @throws AMQPProtocolChannelException */ @@ -437,8 +408,6 @@ public function deleteExchange(string $name, bool $unused = false): void * Checks if the given queue already present/defined in RabbitMQ. * Returns false when when the queue is missing. * - * @param string|null $name - * @return bool * * @throws AMQPProtocolChannelException */ @@ -462,12 +431,6 @@ public function isQueueExists(string $name = null): bool /** * Declare a queue in rabbitMQ, when not already declared. - * - * @param string $name - * @param bool $durable - * @param bool $autoDelete - * @param array $arguments - * @return void */ public function declareQueue( string $name, @@ -493,10 +456,6 @@ public function declareQueue( /** * Delete a queue from rabbitMQ, only when present in RabbitMQ. * - * @param string $name - * @param bool $if_unused - * @param bool $if_empty - * @return void * * @throws AMQPProtocolChannelException */ @@ -511,11 +470,6 @@ public function deleteQueue(string $name, bool $if_unused = false, bool $if_empt /** * Bind a queue to an exchange. - * - * @param string $queue - * @param string $exchange - * @param string $routingKey - * @return void */ public function bindQueue(string $queue, string $exchange, string $routingKey = ''): void { @@ -532,9 +486,6 @@ public function bindQueue(string $queue, string $exchange, string $routingKey = /** * Purge the queue of messages. - * - * @param string|null $queue - * @return void */ public function purge(string $queue = null): void { @@ -546,9 +497,6 @@ public function purge(string $queue = null): void /** * Acknowledge the message. - * - * @param RabbitMQJob $job - * @return void */ public function ack(RabbitMQJob $job): void { @@ -557,10 +505,6 @@ public function ack(RabbitMQJob $job): void /** * Reject the message. - * - * @param RabbitMQJob $job - * @param bool $requeue - * @return void */ public function reject(RabbitMQJob $job, bool $requeue = false): void { @@ -570,9 +514,6 @@ public function reject(RabbitMQJob $job, bool $requeue = false): void /** * Create a AMQP message. * - * @param $payload - * @param int $attempts - * @return array * * @throws JsonException */ @@ -619,7 +560,6 @@ protected function createMessage($payload, int $attempts = 0): array * @param string|object $job * @param string $queue * @param mixed $data - * @return array */ protected function createPayloadArray($job, $queue, $data = ''): array { @@ -630,8 +570,6 @@ protected function createPayloadArray($job, $queue, $data = ''): array /** * Get a random ID string. - * - * @return string */ protected function getRandomId(): string { @@ -641,7 +579,6 @@ protected function getRandomId(): string /** * Close the connection to RabbitMQ. * - * @return void * * @throws Exception */ @@ -660,9 +597,6 @@ public function close(): void /** * Get the Queue arguments. - * - * @param string $destination - * @return array */ protected function getQueueArguments(string $destination): array { @@ -690,10 +624,6 @@ protected function getQueueArguments(string $destination): array /** * Get the Delay queue arguments. - * - * @param string $destination - * @param int $ttl - * @return array */ protected function getDelayQueueArguments(string $destination, int $ttl): array { @@ -707,8 +637,6 @@ protected function getDelayQueueArguments(string $destination, int $ttl): array /** * Returns &true;, if delayed messages should be prioritized. - * - * @return bool */ protected function isPrioritizeDelayed(): bool { @@ -721,8 +649,6 @@ protected function isPrioritizeDelayed(): bool * Using more priority layers, will consume more CPU resources and would affect runtimes. * * @see https://www.rabbitmq.com/priority.html - * - * @return int */ protected function getQueueMaxPriority(): int { @@ -731,9 +657,6 @@ protected function getQueueMaxPriority(): int /** * Get the exchange name, or &null; as default value. - * - * @param string|null $exchange - * @return string|null */ protected function getExchange(string $exchange = null): ?string { @@ -743,9 +666,6 @@ protected function getExchange(string $exchange = null): ?string /** * Get the routing-key for when you use exchanges * The default routing-key is the given destination. - * - * @param string $destination - * @return string */ protected function getRoutingKey(string $destination): string { @@ -754,9 +674,6 @@ protected function getRoutingKey(string $destination): string /** * Get the exchangeType, or AMQPExchangeType::DIRECT as default. - * - * @param string|null $type - * @return string */ protected function getExchangeType(?string $type = null): string { @@ -768,8 +685,6 @@ protected function getExchangeType(?string $type = null): string /** * Returns &true;, if failed messages should be rerouted. - * - * @return bool */ protected function isRerouteFailed(): bool { @@ -778,8 +693,6 @@ protected function isRerouteFailed(): bool /** * Returns &true;, if declared queue must be quorum queue. - * - * @return bool */ protected function isQuorum(): bool { @@ -788,9 +701,6 @@ protected function isQuorum(): bool /** * Get the exchange for failed messages. - * - * @param string|null $exchange - * @return string|null */ protected function getFailedExchange(string $exchange = null): ?string { @@ -800,9 +710,6 @@ protected function getFailedExchange(string $exchange = null): ?string /** * Get the routing-key for failed messages * The default routing-key is the given destination substituted by '.failed'. - * - * @param string $destination - * @return string */ protected function getFailedRoutingKey(string $destination): string { @@ -811,9 +718,6 @@ protected function getFailedRoutingKey(string $destination): string /** * Checks if the exchange was already declared. - * - * @param string $name - * @return bool */ protected function isExchangeDeclared(string $name): bool { @@ -822,9 +726,6 @@ protected function isExchangeDeclared(string $name): bool /** * Checks if the queue was already declared. - * - * @param string $name - * @return bool */ protected function isQueueDeclared(string $name): bool { @@ -834,10 +735,7 @@ protected function isQueueDeclared(string $name): bool /** * Declare the destination when necessary. * - * @param string $destination - * @param string|null $exchange * @param string|null $exchangeType - * @return void * * @throws AMQPProtocolChannelException */ @@ -867,10 +765,6 @@ protected function declareDestination( /** * Determine all publish properties. - * - * @param $queue - * @param array $options - * @return array */ protected function publishProperties($queue, array $options = []): array { diff --git a/tests/Functional/TestCase.php b/tests/Functional/TestCase.php index 40e3e116..01b3c069 100644 --- a/tests/Functional/TestCase.php +++ b/tests/Functional/TestCase.php @@ -161,9 +161,6 @@ protected function getEnvironmentSetUp($app): void } /** - * @param $object - * @param string $method - * @param array $parameters * @return mixed * * @throws Exception From 2d4eb2f92a0d5d49d810128f782df17d5fe328a8 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 13:37:57 -0800 Subject: [PATCH 03/11] try enabling laravel 10 --- .github/workflows/tests.yml | 6 +++++- composer.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5633c682..1c4400bf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,10 @@ jobs: matrix: 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 }} @@ -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='illuminate/queue:${{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 index 15bf6e85..9c3c12cf 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "php": "^8.0", "ext-json": "*", - "illuminate/queue": "^9.0", + "illuminate/queue": "^9.0|^10.0", "php-amqplib/php-amqplib": "^3.0" }, "require-dev": { From 239110e41e078aa304efa1823b2af80717e225cd Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 13:39:23 -0800 Subject: [PATCH 04/11] test names --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1c4400bf..f78ab11d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: - php: '8.0' laravel: '^10.0' - name: PHP ${{ matrix.php }} - ${{ matrix.stability }} + name: 'PHP ${{ matrix.php }} - ${{ matrix.stability }} - Laravel: ${{matrix.laravel}}' steps: - name: Checkout code From 1a375f3e70249f0c33e97eca064e9eec47acbf2a Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 14:04:51 -0800 Subject: [PATCH 05/11] enable more lara10 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9c3c12cf..9833f04e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "phpunit/phpunit": "^9.3", "mockery/mockery": "^1.0", "laravel/horizon": "^5.0", - "orchestra/testbench": "^7.0", + "orchestra/testbench": "^7.0|^8.0", "laravel/pint": "^1.2" }, "autoload": { From 07a834fb80e4feb35c6e81554a8e0a1e38b85686 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 14:06:49 -0800 Subject: [PATCH 06/11] stability last in name --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f78ab11d..5178bcf2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: - php: '8.0' laravel: '^10.0' - name: 'PHP ${{ matrix.php }} - ${{ matrix.stability }} - Laravel: ${{matrix.laravel}}' + name: 'PHP ${{ matrix.php }} - Laravel: ${{matrix.laravel}} - ${{ matrix.stability }}' steps: - name: Checkout code From deac081c9005a59d15b69a4cb4b2591258270e20 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 15:28:49 -0800 Subject: [PATCH 07/11] tentative constraint --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5178bcf2..b2660bae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: matrix: php: ['8.0', '8.1', '8.2'] stability: [prefer-lowest, prefer-stable] - laravel: ['^9.0', '^10.0'] + laravel: ['^9.0 < 10.0', '^10.0'] exclude: - php: '8.0' laravel: '^10.0' From 9109ba144e48598da2d5a24bb7c439a8c68e761f Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 15:40:05 -0800 Subject: [PATCH 08/11] stable or nothing --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b2660bae..f65bf2e0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,8 +14,8 @@ jobs: fail-fast: true matrix: php: ['8.0', '8.1', '8.2'] - stability: [prefer-lowest, prefer-stable] - laravel: ['^9.0 < 10.0', '^10.0'] + stability: ['', '--prefer-stable'] + laravel: ['^9.0', '^10.0'] exclude: - php: '8.0' laravel: '^10.0' @@ -44,7 +44,7 @@ jobs: run: docker-compose up -d rabbitmq - name: Install dependencies - run: composer update --with='illuminate/queue:${{matrix.laravel}}' --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + run: composer update --with='illuminate/queue:${{matrix.laravel}}' ${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Run Laravel Pint run: ./vendor/bin/pint --test From 67f3b9f0546e8194e3572eab76e7cbf40e1c1e06 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 15:45:01 -0800 Subject: [PATCH 09/11] stable or nothing --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f65bf2e0..3ccf92f5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,8 +14,8 @@ jobs: fail-fast: true matrix: php: ['8.0', '8.1', '8.2'] - stability: ['', '--prefer-stable'] - laravel: ['^9.0', '^10.0'] + stability: ['prefer-lowest', prefer-stable] + laravel: ['>=9.0 <10', '^10.0'] exclude: - php: '8.0' laravel: '^10.0' @@ -44,7 +44,7 @@ jobs: run: docker-compose up -d rabbitmq - name: Install dependencies - run: composer update --with='illuminate/queue:${{matrix.laravel}}' ${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + run: composer update --with='illuminate/queue:${{matrix.laravel}}' --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Run Laravel Pint run: ./vendor/bin/pint --test From 77004c5d0d49e48b129975a0721503561d749392 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 15:55:20 -0800 Subject: [PATCH 10/11] was that it --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3ccf92f5..828d3eef 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: matrix: php: ['8.0', '8.1', '8.2'] stability: ['prefer-lowest', prefer-stable] - laravel: ['>=9.0 <10', '^10.0'] + laravel: ['^9.0', '^10.0'] exclude: - php: '8.0' laravel: '^10.0' diff --git a/composer.json b/composer.json index 9833f04e..4dbf9b34 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "php": "^8.0", "ext-json": "*", - "illuminate/queue": "^9.0|^10.0", + "illuminate/queue": "^9.0||^10.0", "php-amqplib/php-amqplib": "^3.0" }, "require-dev": { From babf55f6d64228237bbf6fb06885c247a37b9b30 Mon Sep 17 00:00:00 2001 From: Seb Date: Tue, 21 Feb 2023 15:59:55 -0800 Subject: [PATCH 11/11] use as direct dependency to force it --- .github/workflows/tests.yml | 2 +- composer.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 828d3eef..37c80375 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,7 +44,7 @@ jobs: run: docker-compose up -d rabbitmq - name: Install dependencies - run: composer update --with='illuminate/queue:${{matrix.laravel}}' --${{ 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 index 4dbf9b34..5461314d 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require": { "php": "^8.0", "ext-json": "*", - "illuminate/queue": "^9.0||^10.0", + "illuminate/queue": "^9.0|^10.0", "php-amqplib/php-amqplib": "^3.0" }, "require-dev": { @@ -19,7 +19,8 @@ "mockery/mockery": "^1.0", "laravel/horizon": "^5.0", "orchestra/testbench": "^7.0|^8.0", - "laravel/pint": "^1.2" + "laravel/pint": "^1.2", + "laravel/framework": "^9.0|^10.0" }, "autoload": { "psr-4": {