micheledamo / laravel-web-artisan

src/LaravelWebArtisanServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     public function boot()
     {
         $this->publishes([
-            __DIR__.'/../config/config.php' => config_path('webartisan.php'),
+            __DIR__ . '/../config/config.php' => config_path('webartisan.php'),
         ], 'config');
 
         $routeConfig = [
@@ -33,7 +33,7 @@ 
             ]);
         });
 
-        $this->loadViewsFrom(__DIR__.'/Resources/Views', 'webartisan');
+        $this->loadViewsFrom(__DIR__ . '/Resources/Views', 'webartisan');
 
         $this->registerMiddleware(WebArtisanEnabled::class);
     }
@@ -45,7 +45,7 @@ 
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'webartisan');
+        $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'webartisan');
     }
 
     /**

src/LaravelWebArtisan.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	public function __construct($app = null)
 	{
         if (!$app) {
-            $app = app();   //Fallback when $app is not given
+            $app = app(); //Fallback when $app is not given
         }
         $this->app = $app;
 

Indentation +3 added lines, -3 removed lines

@@ -39,8 +39,8 @@ 
      *
      * @param null $app
      */
-	public function __construct($app = null)
-	{
+    public function __construct($app = null)
+    {
         if (!$app) {
             $app = app();   //Fallback when $app is not given
         }
@@ -49,7 +49,7 @@ 
         $this->enabled = value($this->app['config']->get('webartisan.enabled'));
         $this->use_authentication = value($this->app['config']->get('webartisan.use_authentication'));
         $this->authenticated = false;
-	}
+    }
 
     /**
      * Check if the Web Artisan is enabled

src/Middleware/WebArtisanEnabled.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     public function handle($request, Closure $next)
     {
         $response = $next($request);
-        if ($response instanceof Response and $this->webartisan->isEnabled() and $request->url() != asset(config('webartisan.route_prefix').'/run')) {
+        if ($response instanceof Response and $this->webartisan->isEnabled() and $request->url() != asset(config('webartisan.route_prefix') . '/run')) {
             try {
                 $response->getContent();
             }
@@ -44,7 +44,7 @@ 
                 return $response;
             }
 
-            if(!$this->webartisan->useAuthentication()
+            if (!$this->webartisan->useAuthentication()
                 or ($this->webartisan->useAuthentication()
                     and $request->session()->has('webartisan__authenticated'))) {
 

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
         if ($response instanceof Response and $this->webartisan->isEnabled() and $request->url() != asset(config('webartisan.route_prefix').'/run')) {
             try {
                 $response->getContent();
-            }
-            catch (\ErrorException $e) {
+            } catch (\ErrorException $e) {
                 return $response;
             }
 

src/Controllers/WebArtisanCommandController.php

Spacing +3 added lines, -3 removed lines

@@ -27,14 +27,14 @@
             ? $request->get('command')
             : null;
 
-        if($this->command) {
+        if ($this->command) {
             $commandPrepared = $this->prepareCommand($this->command);
-            if(!config('webartisan.use_authentication')
+            if (!config('webartisan.use_authentication')
                 or (config('webartisan.use_authentication') and $this->webartisan->isAuthenticated())) {
                     try {
                         Artisan::call($commandPrepared);
                     }
-                    catch(\Exception $e) {
+                    catch (\Exception $e) {
                         return $this->prepareResultToHtml($e->getMessage(), 'error');
                     }
             }

Braces +2 added lines, -4 removed lines

@@ -33,12 +33,10 @@
                 or (config('webartisan.use_authentication') and $this->webartisan->isAuthenticated())) {
                     try {
                         Artisan::call($commandPrepared);
-                    }
-                    catch(\Exception $e) {
+                    } catch(\Exception $e) {
                         return $this->prepareResultToHtml($e->getMessage(), 'error');
                     }
-            }
-            else {
+            } else {
                 return $this->prepareResultToHtml('Please, authenticate yourself before to start using Web Artisan.', 'error');
             }
             return $this->prepareResultToHtml(Artisan::output(), 'success');

src/Controllers/WebArtisanAuthController.php

Spacing +4 added lines, -4 removed lines

@@ -38,12 +38,12 @@
             ? $request->get('password')
             : null;
 
-        if($this->username and $this->password) {
+        if ($this->username and $this->password) {
             $authenticated = true;
-            if($this->username != config('webartisan.auth.username')) $authenticated = false;
-            if($this->password != config('webartisan.auth.password')) $authenticated = false;
+            if ($this->username != config('webartisan.auth.username')) $authenticated = false;
+            if ($this->password != config('webartisan.auth.password')) $authenticated = false;
 
-            if($authenticated) {
+            if ($authenticated) {
                 $request->session()->put('webartisan__authenticated', true);
                 return $this->prepareResultToHtml("Welcome", 'success');
             }

Braces +8 added lines, -3 removed lines

@@ -40,14 +40,19 @@
 
         if($this->username and $this->password) {
             $authenticated = true;
-            if($this->username != config('webartisan.auth.username')) $authenticated = false;
-            if($this->password != config('webartisan.auth.password')) $authenticated = false;
+            if($this->username != config('webartisan.auth.username')) {
+                $authenticated = false;
+            }
+            if($this->password != config('webartisan.auth.password')) {
+                $authenticated = false;
+            }
 
             if($authenticated) {
                 $request->session()->put('webartisan__authenticated', true);
                 return $this->prepareResultToHtml("Welcome", 'success');
+            } else {
+                return $this->prepareResultToHtml("Oops, it looks like we don't know each other.", 'error');
             }
-            else return $this->prepareResultToHtml("Oops, it looks like we don't know each other.", 'error');
         }
         return $this->prepareResultToHtml("Username and Password cannot be empty.", 'error');
     }