From 41df55e1e9752daf41a97f2df360bb3a56e5f819 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 9 Feb 2025 13:54:04 +0100 Subject: [PATCH 1/6] Laravel 12 support in composer --- composer.json | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 745e824..a185b13 100644 --- a/composer.json +++ b/composer.json @@ -8,29 +8,34 @@ "restful" ], "license": "BSD-3-Clause", - "authors": [{ + "authors": [ + { "name": "Jason Lewis", "email": "jason.lewis1991@gmail.com" - }], + }, + { + "name": "Max Snow", + "email": "contact@maxsnow.me" + } + ], "require": { - "php": "^8.0", - "illuminate/routing": "^9.0|^10.0|^11.0", - "illuminate/support": "^9.0|^10.0|^11.0", + "php": "^8.2", + "illuminate/routing": "^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0", "php-open-source-saver/fractal": "^1.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "~3", - "illuminate/auth": "^9.0|^10.0|^11.0", - "illuminate/cache": "^9.0|^10.0|^11.0", - "illuminate/console": "^9.0|^10.0|^11.0", - "illuminate/database": "^9.0|^10.0|^11.0", - "illuminate/events": "^9.0|^10.0|^11.0", - "illuminate/filesystem": "^9.0|^10.0|^11.0", - "illuminate/log": "^9.0|^10.0|^11.0", - "illuminate/pagination": "^9.0|^10.0|^11.0", - "laravel/lumen-framework": "^9.0|^10.0|^11.0", + "illuminate/auth": "^9.0|^10.0|^11.0|^12.0", + "illuminate/cache": "^9.0|^10.0|^11.0|^12.0", + "illuminate/console": "^9.0|^10.0|^11.0|^12.0", + "illuminate/database": "^9.0|^10.0|^11.0|^12.0", + "illuminate/events": "^9.0|^10.0|^11.0|^12.0", + "illuminate/filesystem": "^9.0|^10.0|^11.0|^12.0", + "illuminate/log": "^9.0|^10.0|^11.0|^12.0", + "illuminate/pagination": "^9.0|^10.0|^11.0|^12.0", "mockery/mockery": "~1.0", - "phpunit/phpunit": "^9.0|^10.0", + "phpunit/phpunit": "^9.5|^10.5", "squizlabs/php_codesniffer": "~2.0", "php-open-source-saver/jwt-auth": "^1.4 | ^2.2", "dingo/blueprint": "~0.4" From de3cf4b3ecf39684f1316ec8ab029752b2d5f71d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 6 Mar 2025 13:19:41 +1100 Subject: [PATCH 2/6] Further updates --- .github/workflows/ci.yml | 2 +- composer.json | 9 +++------ tests/ChecksLaravelVersionTrait.php | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 974c34d..64612c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: stability: [prefer-stable] - versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 } ] + versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 }, { php: 8.2, laravel: 12 }, { php: 8.3, laravel: 12 }, { php: 8.4, laravel: 12 } ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index a185b13..e0407d2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": "^8.2", "illuminate/routing": "^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^12.0", "php-open-source-saver/fractal": "^1.0" }, "require-dev": { @@ -34,11 +34,11 @@ "illuminate/filesystem": "^9.0|^10.0|^11.0|^12.0", "illuminate/log": "^9.0|^10.0|^11.0|^12.0", "illuminate/pagination": "^9.0|^10.0|^11.0|^12.0", + "laravel/framework": "^9.0|^10.0|^11.0|^12.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "^9.5|^10.5", "squizlabs/php_codesniffer": "~2.0", - "php-open-source-saver/jwt-auth": "^1.4 | ^2.2", - "dingo/blueprint": "~0.4" + "php-open-source-saver/jwt-auth": "^1.4 | ^2.8" }, "suggest": { "php-open-source-saver/jwt-auth": "Protect your API with JSON Web Tokens.", @@ -59,9 +59,6 @@ } }, "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - }, "laravel": { "providers": [ "Dingo\\Api\\Provider\\LaravelServiceProvider" diff --git a/tests/ChecksLaravelVersionTrait.php b/tests/ChecksLaravelVersionTrait.php index 1e5b68b..000a61b 100644 --- a/tests/ChecksLaravelVersionTrait.php +++ b/tests/ChecksLaravelVersionTrait.php @@ -13,7 +13,7 @@ trait ChecksLaravelVersionTrait { public $installed_file_path = __DIR__.'/../vendor/composer/installed.json'; - public $current_release = '8.0'; + public $current_release = '12.0'; private function getFrameworkVersion() { From 10b82cd1f6e142a759fdf27bf849ade05058699f Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 6 Mar 2025 13:20:46 +1100 Subject: [PATCH 3/6] Re-include all versions for support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e0407d2..a9ccca2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require": { "php": "^8.2", "illuminate/routing": "^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^12.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0", "php-open-source-saver/fractal": "^1.0" }, "require-dev": { From a956e7d13f3caa602d0316957ba0e826d9838f31 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 6 Mar 2025 13:30:30 +1100 Subject: [PATCH 4/6] format of composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d69282a..ba9f779 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "laravel/framework": "^9.0|^10.0|^11.0|^12.0", "illuminate/translation": "^9.0|^10.0|^11.0|^12.0", "mockery/mockery": "~1.0", - "php-open-source-saver/jwt-auth": "^1.4 | ^2.8" + "php-open-source-saver/jwt-auth": "^1.4 | ^2.8", "phpunit/phpunit": "^9.5|^10.5", "squizlabs/php_codesniffer": "~2.0" }, From 6785474962b92bf3dbdd75c7c7f9c74364eeea55 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 6 Mar 2025 13:32:39 +1100 Subject: [PATCH 5/6] support php 8.1 for now (laravel 10) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ba9f779..c48e162 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "laravel/framework": "^9.0|^10.0|^11.0|^12.0", "illuminate/translation": "^9.0|^10.0|^11.0|^12.0", "mockery/mockery": "~1.0", - "php-open-source-saver/jwt-auth": "^1.4 | ^2.8", + "php-open-source-saver/jwt-auth": "^1.4 | ^2.7", "phpunit/phpunit": "^9.5|^10.5", "squizlabs/php_codesniffer": "~2.0" }, From 7752cf176b88b785df1b42fd0644a54739083dd2 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 6 Mar 2025 13:34:26 +1100 Subject: [PATCH 6/6] On second thought, better remove php 8.1 from support matrix --- .github/workflows/ci.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64612c8..77ed2c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: stability: [prefer-stable] - versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 }, { php: 8.2, laravel: 12 }, { php: 8.3, laravel: 12 }, { php: 8.4, laravel: 12 } ] + versions: [ { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 }, { php: 8.2, laravel: 12 }, { php: 8.3, laravel: 12 }, { php: 8.4, laravel: 12 } ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index c48e162..ba9f779 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "laravel/framework": "^9.0|^10.0|^11.0|^12.0", "illuminate/translation": "^9.0|^10.0|^11.0|^12.0", "mockery/mockery": "~1.0", - "php-open-source-saver/jwt-auth": "^1.4 | ^2.7", + "php-open-source-saver/jwt-auth": "^1.4 | ^2.8", "phpunit/phpunit": "^9.5|^10.5", "squizlabs/php_codesniffer": "~2.0" },