Merge branch 'main' into patch-40

Author: drbyte

.gitattributes

@@ -5,16 +5,13 @@
 /.github            export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/.travis.yml        export-ignore
 /phpunit.xml.dist   export-ignore
-/.scrutinizer.yml   export-ignore
 /art                export-ignore
 /docs               export-ignore
 /tests              export-ignore
 /.editorconfig      export-ignore
 /.php_cs.dist.php   export-ignore
 /phpstan*           export-ignore
-/.styleci.yml       export-ignore
 /CHANGELOG.md       export-ignore
 /CONTRIBUTING.md    export-ignore
 

.github/ISSUE_TEMPLATE/1_Bug_report.yml

@@ -0,0 +1,55 @@
+name: Bug Report
+description: "Report a reproducible bug."
+body:
+  - type: markdown
+    attributes:
+      value: |
+          Before creating a new Bug Report, please check that there isn't already a similar issue on [the issue tracker](https://github.com/spatie/laravel-permission/issues) or in [the discussions](https://github.com/spatie/laravel-permission/discussions).
+          Also, **many issues/questions/problems are already answered** in the [documentation](https://spatie.be/docs/laravel-permission) already. **Please be sure to check the docs** because it will save you time!
+
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: How do you trigger this bug? Please walk us through it step by step.
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Example Application
+      description: "Here is a link to my Github repo containing a minimal Laravel application which shows my problem:"
+  - type: markdown
+    attributes:
+      value: |
+          You can use `composer show` to get package version numbers:
+  - type: input
+    attributes:
+      label: "Version of spatie/laravel-permission package:"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: "Version of laravel/framework package:"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: "PHP version:"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: "Database engine and version:"
+  - type: input
+    attributes:
+      label: "OS: Windows/Mac/Linux version:" 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           compat-lookup: true

.github/workflows/dependabot-auto-merge.yml

@@ -16,7 +16,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@2.3.0
+        uses: aglipanci/laravel-pint-action@v2
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/fix-php-code-style-issues.yml

@@ -5,6 +5,10 @@ on:
         paths:
             - '**.php'
             - 'phpstan.neon.dist'
+    pull_request:
+        paths:
+            - '**.php'
+            - 'phpstan.neon.dist'
 
 jobs:
     phpstan:
@@ -16,15 +20,15 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.1
+                  php-version: 8.3
                   coverage: none
 
             - name: Install composer dependencies
-              uses: ramsey/composer-install@v2
+              uses: ramsey/composer-install@v3
 
             - name: Install larastan
               run: |
-                  composer require "nunomaduro/larastan" --no-interaction --no-update
+                  composer require "larastan/larastan" --no-interaction --no-update
                   composer update --prefer-dist --no-interaction
 
             - name: Run PHPStan

.github/workflows/phpstan.yml

@@ -9,21 +9,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2, 8.1, 8.0]
-        laravel: ["^10.0", "^9.0", "^8.12"]
+        php: [8.4, 8.3, 8.2, 8.1, 8.0]
+        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"
             testbench: 8.*
           - laravel: "^9.0"
             testbench: 7.*
           - 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"
+              php: 8.0
             - laravel: "^10.0"
               php: 8.0
             - laravel: "^8.12"
               php: 8.3
+            - laravel: "^8.12"
+              php: 8.4
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -44,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

.github/workflows/run-tests.yml

@@ -3,6 +3,7 @@ composer.lock
 vendor
 tests/temp
 .idea
+.phpunit.cache
 .phpunit.result.cache
 .php-cs-fixer.cache
 tests/CreatePermissionCustomTables.php