From 79e5c54e27808d386c8dc5c1577d9fc120265df8 Mon Sep 17 00:00:00 2001 From: Squigg Date: Fri, 18 Sep 2020 23:09:08 +0100 Subject: [PATCH 1/6] Add .phpunit.result.cache to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a40b4c3..78ebc46 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ composer.lock .DS_Store .idea /test-coverage/ +.phpunit.result.cache From 4063cefbd65ea8e91284ba4fb7864523f52cd68e Mon Sep 17 00:00:00 2001 From: Squigg Date: Fri, 18 Sep 2020 23:09:34 +0100 Subject: [PATCH 2/6] Update dependencies for Laravel 8+ --- .travis.yml | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e8145b..c176492 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: php php: - - '7.2' - '7.3' + - '7.4' install: - travis_retry composer install --no-interaction diff --git a/composer.json b/composer.json index cc65700..89439eb 100644 --- a/composer.json +++ b/composer.json @@ -16,13 +16,13 @@ } ], "require": { - "php": "^7.2.5", - "illuminate/queue": "^7.0", + "php": "^7.3", + "illuminate/queue": "^8.0", "microsoft/azure-storage-queue": "~1.3.0" }, "require-dev": { "phpunit/phpunit": "^8.0|^9.0", - "orchestra/testbench": "^5.0", + "orchestra/testbench": "^6.0", "mockery/mockery": "~1.0", "php-coveralls/php-coveralls": "~2.0", "ext-json": "*" From 8c3f80fe2a1504cca6932dca93805ad3f7b2e3b3 Mon Sep 17 00:00:00 2001 From: Squigg Date: Fri, 18 Sep 2020 23:09:39 +0100 Subject: [PATCH 3/6] Update docs --- README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f2b72a2..3b9e67a 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,12 @@ azure-queue-laravel PHP Laravel Queue Driver package to support Microsoft Azure Storage Queues ## Prerequisites - -- PHP 5.6+, PHP 7+ for Laravel 5.5+, PHP 7.1+ for Laravel 5.6+, PHP 7.2+ for Laravel 6+ -- Laravel 5.2 - 7.x (not tested on previous versions) +- Laravel 5.2 - 8.x (not tested on previous versions) +- PHP 5.6+ for Laravel 5.2+ +- PHP 7+ for Laravel 5.5+ +- PHP 7.1+ for Laravel 5.6+ +- PHP 7.2+ for Laravel 6+ +- PHP 7.3+ for Laravel 8+ - Microsoft Azure Storage Account and Storage Account Key - Queue container created through Azure Portal or via [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/storage/queue?view=azure-cli-latest#az-storage-queue-create) @@ -24,6 +27,9 @@ or [PowerShell](https://docs.microsoft.com/en-us/azure/storage/queues/storage-po You can find this library on [Packagist](https://packagist.org/packages/squigg/azure-queue-laravel). Require this package in your `composer.json`. The version numbers will follow Laravel. +#### Laravel 8.x + "squigg/azure-queue-laravel": "^8.0" + composer require squigg/azure-queue-laravel:^8.0 #### Laravel 7.x "squigg/azure-queue-laravel": "^7.0" composer require squigg/azure-queue-laravel:^7.0 @@ -112,6 +118,8 @@ Remember to update the default queue by setting the `QUEUE_DRIVER` value in your ## Changelog +2020-09-19 - V8.0 - Support for Laravel 8.x (composer dependency and test refactoring only) + 2020-06-04 - V7.0 - Support for Laravel 7.x (composer dependency and test refactoring only) 2020-06-04 - V6.0 - Support for Laravel 6.x (composer dependency changes only) From 71571f0e2c23d9450738509510b03670e2169926 Mon Sep 17 00:00:00 2001 From: Squigg Date: Fri, 18 Sep 2020 23:22:39 +0100 Subject: [PATCH 4/6] Update QUEUE_DRIVER to QUEUE_CONNECTION in docs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3b9e67a..87a2d95 100644 --- a/README.md +++ b/README.md @@ -107,9 +107,9 @@ Add environment variables into your `.env` file to set the above configuration p AZURE_QUEUE_ENDPOINTSUFFIX=xxx #### Set the default Laravel queue -Update the default queue used by Laravel by setting the `QUEUE_DRIVER` value in your `.env` file to `azure`. +Update the default queue used by Laravel by setting the `QUEUE_CONNECTION` value in your `.env` file to `azure`. - QUEUE_DRIVER=azure + QUEUE_CONNECTION=azure ## Usage Use the normal Laravel Queue functionality as per the [documentation](http://laravel.com/docs/queues). From 015c2c1f7a8c1c8606fa2ab76983599a21a15f13 Mon Sep 17 00:00:00 2001 From: Squigg Date: Fri, 18 Sep 2020 23:22:53 +0100 Subject: [PATCH 5/6] Add missing comma in config --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87a2d95..20df0ec 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ fill out your own connection data from the Azure Management portal: 'accountname' => env('AZURE_QUEUE_STORAGE_NAME'), // Azure storage account name 'key' => env('AZURE_QUEUE_KEY'), // Access key for storage account 'queue' => env('AZURE_QUEUE_NAME'), // Queue container name - 'timeout' => 60 // Seconds before a job is released back to the queue + 'timeout' => 60, // Seconds before a job is released back to the queue 'endpoint' => env('AZURE_QUEUE_ENDPOINTSUFFIX'), // Optional endpoint suffix if different from core.windows.net ], From a3762a5e0fa531f40300068da9ef2d1d41a94c4a Mon Sep 17 00:00:00 2001 From: Squigg Date: Sat, 19 Sep 2020 01:31:02 +0100 Subject: [PATCH 6/6] Add docs for Guzzle version workaround --- README.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 20df0ec..812f3ff 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,22 @@ or [PowerShell](https://docs.microsoft.com/en-us/azure/storage/queues/storage-po ### Install using composer You can find this library on [Packagist](https://packagist.org/packages/squigg/azure-queue-laravel). +#### Important notes for Laravel 8 +Laravel 8 has moved to Guzzle 7.x, but the upstream dependency `microsoft/azure-storage-queue` from this package still uses Guzzle 6. +This will cause `composer` to fail during dependency resolution. + +Tests so far have not identified any impacting breaking changes between Guzzle 6 and 7, so while we wait for the upstream package to be updated, you can work around this issue by adding/updating your root +`composer.json` file to use an inline alias for `guzzlehttp/guzzle`: +``` +"guzzlehttp/guzzle": "7.0.1 as 6.5.5" +``` +Or run this command: +``` +composer require guzzlehttp/guzzle:"7.0.1 as 6.5.5" +``` +#### Installation Require this package in your `composer.json`. The version numbers will follow Laravel. + #### Laravel 8.x "squigg/azure-queue-laravel": "^8.0" composer require squigg/azure-queue-laravel:^8.0 @@ -99,7 +114,7 @@ fill out your own connection data from the Azure Management portal: 'endpoint' => env('AZURE_QUEUE_ENDPOINTSUFFIX'), // Optional endpoint suffix if different from core.windows.net ], -Add environment variables into your `.env` file to set the above configuration parameters if you prefer: +Add environment variables into your `.env` file to set the above configuration parameters: AZURE_QUEUE_STORAGE_NAME=xxx AZURE_QUEUE_KEY=xxx @@ -111,6 +126,8 @@ Update the default queue used by Laravel by setting the `QUEUE_CONNECTION` value QUEUE_CONNECTION=azure +This setting is `QUEUE_DRIVER` in older versions of Laravel. + ## Usage Use the normal Laravel Queue functionality as per the [documentation](http://laravel.com/docs/queues).