From 1da8aeedb1f84c49d5df01f5f1637b00e60c77ce Mon Sep 17 00:00:00 2001 From: drbyte <404472+drbyte@users.noreply.github.com> Date: Thu, 30 Jan 2025 20:32:26 +0000 Subject: [PATCH 1/5] Update CHANGELOG --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 094cdbc55..62c8daaac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,38 @@ All notable changes to `laravel-permission` will be documented in this file +## 6.11.0 - 2025-01-30 + +### What's Changed + +* Add configurable team resolver for permission team id (helpful for Jetstream, etc) by @adrenallen in https://github.com/spatie/laravel-permission/pull/2790 + +### Internals + +* Replace php-cs-fixer with Laravel Pint by @bobbrodie in https://github.com/spatie/laravel-permission/pull/2780 + +### Documentation Updates + +* [Docs] Include namespace in example in uuid.md by @ken-tam in https://github.com/spatie/laravel-permission/pull/2764 +* [Docs] Include Laravel 11 example in exceptions.md by @frankliniwobi in https://github.com/spatie/laravel-permission/pull/2768 +* [Docs] Fix typo in code example in passport.md by @m3skalina in https://github.com/spatie/laravel-permission/pull/2782 +* [Docs] Correct username in new-app.md by @trippodi in https://github.com/spatie/laravel-permission/pull/2785 +* [Docs] Add composer specificity by @imanghafoori1 in https://github.com/spatie/laravel-permission/pull/2772 +* [Docs] Update installation-laravel.md to fix providers.php location. by @curiousteam in https://github.com/spatie/laravel-permission/pull/2796 + +### New Contributors + +* @ken-tam made their first contribution in https://github.com/spatie/laravel-permission/pull/2764 +* @frankliniwobi made their first contribution in https://github.com/spatie/laravel-permission/pull/2768 +* @bobbrodie made their first contribution in https://github.com/spatie/laravel-permission/pull/2780 +* @m3skalina made their first contribution in https://github.com/spatie/laravel-permission/pull/2782 +* @trippodi made their first contribution in https://github.com/spatie/laravel-permission/pull/2785 +* @imanghafoori1 made their first contribution in https://github.com/spatie/laravel-permission/pull/2772 +* @curiousteam made their first contribution in https://github.com/spatie/laravel-permission/pull/2796 +* @adrenallen made their first contribution in https://github.com/spatie/laravel-permission/pull/2790 + +**Full Changelog**: https://github.com/spatie/laravel-permission/compare/6.10.1...6.11.0 + ## 6.10.1 - 2024-11-08 ### What's Changed @@ -891,6 +923,7 @@ The following changes are not "breaking", but worth making the updates to your a + ``` @@ -962,6 +995,7 @@ The following changes are not "breaking", but worth making the updates to your a + ``` From f1d198a2e929be1185700146c725a703832716f1 Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Thu, 30 Jan 2025 15:49:18 -0500 Subject: [PATCH 2/5] Remove larastan as dependency Larastan composer is not updated yet to support latest Laravel, so leaving Larastan out of this package's dependencies allows the package to be used/tested regardless of larastan's availability. The phpstan workflow already will load larastan when needed, so remains compatible with this change. --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8e7ea5cc4..f9adb59a4 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "illuminate/database": "^8.12|^9.0|^10.0|^11.0" }, "require-dev": { - "larastan/larastan": "^1.0|^2.0|^3.0", "laravel/passport": "^11.0|^12.0", "laravel/pint": "^1.0", "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0", @@ -67,6 +66,6 @@ "scripts": { "test": "phpunit", "format": "pint", - "analyse": "phpstan analyse" + "analyse": "echo 'Checking dependencies...' && composer require --dev larastan/larastan && phpstan analyse" } } From cbeecfc0452ee8e588fceba45cc18c2e94cd3abd Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Thu, 30 Jan 2025 15:52:16 -0500 Subject: [PATCH 3/5] Add Laravel 12 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index f9adb59a4..c04c5bff9 100644 --- a/composer.json +++ b/composer.json @@ -23,15 +23,15 @@ "homepage": "https://github.com/spatie/laravel-permission", "require": { "php": "^8.0", - "illuminate/auth": "^8.12|^9.0|^10.0|^11.0", - "illuminate/container": "^8.12|^9.0|^10.0|^11.0", - "illuminate/contracts": "^8.12|^9.0|^10.0|^11.0", - "illuminate/database": "^8.12|^9.0|^10.0|^11.0" + "illuminate/auth": "^8.12|^9.0|^10.0|^11.0|^12.0", + "illuminate/container": "^8.12|^9.0|^10.0|^11.0|^12.0", + "illuminate/contracts": "^8.12|^9.0|^10.0|^11.0|^12.0", + "illuminate/database": "^8.12|^9.0|^10.0|^11.0|^12.0" }, "require-dev": { "laravel/passport": "^11.0|^12.0", "laravel/pint": "^1.0", - "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0", + "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0", "phpunit/phpunit": "^9.4|^10.1|^11.5" }, "minimum-stability": "dev", From 89c64bf0eab641f45fb34026e90f01ed47653469 Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Thu, 30 Jan 2025 15:53:03 -0500 Subject: [PATCH 4/5] [Docs] Laravel 12 --- docs/installation-laravel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation-laravel.md b/docs/installation-laravel.md index 54bac7b4b..c3a6646ce 100644 --- a/docs/installation-laravel.md +++ b/docs/installation-laravel.md @@ -9,7 +9,7 @@ Choose the version of this package that suits your Laravel version. Package Version | Laravel Version ----------------|----------- - ^6.0 | 8,9,10,11 (PHP 8.0+) + ^6.0 | 8,9,10,11,12 (PHP 8.0+) ^5.8 | 7,8,9,10 ^5.7 | 7,8,9 ^5.4-^5.6 | 7,8 From 722e6428e4fc1f9e2c4fcb4f2f5fd3eba843ba83 Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Thu, 30 Jan 2025 16:03:31 -0500 Subject: [PATCH 5/5] Add Laravel 12 to GH workflows --- .github/workflows/run-tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 842b1ca98..3f47884ba 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,9 +10,11 @@ jobs: fail-fast: false matrix: php: [8.4, 8.3, 8.2, 8.1, 8.0] - laravel: ["^11.0", "^10.0", "^9.0", "^8.12"] + laravel: ["^12.0", "^11.0", "^10.0", "^9.0", "^8.12"] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: "^12.0" + testbench: 10.* - laravel: "^11.0" testbench: 9.* - laravel: "^10.0" @@ -22,6 +24,10 @@ jobs: - laravel: "^8.12" testbench: "^6.23" exclude: + - laravel: "^12.0" + php: 8.1 + - laravel: "^12.0" + php: 8.0 - laravel: "^11.0" php: 8.1 - laravel: "^11.0" @@ -52,7 +58,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" "mockery/mockery:^1.3.2" "nesbot/carbon:>=2.62.1" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "symfony/console:>=4.3.4" "mockery/mockery:^1.3.2" "nesbot/carbon:>=2.72.6" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests