From e63cf01d0cb673e82a49eabff29bf351d8f994f3 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 28 Jan 2023 07:28:09 +0100 Subject: [PATCH 1/4] Update version constraints to support Laravel 10 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 69f078f..f7a3ec9 100644 --- a/composer.json +++ b/composer.json @@ -11,15 +11,15 @@ ], "require": { "php": "^7.2|^8.0", - "illuminate/support": "^7.0|^8.0|^9.0", - "illuminate/filesystem": "^7.0|^8.0|^9.0", - "illuminate/console": "^7.0|^8.0|^9.0", + "illuminate/support": "^7.0|^8.0|^9.0|^10", + "illuminate/filesystem": "^7.0|^8.0|^9.0|^10", + "illuminate/console": "^7.0|^8.0|^9.0|^10", "maennchen/zipstream-php": "^2.1", "guzzlehttp/guzzle": "^6.3|^7.2", "aws/aws-sdk-php": "^3.216.1" }, "require-dev": { - "orchestra/testbench": "^5|^6|^7", + "orchestra/testbench": "^5|^6|^7|^8", "mockery/mockery": "^1.3.3", "phpunit/phpunit": ">=8.5.23|^9" }, From 5c2555153d1d69578dbb0c61fedd6192308c61de Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 28 Jan 2023 07:30:24 +0100 Subject: [PATCH 2/4] Update CI to test Laravel 10 --- .github/workflows/tests.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9bf5582..203972b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ] - laravel: [ 7.*, 8.*, 9.* ] + laravel: [ 7.*, 8.*, 9.*, 10.* ] guzzle: [ 6.*, 7.* ] dependency-version: [ prefer-lowest, prefer-stable ] include: @@ -32,6 +32,9 @@ jobs: - laravel: 9.* testbench: 7.* + - laravel: 10.* + testbench: 8.* + exclude: - laravel: 7.* php: 8.1 @@ -57,6 +60,20 @@ jobs: - laravel: 9.* guzzle: 6.* + # Laravel 10 requires PHP 8.1 + - laravel: 10.* + php: 7.2 + - laravel: 10.* + php: 7.3 + - laravel: 10.* + php: 7.4 + - laravel: 10.* + php: 8.0 + + # Laravel 10 requires Guzzle ^7.2 + - laravel: 10.* + guzzle: 6.* + name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }} steps: @@ -83,4 +100,4 @@ jobs: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests - run: vendor/bin/phpunit \ No newline at end of file + run: vendor/bin/phpunit From 705d79cd854127ddb82b921e56656592c9f947f2 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 28 Jan 2023 10:15:59 +0100 Subject: [PATCH 3/4] Update Docs to mention Laravel 10 support This change makes #87 obsolete. --- docs/overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/overview.md b/docs/overview.md index 9a8d874..e3deac6 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -3,7 +3,7 @@ Sidecar packages, deploys, and executes AWS Lambda functions from your Laravel application. {.text-xl .font-bold} -It works with _any_ Laravel 7 or Laravel 8 application, hosted _anywhere_, including your local machine. {.font-bold} +It works with _any_ Laravel 7, 8, 9 or 10 application, hosted _anywhere_, including your local machine. {.font-bold} You can write functions in any of the following runtimes and execute them straight from PHP: @@ -128,4 +128,4 @@ If you need other services, you are encouraged to use the instances that Vapor h **Sidecar does not provide a way to execute a function via HTTP. You must execute it from your Laravel app through the provided methods.** -Finally, Sidecar doesn't replace Vapor in any way. In fact, PHP is not even one of the default AWS supported runtimes! \ No newline at end of file +Finally, Sidecar doesn't replace Vapor in any way. In fact, PHP is not even one of the default AWS supported runtimes! From 52cec5abacb76112d5db34ee6a4046a080e68275 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 28 Jan 2023 11:24:39 +0100 Subject: [PATCH 4/4] Fix Guzzle Constraint in CI --- .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 203972b..528533a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -72,7 +72,7 @@ jobs: # Laravel 10 requires Guzzle ^7.2 - laravel: 10.* - guzzle: 6.* + guzzle: 7.* name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}