Merge pull request #717 from HDInnovations/analysis-8nEOdA

Apply fixes from StyleCI
HDInnovations · May 5, 2019 · a755cf2 · a755cf2
2 parents 88c8d6f + 4eecc04
commit a755cf2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 23 deletions.
diff --git a/app/Helpers/Markdown.php b/app/Helpers/Markdown.php
@@ -479,7 +479,7 @@ protected function blockHeader($Line)
 
     protected function blockList($Line)
     {
-        list($name, $pattern) = $Line['text'][0] <= '-' ? ['ul', '[*+-]'] : ['ol', '[0-9]+[.]'];
+        [$name, $pattern] = $Line['text'][0] <= '-' ? ['ul', '[*+-]'] : ['ol', '[0-9]+[.]'];
 
         if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches)) {
             $Block = [

diff --git a/app/Http/Controllers/Auth/ApplicationController.php b/app/Http/Controllers/Auth/ApplicationController.php
@@ -54,8 +54,7 @@ public function store(Request $request)
                     'links.*' => 'filled',
                     'links'   => 'min:2',
                 ]);
-            }
-            else {
+            } else {
                 $v = validator($request->all(), [
                     'type' => 'required',
                     'email' => 'required|email|unique:invites|unique:users|unique:applications|email_list:allow',
@@ -65,7 +64,7 @@ public function store(Request $request)
                     'links.*' => 'filled',
                     'links'   => 'min:2',
                     'g-recaptcha-response' => 'required|recaptcha',
-                ]);                
+                ]);
             }
         } elseif (config('email-white-blacklist.enabled') === 'block') {
             if (config('captcha.enabled') == false) {
@@ -78,8 +77,7 @@ public function store(Request $request)
                     'links.*' => 'filled',
                     'links'   => 'min:2',
                 ]);
-            }
-            else {
+            } else {
                 $v = validator($request->all(), [
                     'type' => 'required',
                     'email' => 'required|email|unique:invites|unique:users|unique:applications|email_list:block',
@@ -102,8 +100,7 @@ public function store(Request $request)
                     'links.*' => 'filled',
                     'links'   => 'min:2',
                 ]);
-            }
-            else {
+            } else {
                 $v = validator($request->all(), [
                     'type' => 'required',
                     'email' => 'required|email|unique:invites|unique:users|unique:applications',

diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -14,10 +14,9 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Password;
 
 class ForgotPasswordController extends Controller
 {
@@ -27,17 +26,16 @@ public function __construct()
     {
         $this->middleware('guest');
     }
-    
+
     protected function validateEmail(Request $request)
     {
         if (config('captcha.enabled') == false) {
-		$request->validate(['email' => 'required|email']);
-		}
-		else{
-			$request->validate([
-				'email' => 'required|email',
-				'g-recaptcha-response' => 'required|recaptcha',
-			]);
-		}
-    }	    
+            $request->validate(['email' => 'required|email']);
+        } else {
+            $request->validate([
+                'email' => 'required|email',
+                'g-recaptcha-response' => 'required|recaptcha',
+            ]);
+        }
+    }
 }
diff --git a/app/Http/Controllers/Auth/ForgotUsernameController.php b/app/Http/Controllers/Auth/ForgotUsernameController.php
@@ -44,8 +44,7 @@ public function sendUsernameReminder(Request $request)
             $v = validator($request->all(), [
                 'email' => 'required',
             ]);
-        }
-        else {
+        } else {
             $v = validator($request->all(), [
                 'email' => 'required',
                 'g-recaptcha-response' => 'required|recaptcha',

diff --git a/app/Http/Controllers/NotificationController.php b/app/Http/Controllers/NotificationController.php
@@ -15,8 +15,8 @@
 namespace App\Http\Controllers;
 
 use Carbon\Carbon;
-use Illuminate\Http\Request;
 use App\Models\Notification;
+use Illuminate\Http\Request;
 
 class NotificationController extends Controller
 {