Merge pull request #16 from mikebronner/feat/14-add-php-8-5-support

mikebronner · web-flow · commit dbfe8df7dfe3 · 2026-03-30T15:47:34.000-07:00
feat(php): Add PHP 8.5 support
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,23 +9,34 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.2', '8.3', '8.4']
-        laravel: ['10.*', '11.*']
+        php: ['8.2', '8.3', '8.4', '8.5']
+        laravel: ['^11.0', '^12.0']
+        exclude:
+          - php: '8.5'
+            laravel: '11.*'
+          - php: '8.2'
+            laravel: '13.*'
+
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: mbstring, xml
+          extensions: mbstring, json
           coverage: none
+
       - name: Install dependencies
         run: |
-          composer require "illuminate/support:${{ matrix.laravel }}" --no-interaction --no-update
-          composer update --prefer-dist --no-interaction
+          composer require "illuminate/support:${{ matrix.laravel }}" --no-update
+          composer update --prefer-dist --no-interaction --no-progress
+
       - name: Run tests
         run: vendor/bin/pest
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /vendor
 composer.lock
+.phpunit.result.cache
diff --git a/README.md b/README.md
@@ -20,9 +20,9 @@ We thank the following sponsors for their generosity, please take a moment to ch
 
 ## Requirements
 
--   PHP 7.2+
--   Laravel 7.x
--   Socialite 4.2+
+-   PHP 8.2, 8.3, 8.4, 8.5
+-   Laravel 10.x, 11.x, 12.x
+-   Socialite 5.3+
 
 <a name="Installation"></a>
 
diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
         "illuminate/auth": "^10.0|^11.0|^12.0",
         "illuminate/database": "^10.0|^11.0|^12.0",
         "illuminate/support": "^10.0|^11.0|^12.0",
-        "laravel/socialite": "^5.3",
-        "genealabs/laravel-overridable-model": "^10.0|^11.0|^12.0"
+        "laravel/socialite": "^5.3"
     },
     "require-dev": {
         "orchestra/testbench": "^8.0|^9.0|^10.0",
-        "pestphp/pest": "^2.0|^3.0"
+        "phpunit/phpunit": "^10.0|^11.0",
+        "pestphp/pest": "^2.0|^3.0|^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,7 @@
     "config": {
         "allow-plugins": {
             "pestphp/pest-plugin": true,
-            "symfony/thanks": false
+            "symfony/thanks": true
         }
     },
     "scripts": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -5,8 +5,8 @@
          colors="true"
 >
     <testsuites>
-        <testsuite name="Tests">
-            <directory>tests</directory>
+        <testsuite name="Unit">
+            <directory>tests/Unit</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/src/SocialCredentials.php b/src/SocialCredentials.php
@@ -2,17 +2,12 @@
 
 namespace GeneaLabs\LaravelSocialiter;
 
-use GeneaLabs\LaravelOverridableModel\Traits\Overridable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class SocialCredentials extends Model
 {
-    use Overridable;
 
-    protected $dates = [
-        "expires_at",
-    ];
     protected $fillable = [
         "access_token",
         "avatar",
@@ -26,6 +21,13 @@ class SocialCredentials extends Model
         "user_id",
     ];
 
+    protected function casts(): array
+    {
+        return [
+            "expires_at" => "datetime",
+        ];
+    }
+
     public function user() : BelongsTo
     {
         $userClass = config("auth.providers.users.model");
diff --git a/src/Socialiter.php b/src/Socialiter.php
@@ -114,8 +114,7 @@ protected function createUser(AbstractUser $socialiteUser): Model
 
     protected function createCredentials(AbstractUser $socialiteUser): SocialCredentials
     {
-        $credentialsModel = SocialCredentials::model();
-        $socialiteCredentials = (new $credentialsModel)
+        $socialiteCredentials = (new SocialCredentials)
             ->with("user")
             ->firstOrNew([
                 "provider_id" => $socialiteUser->getId(),
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -2,4 +2,4 @@
 
 use GeneaLabs\LaravelSocialiter\Tests\TestCase;
 
-uses(TestCase::class)->in(__DIR__);
+uses(TestCase::class)->in("Unit");
diff --git a/tests/Unit/CustomRegistrationTest.php b/tests/Unit/CustomRegistrationTest.php
diff --git a/tests/Unit/MigrationTest.php b/tests/Unit/MigrationTest.php
diff --git a/tests/Unit/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace GeneaLabs\LaravelSocialiter\Tests;
+
+use GeneaLabs\LaravelSocialiter\Providers\ServiceProvider;
+use Orchestra\Testbench\TestCase;
+
+class ServiceProviderTest extends TestCase
+{
+    protected function getPackageProviders($app): array
+    {
+        return [ServiceProvider::class];
+    }
+
+    public function test_service_provider_boots_without_error(): void
+    {
+        $this->assertTrue(
+            $this->app->providerIsLoaded(ServiceProvider::class)
+        );
+    }
+
+    public function test_socialiter_facade_is_bound(): void
+    {
+        $this->assertTrue($this->app->bound('socialiter'));
+    }
+}
diff --git a/tests/Unit/SocialLoginTest.php b/tests/Unit/SocialLoginTest.php
@@ -113,8 +113,7 @@ function makeSocialiteUser(array $overrides = []): SocialiteUser
         'password' => Hash::make('password'),
     ]);
 
-    $credentialModel = SocialCredentials::model();
-    (new $credentialModel)->create([
+    SocialCredentials::create([
         'user_id' => $user->id,
         'provider_id' => 'provider-789',
         'provider_name' => 'google',

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/vendor`
`2`	`2`	`composer.lock`
	`3`	`+.phpunit.result.cache`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,7 @@ protected function createUser(AbstractUser $socialiteUser): Model`
`114`	`114`
`115`	`115`	`protected function createCredentials(AbstractUser $socialiteUser): SocialCredentials`
`116`	`116`	`{`
`117`		`- $credentialsModel = SocialCredentials::model();`
`118`		`- $socialiteCredentials = (new $credentialsModel)`
	`117`	`+ $socialiteCredentials = (new SocialCredentials)`
`119`	`118`	`->with("user")`
`120`	`119`	`->firstOrNew([`
`121`	`120`	`"provider_id" => $socialiteUser->getId(),`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`use GeneaLabs\LaravelSocialiter\Tests\TestCase;`
`4`	`4`
`5`		`-uses(TestCase::class)->in(__DIR__);`
	`5`	`+uses(TestCase::class)->in("Unit");`