Initial changes to support Laravel 11

Author: avvertix

.github/workflows/ci.yml

@@ -21,11 +21,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [8.3, 8.4]
-        laravel: ["10.*"]
+        laravel: ["11.*"]
         stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
             carbon: ^2.63
 
     steps:

composer.json

@@ -18,11 +18,11 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/auth": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/encryption": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/view": "^10.0",
+        "illuminate/auth": "^11.0",
+        "illuminate/console": "^11.0",
+        "illuminate/encryption": "^11.0",
+        "illuminate/support": "^11.0",
+        "illuminate/view": "^11.0",
         "laravel/socialite": "^5.0",
         "socialiteproviders/gitlab": "^4.0",
         "socialiteproviders/dropbox": "^4.1"
@@ -33,7 +33,7 @@
         "larastan/larastan": "^2.9",
         "mockery/mockery": "^1.4.4",
         "phpunit/phpunit": "^10.5",
-        "orchestra/testbench": "^8.22"
+        "orchestra/testbench": "^9.9"
     },
     "autoload": {
         "psr-4": {

src/Console/Commands/ScaffoldAuthenticationControllers.php

@@ -97,7 +97,7 @@ protected function identifyApplicationNamespace()
                 $this->comment("Using [$this->namespace] as application namespace.");
             }
 
-            $this->modelNamespace = is_dir(app_path('Models')) ? $this->namespace.'\\Models' : $this->namespace;
+            $this->modelNamespace = is_dir(app_path('Models')) ? $this->namespace.'\Models' : $this->namespace;
         } catch (RuntimeException $ex) {
             $this->warn("Unable to identity the application namespace, assuming [$this->namespace].");
         }

tests/TestCase.php

@@ -59,6 +59,7 @@ protected function defineEnvironment($app)
             'database' => ':memory:',
             'prefix' => '',
         ]);
+        config()->set('session.driver', 'array');
         config()->set('services.gitlab', [
             'client_id' => 'aaa',
             'client_secret' => 'bbb',

tests/Unit/ConnectControllerTest.php

@@ -9,12 +9,14 @@
 use Mockery;
 use Oneofftech\Identities\Facades\Identity as IdentityFacade;
 use Oneofftech\Identities\Facades\IdentityCrypt;
+use Orchestra\Testbench\Attributes\WithMigration;
 use SocialiteProviders\GitLab\Provider;
 use SocialiteProviders\Manager\OAuth2\User as OauthUser;
 use Tests\Fixtures\Concern\UseTestFixtures;
 use Tests\Fixtures\User;
 use Tests\TestCase;
 
+#[WithMigration]
 class ConnectControllerTest extends TestCase
 {
     use RefreshDatabase, UseTestFixtures;

tests/Unit/IdentityLinkTest.php

@@ -11,7 +11,6 @@
 
 class IdentityLinkTest extends TestCase
 {
-    use DatabaseMigrations;
 
     protected function setUp(): void
     {

tests/Unit/IdentityModelsConfigurationTest.php

@@ -10,7 +10,6 @@
 
 class IdentityModelsConfigurationTest extends TestCase
 {
-    use DatabaseMigrations;
 
     public function test_default_models_uses_app_namespace()
     {

tests/Unit/IdentityServiceProviderTest.php

@@ -3,20 +3,23 @@
 namespace Tests\Unit;
 
 use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use InvalidArgumentException;
 use Laravel\Socialite\Two\FacebookProvider;
 use Oneofftech\Identities\Facades\Identity;
 use Oneofftech\Identities\IdentitiesManager;
 use Oneofftech\Identities\Providers\IdentitiesServiceProvider;
+use Orchestra\Testbench\Attributes\WithMigration;
 use SocialiteProviders\Dropbox\Provider as DropboxDriver;
 use SocialiteProviders\GitLab\GitLabExtendSocialite;
 use SocialiteProviders\GitLab\Provider as GitlabSocialiteProvider;
 use SocialiteProviders\Manager\SocialiteWasCalled;
 use Tests\TestCase;
 
+#[WithMigration]
 class IdentityServiceProviderTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     public function test_default_driver_cannot_not_configured()
     {

tests/Unit/IdentityTraitTest.php

@@ -8,10 +8,12 @@
 use Oneofftech\Identities\Facades\Identity as IdentityFacade;
 use Oneofftech\Identities\Facades\IdentityCrypt;
 use Oneofftech\Identities\Support\FindIdentity;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Tests\Fixtures\Identity;
 use Tests\Fixtures\User;
 use Tests\TestCase;
 
+#[WithMigration]
 class IdentityTraitTest extends TestCase
 {
     use FindIdentity, RefreshDatabase;

tests/Unit/InteractWithPreviousUrlTest.php

@@ -12,19 +12,19 @@ class InteractWithPreviousUrlTest extends TestCase
 
     public function test_previous_url_is_stored()
     {
-        Session::shouldReceive('previousUrl')->andReturn('http://localhost/previous');
-
-        Session::shouldReceive('put')->once()->with('_oot.identities.previous_url', 'http://localhost/previous');
+        Session::put('_previous.url', 'http://localhost/previous');
 
         $this->savePreviousUrl();
+
+        $this->assertEquals('http://localhost/previous', Session::get('_oot.identities.previous_url'));
     }
 
     public function test_previous_url_can_be_retrieved()
     {
-        Session::shouldReceive('previousUrl')->andReturnNull();
-
-        Session::shouldReceive('pull')->once()->with('_oot.identities.previous_url', 'http://localhost')->andReturn('http://localhost/previous');
+        Session::put('_previous.url', null);
 
+        Session::put('_oot.identities.previous_url', 'http://localhost/previous');
+        
         $url = $this->getPreviousUrl();
 
         $this->assertEquals('http://localhost/previous', $url);