Merge pull request #4 from kg-bot/analysis-86vZW4

Apply fixes from StyleCI [ci skip] [skip ci]
kg-bot · Jun 23, 2018 · ca48b88 · ca48b88
2 parents e52eb76 + 4839134
commit ca48b88
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 283 deletions.
diff --git a/routes.php b/routes.php
@@ -3,88 +3,81 @@
  * Created by PhpStorm.
  * User: kgbot
  * Date: 6/4/18
- * Time: 12:18 AM
+ * Time: 12:18 AM.
  */
-
 use KgBot\LaravelDeploy\Http\Middleware\IsValidToken;
 
-Route::group( [
-    'prefix'     => config( 'laravel-deploy.routes.prefix' ),
-    'middleware' => array_merge( [ IsValidToken::class ], config( 'laravel-deploy.routes.middleware' ) ),
+Route::group([
+    'prefix'     => config('laravel-deploy.routes.prefix'),
+    'middleware' => array_merge([IsValidToken::class], config('laravel-deploy.routes.middleware')),
     'namespace'  => 'KgBot\LaravelDeploy\Http\Controllers',
 
 ], function () {
+    Route::any('deploy', 'DeployController@request')->name('laravel-deploy.deploy.request');
+});
 
-    Route::any( 'deploy', 'DeployController@request' )->name( 'laravel-deploy.deploy.request' );
-} );
-
-/**
+/*
  * Front-end routes
  */
-Route::group( [
+Route::group([
 
-    'prefix'     => config( 'laravel-deploy.routes.prefix' ) . '/dashboard',
-    'middleware' => array_merge( [ 'web', 'auth' ], config( 'laravel-deploy.front.routes.middleware' ) ),
-    'namespace'  => config( 'laravel-deploy.front.routes.namespace' ),
+    'prefix'     => config('laravel-deploy.routes.prefix').'/dashboard',
+    'middleware' => array_merge(['web', 'auth'], config('laravel-deploy.front.routes.middleware')),
+    'namespace'  => config('laravel-deploy.front.routes.namespace'),
 ], function () {
+    Route::get('', 'DashboardController@index')->name('laravel-deploy.dashboard');
+});
 
-    Route::get( '', 'DashboardController@index' )->name( 'laravel-deploy.dashboard' );
-} );
-
-/**
+/*
  * Ajax routes
  */
-Route::group( [
+Route::group([
 
-    'prefix'     => config( 'laravel-deploy.routes.prefix' ) . '/ajax',
-    'middleware' => array_merge( [ 'web', 'auth' ], config( 'laravel-deploy.front.routes.ajax.middleware' ) ),
-    'namespace'  => config( 'laravel-deploy.front.routes.ajax.namespace' ),
+    'prefix'     => config('laravel-deploy.routes.prefix').'/ajax',
+    'middleware' => array_merge(['web', 'auth'], config('laravel-deploy.front.routes.ajax.middleware')),
+    'namespace'  => config('laravel-deploy.front.routes.ajax.namespace'),
 ], function () {
+    Route::post('/clients/{client}/status', 'ClientsController@changeStatus')
+         ->name('laravel-deploy.ajax.clients.status');
 
-    Route::post( '/clients/{client}/status', 'ClientsController@changeStatus' )
-         ->name( 'laravel-deploy.ajax.clients.status' );
+    Route::post('/clients/{client}/auto-deploy', 'ClientsController@changeAutoDeploy')
+         ->name('laravel-deploy.ajax.clients.auto_deploy');
 
-    Route::post( '/clients/{client}/auto-deploy', 'ClientsController@changeAutoDeploy' )
-         ->name( 'laravel-deploy.ajax.clients.auto_deploy' );
+    Route::resource('/clients', 'ClientsController', [
 
-    Route::resource( '/clients', 'ClientsController', [
-
-        'only'  => [ 'index', 'store', 'update', 'destroy' ],
+        'only'  => ['index', 'store', 'update', 'destroy'],
         'names' => [
 
             'index'   => 'laravel-deploy.ajax.clients.index',
             'store'   => 'laravel-deploy.ajax.clients.store',
             'update'  => 'laravel-deploy.ajax.clients.update',
             'destroy' => 'laravel-deploy.ajax.clients.destroy',
         ],
-    ] );
+    ]);
 
-    /**
+    /*
      * Settings routes
      */
-    Route::group( [ 'prefix' => 'settings' ], function () {
-
-        Route::get( 'last-log', 'SettingsController@lastLog' )->name( 'laravel-deploy.ajax.settings.last_log' );
-        Route::get( 'logs', 'SettingsController@allLogs' )->name( 'laravel-deploy.ajax.settings.logs' );
-        Route::get( 'index', 'SettingsController@index' )->name( 'laravel-deploy.ajax.settings.index' );
+    Route::group(['prefix' => 'settings'], function () {
+        Route::get('last-log', 'SettingsController@lastLog')->name('laravel-deploy.ajax.settings.last_log');
+        Route::get('logs', 'SettingsController@allLogs')->name('laravel-deploy.ajax.settings.logs');
+        Route::get('index', 'SettingsController@index')->name('laravel-deploy.ajax.settings.index');
 
-        /**
+        /*
          * Deployments routes
          */
-        Route::group( [ 'prefix' => 'deployments' ], function () {
-
-            Route::post( 'deploy/now/{client}', 'SettingsController@deployNow' )
-                 ->name( 'laravel-deploy.ajax.settings.deployments.deploy_now' );
+        Route::group(['prefix' => 'deployments'], function () {
+            Route::post('deploy/now/{client}', 'SettingsController@deployNow')
+                 ->name('laravel-deploy.ajax.settings.deployments.deploy_now');
 
-            /**
+            /*
              * Deployment script routes
              */
-            Route::get( 'scripts/{client}', 'ClientScriptController@fetch' )
-                 ->name( 'laravel-deploy.ajax.settings.deployments.scripts.fetch' );
-
-            Route::post( 'scripts/{client}', 'ClientScriptController@save' )
-                 ->name( 'laravel-deploy.ajax.settings.deployments.scripts.save' );
-        } );
-
-    } );
-} );
+            Route::get('scripts/{client}', 'ClientScriptController@fetch')
+                 ->name('laravel-deploy.ajax.settings.deployments.scripts.fetch');
+
+            Route::post('scripts/{client}', 'ClientScriptController@save')
+                 ->name('laravel-deploy.ajax.settings.deployments.scripts.save');
+        });
+    });
+});
diff --git a/src/Http/Controllers/DeployController.php b/src/Http/Controllers/DeployController.php
@@ -3,38 +3,36 @@
  * Created by PhpStorm.
  * User: kgbot
  * Date: 6/4/18
- * Time: 12:40 AM
+ * Time: 12:40 AM.
  */
 
 namespace KgBot\LaravelDeploy\Http\Controllers;
 
 use Illuminate\Http\Request;
-use KgBot\LaravelDeploy\Exceptions\UnableToReadScriptFile;
-use KgBot\LaravelDeploy\Jobs\DeployJob;
 use KgBot\LaravelDeploy\Models\Client;
+use KgBot\LaravelDeploy\Jobs\DeployJob;
+use KgBot\LaravelDeploy\Exceptions\UnableToReadScriptFile;
 
 class DeployController extends BaseController
 {
-    public function request( Request $request )
+    public function request(Request $request)
     {
-        $client = Client::where( [
-
-            [ 'token', $request->get( '_token' ) ],
-            [ 'active', true ],
-            [ 'auto_deploy', true ],
-        ] )->first();
+        $client = Client::where([
 
-        $filename    = $client->script_source;
-        $script_file = base_path( $filename );
+            ['token', $request->get('_token')],
+            ['active', true],
+            ['auto_deploy', true],
+        ])->first();
 
-        if ( !file_exists( $script_file ) ) {
+        $filename = $client->script_source;
+        $script_file = base_path($filename);
 
+        if (! file_exists($script_file)) {
             throw new UnableToReadScriptFile();
-
         }
 
-        dispatch( new DeployJob( $client, $script_file ) )->onQueue( config( 'laravel-deploy.queue', 'default' ) );
+        dispatch(new DeployJob($client, $script_file))->onQueue(config('laravel-deploy.queue', 'default'));
 
-        return response()->json( 'success' );
+        return response()->json('success');
     }
-}
+}
diff --git a/src/Http/Controllers/Front/Ajax/ClientScriptController.php b/src/Http/Controllers/Front/Ajax/ClientScriptController.php
@@ -3,49 +3,40 @@
 namespace KgBot\LaravelDeploy\Http\Controllers\Front\Ajax;
 
 use Illuminate\Http\Request;
-use KgBot\LaravelDeploy\Http\Controllers\BaseController;
 use KgBot\LaravelDeploy\Models\Client;
 use League\Flysystem\FileNotFoundException;
+use KgBot\LaravelDeploy\Http\Controllers\BaseController;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 class ClientScriptController extends BaseController
 {
-    public function fetch( Client $client )
+    public function fetch(Client $client)
     {
-        $filepath = base_path( DIRECTORY_SEPARATOR . $client->script_source );
-
-        if ( file_exists( $filepath ) ) {
+        $filepath = base_path(DIRECTORY_SEPARATOR.$client->script_source);
 
-            $content = file_get_contents( $filepath );
-
-            return response()->json( compact( 'content' ) );
+        if (file_exists($filepath)) {
+            $content = file_get_contents($filepath);
 
+            return response()->json(compact('content'));
         } else {
-
-            throw new FileNotFoundException( 'We can\'t find deploy script defined for this client' );
+            throw new FileNotFoundException('We can\'t find deploy script defined for this client');
         }
     }
 
-    public function save( Client $client, Request $request )
+    public function save(Client $client, Request $request)
     {
-        if ( $request->has( 'content' ) && $content = $request->get( 'content' ) ) {
-
-            $filepath = base_path( DIRECTORY_SEPARATOR . $client->script_source );
+        if ($request->has('content') && $content = $request->get('content')) {
+            $filepath = base_path(DIRECTORY_SEPARATOR.$client->script_source);
 
-            if ( file_exists( $filepath ) ) {
-
-                file_put_contents( $filepath, $content );
-
-                return response()->json( 'success' );
+            if (file_exists($filepath)) {
+                file_put_contents($filepath, $content);
 
+                return response()->json('success');
             } else {
-
-                throw new FileNotFoundException( 'We can\'t find deploy script defined for this client' );
+                throw new FileNotFoundException('We can\'t find deploy script defined for this client');
             }
-
         } else {
-
-            throw new BadRequestHttpException( 'Parameter content is required.' );
+            throw new BadRequestHttpException('Parameter content is required.');
         }
     }
 }
diff --git a/src/Http/Controllers/Front/Ajax/ClientsController.php b/src/Http/Controllers/Front/Ajax/ClientsController.php
@@ -2,9 +2,9 @@
 
 namespace KgBot\LaravelDeploy\Http\Controllers\Front\Ajax;
 
+use KgBot\LaravelDeploy\Models\Client;
 use KgBot\LaravelDeploy\Http\Controllers\BaseController;
 use KgBot\LaravelDeploy\Http\Requests\Clients\ClientRequest;
-use KgBot\LaravelDeploy\Models\Client;
 
 class ClientsController extends BaseController
 {
@@ -17,7 +17,7 @@ public function index()
     {
         $clients = Client::all();
 
-        return response()->json( compact( 'clients' ) );
+        return response()->json(compact('clients'));
     }
 
     /**
@@ -27,11 +27,11 @@ public function index()
      *
      * @return \Illuminate\Http\Response
      */
-    public function store( ClientRequest $request )
+    public function store(ClientRequest $request)
     {
-        $client = Client::create( $request->all() );
+        $client = Client::create($request->all());
 
-        return response()->json( compact( 'client' ) );
+        return response()->json(compact('client'));
     }
 
     /**
@@ -42,11 +42,11 @@ public function store( ClientRequest $request )
      *
      * @return \Illuminate\Http\Response
      */
-    public function update( ClientRequest $request, Client $client )
+    public function update(ClientRequest $request, Client $client)
     {
-        $client->update( $request->all() );
+        $client->update($request->all());
 
-        return response()->json( compact( 'client' ) );
+        return response()->json(compact('client'));
     }
 
     /**
@@ -56,24 +56,24 @@ public function update( ClientRequest $request, Client $client )
      *
      * @return \Illuminate\Http\Response
      */
-    public function destroy( Client $client )
+    public function destroy(Client $client)
     {
         $client->delete();
 
-        return response()->json( 'success' );
+        return response()->json('success');
     }
 
-    public function changeStatus( Client $client )
+    public function changeStatus(Client $client)
     {
         $client->changeStatus();
 
-        return response()->json( 'success' );
+        return response()->json('success');
     }
 
-    public function changeAutoDeploy( Client $client )
+    public function changeAutoDeploy(Client $client)
     {
         $client->changeAutoDeploy();
 
-        return response()->json( compact( $client ) );
+        return response()->json(compact($client));
     }
 }