Laravel 13 support

.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4
+        uses: actions/dependency-review-action@v5

.github/workflows/lint.yml

@@ -1,14 +1,25 @@
 name: CI
 
-on: push
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Checking PHP syntax error
-        uses: overtrue/phplint@9.1
+        uses: actions/checkout@v7
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          path: .
-          options: --exclude=*.log
+          php-version: '8.4'
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-interaction
+
+      - name: Checking PHP syntax error
+        run: composer run-script lint

.github/workflows/php.yml

@@ -2,35 +2,57 @@ name: PHP Composer
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        laravel: [ '^12.0', '^13.0' ]
+
+    name: Laravel ${{ matrix.laravel }}
+
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.4'
+        coverage: none
 
-    - name: Validate composer.json and composer.lock
-      run: composer validate --strict
+    - name: Validate composer.json
+      run: composer validate --strict --no-check-lock
 
     - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v4
+      uses: actions/cache@v6
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}
         restore-keys: |
-          ${{ runner.os }}-php-
+          ${{ runner.os }}-php-${{ matrix.laravel }}-
+
+    - name: Pin Laravel version
+      run: |
+        composer require --no-update --no-interaction \
+          "illuminate/cache:${{ matrix.laravel }}" \
+          "illuminate/console:${{ matrix.laravel }}" \
+          "illuminate/contracts:${{ matrix.laravel }}" \
+          "illuminate/database:${{ matrix.laravel }}" \
+          "illuminate/filesystem:${{ matrix.laravel }}" \
+          "illuminate/http:${{ matrix.laravel }}" \
+          "illuminate/support:${{ matrix.laravel }}" \
+          "illuminate/view:${{ matrix.laravel }}"
 
     - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
+      run: composer update --prefer-dist --no-progress --no-interaction
 
-    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-    # Docs: https://getcomposer.org/doc/articles/scripts.md
+    - name: Show resolved Laravel version
+      run: composer show illuminate/support | head -3
 
-    # - name: Run test suite
-    #   run: composer run-script test
+    - name: Run test suite
+      run: composer run-script test

.gitignore

@@ -20,6 +20,7 @@ Thumbs.db
 .env.*.php
 .env.php
 .phpunit.result.cache
+.phplint.cache/
 
 # sublime phpintel plugin
 /.phpintel

composer.json

@@ -1,116 +1,57 @@
 {
-    "name": "mitchbred/entrust",
-    "description": "This package provides a flexible way to add role-based permissions to Laravel and is a fork from Zizaco/entrust",
-    "type": "library",
-    "license": "MIT",
-    "minimum-stability": "dev",
-    "prefer-stable": false,
-    "require": {
-        "php": "^8.1",
-        "doctrine/inflector": "^2.0.8",
-        "illuminate/bus": "^10.0.0",
-        "illuminate/cache": "^10.0.0",
-        "illuminate/collections": "^10.0.0",
-        "illuminate/conditionable": "^10.0.0",
-        "illuminate/console": "^10.0.0",
-        "illuminate/container": "^10.0.0",
-        "illuminate/contracts": "^10.0.0",
-        "illuminate/events": "^10.0.0",
-        "illuminate/filesystem": "^10.0.0",
-        "illuminate/macroable": "^10.0.0",
-        "illuminate/pipeline": "^10.0.0",
-        "illuminate/support": "^10.0.0",
-        "illuminate/view": "^10.0.0",
-        "laravel/prompts": "^0.1.13",
-        "nesbot/carbon": "^2.71.0",
-        "nunomaduro/termwind": "^1.15.1",
-        "psr/clock": "^1.0.0",
-        "psr/container": "^2.0.2",
-        "psr/simple-cache": "^3.0.0",
-        "symfony/console": "^6.3.4",
-        "symfony/deprecation-contracts": "^3.3.0",
-        "symfony/finder": "^6.3.0",
-        "symfony/polyfill-ctype": "^1.0.0",
-        "symfony/polyfill-intl-grapheme": "^1.0.0",
-        "symfony/polyfill-intl-normalizer": "^1.0.0",
-        "symfony/polyfill-mbstring": "^1.0.0",
-        "symfony/polyfill-php80": "^1.0.0",
-        "symfony/process": "^6.3.0",
-        "symfony/service-contracts": "^3.3.0",
-        "symfony/string": "^6.3.0",
-        "symfony/translation": "^6.3.0",
-        "symfony/translation-contracts": "^3.3.0",
-        "voku/portable-ascii": "^2.0.1",
-        "brick/math": "^0.11.0",
-        "hamcrest/hamcrest-php": "^2.0.1",
-        "illuminate/database": "^10.0.0",
-        "myclabs/deep-copy": "^1.11.0",
-        "nikic/php-parser": "^4.17.0",
-        "phar-io/manifest": "^2.0.3",
-        "phar-io/version": "^3.2.1",
-        "psr/cache": "^3.0.0",
-        "psr/event-dispatcher": "^1.0.0",
-        "psr/log": "^3.0.0",
-        "sebastian/cli-parser": "^2.0.0",
-        "sebastian/code-unit": "^2.0.0",
-        "sebastian/code-unit-reverse-lookup": "^3.0.0",
-        "sebastian/comparator": "^5.0.0",
-        "sebastian/complexity": "^3.1.0",
-        "sebastian/diff": "^5.0.0",
-        "sebastian/environment": "^6.0.0",
-        "sebastian/exporter": "^5.1.0",
-        "sebastian/global-state": "^6.0.0",
-        "sebastian/lines-of-code": "^2.0.0",
-        "sebastian/object-enumerator": "^5.0.0",
-        "sebastian/object-reflector": "^3.0.0",
-        "sebastian/recursion-context": "^5.0.0",
-        "sebastian/type": "^4.0.0",
-        "sebastian/version": "^4.0.0",
-        "symfony/cache": "^6.3.0",
-        "symfony/cache-contracts": "^3.3.0",
-        "symfony/event-dispatcher": "^6.3.0",
-        "symfony/event-dispatcher-contracts": "^3.3.0",
-        "symfony/options-resolver": "^6.3.0",
-        "symfony/var-exporter": "^6.3.0",
-        "symfony/yaml": "^6.3.0",
-        "theseer/tokenizer": "^1.2.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^10.0",
-        "mockery/mockery": "^1.5.1",
-        "overtrue/phplint": "^9.0.3",
-        "phpunit/php-code-coverage": "dev-main",
-        "phpunit/php-file-iterator": "4.1.0",
-        "phpunit/php-invoker": "dev-main",
-        "phpunit/php-text-template": "dev-main",
-        "phpunit/php-timer": "dev-main"
-    },
-    "autoload": {
-        "classmap": [
-            "src/commands"
-        ],
-        "psr-4": {
-            "Trebol\\Entrust\\": "src/Entrust/"
-        }
-    },
-    "extra":{
-        "laravel":{
-            "providers":[
-                "Trebol\\Entrust\\EntrustServiceProvider"
-            ],
-            "aliases":{
-                "Entrust": "Trebol\\Entrust\\EntrustFacade"
-            }
-        }
-    },
-    "autoload-dev": {
-        "classmap": [
-            "tests/Middleware/MiddlewareTest.php"
-        ]
-    },
-    "config": {
-        "platform": {
-            "php": "8.1"
-        }
+  "name": "mitchbred/entrust",
+  "description": "This package provides a flexible way to add role-based permissions to Laravel and is a fork from Zizaco/entrust",
+  "type": "library",
+  "license": "MIT",
+  "minimum-stability": "stable",
+  "prefer-stable": true,
+  "require": {
+    "php": "^8.4",
+    "illuminate/cache": "^12.0|^13.0",
+    "illuminate/console": "^12.0|^13.0",
+    "illuminate/contracts": "^12.0|^13.0",
+    "illuminate/database": "^12.0|^13.0",
+    "illuminate/filesystem": "^12.0|^13.0",
+    "illuminate/http": "^12.0|^13.0",
+    "illuminate/support": "^12.0|^13.0",
+    "illuminate/view": "^12.0|^13.0"
+  },
+  "require-dev": {
+    "mockery/mockery": "^1.6",
+    "overtrue/phplint": "^9.0.3",
+    "phpunit/phpunit": "^12.0",
+    "rector/rector": "^2.0"
+  },
+  "autoload": {
+    "classmap": [
+      "src/commands"
+    ],
+    "psr-4": {
+      "Trebol\\Entrust\\": "src/Entrust/"
     }
+  },
+  "extra": {
+    "laravel": {
+      "providers": [
+        "Trebol\\Entrust\\EntrustServiceProvider"
+      ],
+      "aliases": {
+        "Entrust": "Trebol\\Entrust\\EntrustFacade"
+      }
+    }
+  },
+  "autoload-dev": {
+    "classmap": [
+      "tests/Middleware/MiddlewareTest.php"
+    ]
+  },
+  "config": {
+    "platform": {
+      "php": "8.4"
+    }
+  },
+  "scripts": {
+    "test": "phpunit",
+    "lint": "phplint src tests rector.php"
+  }
 }