Merge branch 'main' into magickExclude

.github/workflows/tests.yml

@@ -151,13 +151,13 @@ jobs:
 
     - name: Upload Screenshots
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: screenshots
         path: tests/Browser/screenshots
     - name: Upload Console Logs
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: console
         path: tests/Browser/console

routes/web.php

@@ -25,7 +25,7 @@
 });
 
 Route::middleware(['web'])->group(function () {
-    // Add social routes
+    // Add social redirect and callback routes
     Route::get('auth/{driver}/redirect', [SocialController::class, 'redirect']);
     Route::get('auth/{driver}/callback', [SocialController::class, 'callback']);
 

src/Actions/TwoFactorAuth/GenerateQrCodeAndSecretKey.php

@@ -21,7 +21,7 @@ class GenerateQrCodeAndSecretKey
     public function __invoke($user): array
     {
 
-        $google2fa = new Google2FA();
+        $google2fa = new Google2FA;
         $secret_key = $google2fa->generateSecretKey();
 
         $this->companyName = 'Auth';
@@ -38,7 +38,7 @@ public function __invoke($user): array
         $writer = new Writer(
             new ImageRenderer(
                 new RendererStyle(800),
-                new ImagickImageBackEnd()
+                new ImagickImageBackEnd
             )
         );
 

src/AuthServiceProvider.php

@@ -144,7 +144,7 @@ public function register()
 
         // Bind a singleton for the Google2FA service
         $this->app->singleton(Google2FA::class, function ($app) {
-            return new Google2FA();
+            return new Google2FA;
         });
 
         // Register the DuskServiceProvider

src/Traits/HasConfigs.php

@@ -30,7 +30,7 @@ private function arrayToObject($array)
             return $array;
         }
 
-        $object = new \stdClass();
+        $object = new \stdClass;
         foreach ($array as $key => $value) {
             $object->$key = $this->arrayToObject($value);
         }

tests/DuskTestCase.php

@@ -13,20 +13,14 @@ abstract class DuskTestCase extends BaseTestCase
 {
     use UsesDuskApiConfig;
 
-    // protected function setUp(): void
-    // {
-    //     // $this->resetConfig();
-    //     parent::setUp();
-    // }
-
     /**
      * Prepare for Dusk test execution.
      */
     #[BeforeClass]
     public static function prepare(): void
     {
         if (! static::runningInSail()) {
-            static::startChromeDriver();
+            static::startChromeDriver(['--port=9515']);
         }
     }
 

tests/Pest.php

@@ -5,23 +5,20 @@
     // Illuminate\Foundation\Testing\DatabaseMigrations::class,
 )->in('Browser');
 
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
 /*
 |--------------------------------------------------------------------------
 | Test Case
 |--------------------------------------------------------------------------
 |
 | The closure you provide to your test functions is always bound to a specific PHPUnit test
 | case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
+| need to change it using the "pest()" function to bind a different classes or traits.
 |
 */
 
-uses(
-    Tests\TestCase::class,
-    RefreshDatabase::class,
-)->in('Feature');
+pest()->extend(Tests\TestCase::class)
+    ->use(Illuminate\Foundation\Testing\RefreshDatabase::class)
+    ->in('Feature');
 
 /*
 |--------------------------------------------------------------------------

tests/TestCase.php

@@ -3,14 +3,8 @@
 namespace Tests;
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
-use Illuminate\Support\Facades\Artisan;
 
 abstract class TestCase extends BaseTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-        Artisan::call('view:clear');
-
-    }
+    //
 }