psr-4 fixes

Author: jeremykenedy

composer.json

@@ -19,10 +19,11 @@
         "laravel/framework": "6.*|7.*|8.*|9.*"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0",
-        "laravel/tinker": "^2.4",
         "illuminate/support": "^8.5",
-        "laravel/laravel": "^8.0"
+        "laravel/laravel": "^8.0",
+        "laravel/tinker": "^2.4",
+        "orchestra/testbench": "^6.0",
+        "suin/phpcs-psr4-sniff": "^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -42,7 +43,10 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "minimum-stability": "stable",
     "prefer-stable": true

src/App/Http/Controllers/TwoStepController.php

@@ -28,11 +28,13 @@ public function __construct()
     {
         $this->middleware('auth');
 
-        $this->middleware(function ($request, $next) {
-            $this->setUser2StepData();
+        $this->middleware(
+            function ($request, $next) {
+                $this->setUser2StepData();
 
-            return $next($request);
-        });
+                return $next($request);
+            }
+        );
     }
 
     /**
@@ -146,12 +148,14 @@ public function verify(Request $request)
         }
 
         if ($request->ajax()) {
-            $validator = Validator::make($request->all(), [
+            $validator = Validator::make(
+                $request->all(), [
                 'v_input_1' => 'required|min:1|max:1',
                 'v_input_2' => 'required|min:1|max:1',
                 'v_input_3' => 'required|min:1|max:1',
                 'v_input_4' => 'required|min:1|max:1',
-            ]);
+                ]
+            );
 
             if ($validator->fails()) {
                 $returnData = $this->invalidCodeReturnData($validator->errors());

src/App/Http/Middleware/Laravel2step.php

@@ -25,23 +25,23 @@ public function handle($request, Closure $next)
         $nextUri = config('app.url').'/'.$uri;
 
         switch ($uri) {
-            case 'verification/needed':
-            case 'password/reset':
-            case 'register':
-            case 'logout':
-            case 'login':
-            case '/':
-                break;
-
-            default:
-                session(['nextUri' => $nextUri]);
-
-                if (config('laravel2step.laravel2stepEnabled')) {
-                    if ($this->twoStepVerification($request) !== true) {
-                        return redirect('verification/needed');
-                    }
+        case 'verification/needed':
+        case 'password/reset':
+        case 'register':
+        case 'logout':
+        case 'login':
+        case '/':
+            break;
+
+        default:
+            session(['nextUri' => $nextUri]);
+
+            if (config('laravel2step.laravel2stepEnabled')) {
+                if ($this->twoStepVerification($request) !== true) {
+                    return redirect('verification/needed');
                 }
-                break;
+            }
+            break;
         }
 
         return $response;

src/Laravel2stepServiceProvider.php

@@ -49,28 +49,40 @@ private function publishFiles()
     {
         $publishTag = 'laravel2step';
 
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__.'/config/laravel2step.php' => base_path('config/laravel2step.php'),
-        ], $publishTag);
+            ], $publishTag
+        );
 
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__.'/database/migrations/' => base_path('/database/migrations'),
-        ], $publishTag);
+            ], $publishTag
+        );
 
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__.'/public/css' => public_path('css/laravel2step'),
-        ], $publishTag);
+            ], $publishTag
+        );
 
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__.'/resources/assets/scss' => resource_path('assets/scss/laravel2step'),
-        ], $publishTag);
+            ], $publishTag
+        );
 
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__.'/resources/views' => resource_path('views/vendor/laravel2step'),
-        ], $publishTag);
+            ], $publishTag
+        );
 
-        $this->publishes([
+        $this->publishes(
+            [
             __DIR__.'/resources/lang' => base_path('resources/lang/vendor/laravel2step'),
-        ], $publishTag);
+            ], $publishTag
+        );
     }
 }

src/database/migrations/2017_12_09_070937_create_two_step_auth_table.php

@@ -20,17 +20,19 @@ public function up()
         $tableCheck = Schema::connection($connection)->hasTable($table);
 
         if (!$tableCheck) {
-            Schema::connection($connection)->create($table, function (Blueprint $table) {
-                $table->increments('id');
-                $table->unsignedBigInteger('userId')->unsigned()->index();
-                $table->foreign('userId')->references('id')->on('users')->onDelete('cascade');
-                $table->string('authCode')->nullable();
-                $table->integer('authCount');
-                $table->boolean('authStatus')->default(false);
-                $table->dateTime('authDate')->nullable();
-                $table->dateTime('requestDate')->nullable();
-                $table->timestamps();
-            });
+            Schema::connection($connection)->create(
+                $table, function (Blueprint $table) {
+                    $table->increments('id');
+                    $table->unsignedBigInteger('userId')->unsigned()->index();
+                    $table->foreign('userId')->references('id')->on('users')->onDelete('cascade');
+                    $table->string('authCode')->nullable();
+                    $table->integer('authCount');
+                    $table->boolean('authStatus')->default(false);
+                    $table->dateTime('authDate')->nullable();
+                    $table->dateTime('requestDate')->nullable();
+                    $table->timestamps();
+                }
+            );
         }
     }
 

src/routes/web.php

@@ -5,10 +5,14 @@
 | Laravel 2-Step Verification Web Routes
 |--------------------------------------------------------------------------
 |
+| Here are the routes for two step verification middleware.
+|
 */
 
-Route::group(['prefix' => 'verification', 'as' => 'laravel2step::', 'namespace' => 'jeremykenedy\laravel2step\App\Http\Controllers', 'middleware' => ['web']], function () {
-    Route::get('/needed', ['uses' => 'TwoStepController@showVerification'])->name('verificationNeeded');
-    Route::post('/verify', ['uses' => 'TwoStepController@verify'])->name('verify');
-    Route::post('/resend', ['uses' => 'TwoStepController@resend'])->name('resend');
-});
+Route::group(
+    ['prefix' => 'verification', 'as' => 'laravel2step::', 'namespace' => 'jeremykenedy\laravel2step\App\Http\Controllers', 'middleware' => ['web']], function () {
+        Route::get('/needed', ['uses' => 'TwoStepController@showVerification'])->name('verificationNeeded');
+        Route::post('/verify', ['uses' => 'TwoStepController@verify'])->name('verify');
+        Route::post('/resend', ['uses' => 'TwoStepController@resend'])->name('resend');
+    }
+);