Added Laravel 13 support

Author: dash8x

.github/workflows/run-tests.yml

@@ -17,13 +17,18 @@ jobs:
             matrix:
                 os: [ ubuntu-latest ]
                 php: [ 8.4, 8.3, 8.2 ]
-                laravel: [ 12.*, ^11.7 ]
+                laravel: [ 13.*, 12.*, ^11.7 ]
                 stability: [ prefer-lowest, prefer-stable ]
                 include:
+                    -   laravel: 13.*
+                        testbench: 11.*
                     -   laravel: 12.*
                         testbench: 10.*
                     -   laravel: ^11.7
-                        testbench: 9.*
+                        testbench: ^9.16
+                exclude:
+                    -   laravel: 13.*
+                        php: 8.2
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -41,7 +46,7 @@ jobs:
                 with:
                     php-version: ${{ matrix.php }}
                     extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
-                    coverage: ${{ startsWith(github.event.head_commit.message, 'coverage') && matrix.php == '8.3' && matrix.laravel == '11.*' && matrix.stability == 'prefer-stable' && 'xdebug' || 'none' }}
+                    coverage: ${{ startsWith(github.event.head_commit.message, 'coverage') && matrix.php == '8.4' && matrix.laravel == '13.*' && matrix.stability == 'prefer-stable' && 'xdebug' || 'none' }}
 
             -   name: Install dependencies
                 run: |
@@ -50,10 +55,10 @@ jobs:
 
             -   name: Execute tests
                 run: |
-                    vendor/bin/phpunit ${{ startsWith(github.event.head_commit.message, 'coverage') && matrix.php == '8.3' && matrix.laravel == '11.*' && matrix.stability == 'prefer-stable' && '--coverage-clover=clover.xml' || '' }}
+                    vendor/bin/phpunit ${{ startsWith(github.event.head_commit.message, 'coverage') && matrix.php == '8.4' && matrix.laravel == '13.*' && matrix.stability == 'prefer-stable' && '--coverage-clover=clover.xml' || '' }}
 
             -   name: Make code coverage badge
-                if: startsWith(github.event.head_commit.message, 'coverage') && matrix.php == '8.3' && matrix.laravel == '11.*' && matrix.stability == 'prefer-stable'
+                if: startsWith(github.event.head_commit.message, 'coverage') && matrix.php == '8.4' && matrix.laravel == '13.*' && matrix.stability == 'prefer-stable'
                 uses: timkrase/phpunit-coverage-badge@v1.2.1
                 with:
                     coverage_badge_path: .github/coverage.svg

composer.json

@@ -11,18 +11,18 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/support": "^11.7 || ^12.0",
-        "javaabu/helpers": "^1.59",
-        "javaabu/activitylog": "^1.4",
-        "laravel/ui": "^4.4",
-        "javaabu/passport": "^1.2",
-        "spatie/laravel-medialibrary": "^11.0",
+        "illuminate/support": "^11.7 || ^12.0 || ^13.0",
+        "javaabu/helpers": "^1.71",
+        "javaabu/activitylog": "^1.6",
+        "laravel/ui": "^4.6",
+        "javaabu/passport": "^2.0",
+        "spatie/laravel-medialibrary": "^11.21",
         "mobiledetect/mobiledetectlib": "^4.8",
-        "javaabu/schema": "^1.1"
+        "javaabu/schema": "^1.2"
     },
     "require-dev": {
-        "orchestra/testbench": "^9.0 || ^10.0",
-        "phpunit/phpunit": "^10.5 || ^11.5.3"
+        "orchestra/testbench": "^9.16 || ^10.0 || ^11.0",
+        "phpunit/phpunit": "^10.5 || ^11.5.3 || ^12.5.8 || ^13.0.3"
     },
     "autoload": {
         "psr-4": {
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.0-dev"
+            "dev-main": "2.0-dev"
         },
         "laravel": {
             "providers": [

docs/metadata.json

@@ -1,5 +1,5 @@
 {
     "name": "Auth",
     "description": "Laravel Authentication Helpers",
-    "version": "1"
+    "version": "2"
 }

src/User.php

@@ -28,6 +28,7 @@
 use Javaabu\Helpers\Media\UpdateMedia;
 use Javaabu\Helpers\Traits\HasStatus;
 use Javaabu\Passport\Traits\HasUserIdentifier;
+use Laravel\Passport\Contracts\OAuthenticatable;
 use Laravel\Passport\HasApiTokens;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Image\Enums\Fit;
@@ -36,7 +37,13 @@
 use Spatie\MediaLibrary\MediaCollections\File;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
-abstract class User extends Authenticatable implements AdminModel, HasMedia, MustVerifyEmail, PasswordUpdatableContract, UserContract
+abstract class User extends Authenticatable implements
+    AdminModel,
+    HasMedia,
+    MustVerifyEmail,
+    PasswordUpdatableContract,
+    UserContract,
+    OAuthenticatable
 {
     use CausesActivity;
     use HasApiTokens;