Skip to content

Commit ca48b88

Browse files
kg-botkg-bot
authored
Merge pull request #4 from kg-bot/analysis-86vZW4
Apply fixes from StyleCI [ci skip] [skip ci]
2 parents e52eb76 + 4839134 commit ca48b88

File tree

8 files changed

+237
-283
lines changed

8 files changed

+237
-283
lines changed

‎routes.php

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,88 +3,81 @@
33
* Created by PhpStorm.
44
* User: kgbot
55
* Date: 6/4/18
6-
* Time: 12:18 AM
6+
* Time: 12:18 AM.
77
*/
8-
98
use KgBot\LaravelDeploy\Http\Middleware\IsValidToken;
109

11-
Route::group( [
12-
'prefix' => config( 'laravel-deploy.routes.prefix' ),
13-
'middleware' => array_merge( [ IsValidToken::class ], config( 'laravel-deploy.routes.middleware' ) ),
10+
Route::group([
11+
'prefix' => config('laravel-deploy.routes.prefix'),
12+
'middleware' => array_merge([IsValidToken::class], config('laravel-deploy.routes.middleware')),
1413
'namespace' => 'KgBot\LaravelDeploy\Http\Controllers',
1514

1615
], function () {
16+
Route::any('deploy', 'DeployController@request')->name('laravel-deploy.deploy.request');
17+
});
1718

18-
Route::any( 'deploy', 'DeployController@request' )->name( 'laravel-deploy.deploy.request' );
19-
} );
20-
21-
/**
19+
/*
2220
* Front-end routes
2321
*/
24-
Route::group( [
22+
Route::group([
2523

26-
'prefix' => config( 'laravel-deploy.routes.prefix' ) . '/dashboard',
27-
'middleware' => array_merge( [ 'web', 'auth' ], config( 'laravel-deploy.front.routes.middleware' ) ),
28-
'namespace' => config( 'laravel-deploy.front.routes.namespace' ),
24+
'prefix' => config('laravel-deploy.routes.prefix').'/dashboard',
25+
'middleware' => array_merge(['web', 'auth'], config('laravel-deploy.front.routes.middleware')),
26+
'namespace' => config('laravel-deploy.front.routes.namespace'),
2927
], function () {
28+
Route::get('', 'DashboardController@index')->name('laravel-deploy.dashboard');
29+
});
3030

31-
Route::get( '', 'DashboardController@index' )->name( 'laravel-deploy.dashboard' );
32-
} );
33-
34-
/**
31+
/*
3532
* Ajax routes
3633
*/
37-
Route::group( [
34+
Route::group([
3835

39-
'prefix' => config( 'laravel-deploy.routes.prefix' ) . '/ajax',
40-
'middleware' => array_merge( [ 'web', 'auth' ], config( 'laravel-deploy.front.routes.ajax.middleware' ) ),
41-
'namespace' => config( 'laravel-deploy.front.routes.ajax.namespace' ),
36+
'prefix' => config('laravel-deploy.routes.prefix').'/ajax',
37+
'middleware' => array_merge(['web', 'auth'], config('laravel-deploy.front.routes.ajax.middleware')),
38+
'namespace' => config('laravel-deploy.front.routes.ajax.namespace'),
4239
], function () {
40+
Route::post('/clients/{client}/status', 'ClientsController@changeStatus')
41+
->name('laravel-deploy.ajax.clients.status');
4342

44-
Route::post( '/clients/{client}/status', 'ClientsController@changeStatus' )
45-
->name( 'laravel-deploy.ajax.clients.status' );
43+
Route::post('/clients/{client}/auto-deploy', 'ClientsController@changeAutoDeploy')
44+
->name('laravel-deploy.ajax.clients.auto_deploy');
4645

47-
Route::post( '/clients/{client}/auto-deploy', 'ClientsController@changeAutoDeploy' )
48-
->name( 'laravel-deploy.ajax.clients.auto_deploy' );
46+
Route::resource('/clients', 'ClientsController', [
4947

50-
Route::resource( '/clients', 'ClientsController', [
51-
52-
'only' => [ 'index', 'store', 'update', 'destroy' ],
48+
'only' => ['index', 'store', 'update', 'destroy'],
5349
'names' => [
5450

5551
'index' => 'laravel-deploy.ajax.clients.index',
5652
'store' => 'laravel-deploy.ajax.clients.store',
5753
'update' => 'laravel-deploy.ajax.clients.update',
5854
'destroy' => 'laravel-deploy.ajax.clients.destroy',
5955
],
60-
] );
56+
]);
6157

62-
/**
58+
/*
6359
* Settings routes
6460
*/
65-
Route::group( [ 'prefix' => 'settings' ], function () {
66-
67-
Route::get( 'last-log', 'SettingsController@lastLog' )->name( 'laravel-deploy.ajax.settings.last_log' );
68-
Route::get( 'logs', 'SettingsController@allLogs' )->name( 'laravel-deploy.ajax.settings.logs' );
69-
Route::get( 'index', 'SettingsController@index' )->name( 'laravel-deploy.ajax.settings.index' );
61+
Route::group(['prefix' => 'settings'], function () {
62+
Route::get('last-log', 'SettingsController@lastLog')->name('laravel-deploy.ajax.settings.last_log');
63+
Route::get('logs', 'SettingsController@allLogs')->name('laravel-deploy.ajax.settings.logs');
64+
Route::get('index', 'SettingsController@index')->name('laravel-deploy.ajax.settings.index');
7065

71-
/**
66+
/*
7267
* Deployments routes
7368
*/
74-
Route::group( [ 'prefix' => 'deployments' ], function () {
75-
76-
Route::post( 'deploy/now/{client}', 'SettingsController@deployNow' )
77-
->name( 'laravel-deploy.ajax.settings.deployments.deploy_now' );
69+
Route::group(['prefix' => 'deployments'], function () {
70+
Route::post('deploy/now/{client}', 'SettingsController@deployNow')
71+
->name('laravel-deploy.ajax.settings.deployments.deploy_now');
7872

79-
/**
73+
/*
8074
* Deployment script routes
8175
*/
82-
Route::get( 'scripts/{client}', 'ClientScriptController@fetch' )
83-
->name( 'laravel-deploy.ajax.settings.deployments.scripts.fetch' );
84-
85-
Route::post( 'scripts/{client}', 'ClientScriptController@save' )
86-
->name( 'laravel-deploy.ajax.settings.deployments.scripts.save' );
87-
} );
88-
89-
} );
90-
} );
76+
Route::get('scripts/{client}', 'ClientScriptController@fetch')
77+
->name('laravel-deploy.ajax.settings.deployments.scripts.fetch');
78+
79+
Route::post('scripts/{client}', 'ClientScriptController@save')
80+
->name('laravel-deploy.ajax.settings.deployments.scripts.save');
81+
});
82+
});
83+
});

‎src/Http/Controllers/DeployController.php

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,36 @@
33
* Created by PhpStorm.
44
* User: kgbot
55
* Date: 6/4/18
6-
* Time: 12:40 AM
6+
* Time: 12:40 AM.
77
*/
88

99
namespace KgBot\LaravelDeploy\Http\Controllers;
1010

1111
use Illuminate\Http\Request;
12-
use KgBot\LaravelDeploy\Exceptions\UnableToReadScriptFile;
13-
use KgBot\LaravelDeploy\Jobs\DeployJob;
1412
use KgBot\LaravelDeploy\Models\Client;
13+
use KgBot\LaravelDeploy\Jobs\DeployJob;
14+
use KgBot\LaravelDeploy\Exceptions\UnableToReadScriptFile;
1515

1616
class DeployController extends BaseController
1717
{
18-
public function request( Request $request )
18+
public function request(Request $request)
1919
{
20-
$client = Client::where( [
21-
22-
[ 'token', $request->get( '_token' ) ],
23-
[ 'active', true ],
24-
[ 'auto_deploy', true ],
25-
] )->first();
20+
$client = Client::where([
2621

27-
$filename = $client->script_source;
28-
$script_file = base_path( $filename );
22+
['token', $request->get('_token')],
23+
['active', true],
24+
['auto_deploy', true],
25+
])->first();
2926

30-
if ( !file_exists( $script_file ) ) {
27+
$filename = $client->script_source;
28+
$script_file = base_path($filename);
3129

30+
if (! file_exists($script_file)) {
3231
throw new UnableToReadScriptFile();
33-
3432
}
3533

36-
dispatch( new DeployJob( $client, $script_file ) )->onQueue( config( 'laravel-deploy.queue', 'default' ) );
34+
dispatch(new DeployJob($client, $script_file))->onQueue(config('laravel-deploy.queue', 'default'));
3735

38-
return response()->json( 'success' );
36+
return response()->json('success');
3937
}
40-
}
38+
}

‎src/Http/Controllers/Front/Ajax/ClientScriptController.php

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,40 @@
33
namespace KgBot\LaravelDeploy\Http\Controllers\Front\Ajax;
44

55
use Illuminate\Http\Request;
6-
use KgBot\LaravelDeploy\Http\Controllers\BaseController;
76
use KgBot\LaravelDeploy\Models\Client;
87
use League\Flysystem\FileNotFoundException;
8+
use KgBot\LaravelDeploy\Http\Controllers\BaseController;
99
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
1010

1111
class ClientScriptController extends BaseController
1212
{
13-
public function fetch( Client $client )
13+
public function fetch(Client $client)
1414
{
15-
$filepath = base_path( DIRECTORY_SEPARATOR . $client->script_source );
16-
17-
if ( file_exists( $filepath ) ) {
15+
$filepath = base_path(DIRECTORY_SEPARATOR.$client->script_source);
1816

19-
$content = file_get_contents( $filepath );
20-
21-
return response()->json( compact( 'content' ) );
17+
if (file_exists($filepath)) {
18+
$content = file_get_contents($filepath);
2219

20+
return response()->json(compact('content'));
2321
} else {
24-
25-
throw new FileNotFoundException( 'We can\'t find deploy script defined for this client' );
22+
throw new FileNotFoundException('We can\'t find deploy script defined for this client');
2623
}
2724
}
2825

29-
public function save( Client $client, Request $request )
26+
public function save(Client $client, Request $request)
3027
{
31-
if ( $request->has( 'content' ) && $content = $request->get( 'content' ) ) {
32-
33-
$filepath = base_path( DIRECTORY_SEPARATOR . $client->script_source );
28+
if ($request->has('content') && $content = $request->get('content')) {
29+
$filepath = base_path(DIRECTORY_SEPARATOR.$client->script_source);
3430

35-
if ( file_exists( $filepath ) ) {
36-
37-
file_put_contents( $filepath, $content );
38-
39-
return response()->json( 'success' );
31+
if (file_exists($filepath)) {
32+
file_put_contents($filepath, $content);
4033

34+
return response()->json('success');
4135
} else {
42-
43-
throw new FileNotFoundException( 'We can\'t find deploy script defined for this client' );
36+
throw new FileNotFoundException('We can\'t find deploy script defined for this client');
4437
}
45-
4638
} else {
47-
48-
throw new BadRequestHttpException( 'Parameter content is required.' );
39+
throw new BadRequestHttpException('Parameter content is required.');
4940
}
5041
}
5142
}

‎src/Http/Controllers/Front/Ajax/ClientsController.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace KgBot\LaravelDeploy\Http\Controllers\Front\Ajax;
44

5+
use KgBot\LaravelDeploy\Models\Client;
56
use KgBot\LaravelDeploy\Http\Controllers\BaseController;
67
use KgBot\LaravelDeploy\Http\Requests\Clients\ClientRequest;
7-
use KgBot\LaravelDeploy\Models\Client;
88

99
class ClientsController extends BaseController
1010
{
@@ -17,7 +17,7 @@ public function index()
1717
{
1818
$clients = Client::all();
1919

20-
return response()->json( compact( 'clients' ) );
20+
return response()->json(compact('clients'));
2121
}
2222

2323
/**
@@ -27,11 +27,11 @@ public function index()
2727
*
2828
* @return \Illuminate\Http\Response
2929
*/
30-
public function store( ClientRequest $request )
30+
public function store(ClientRequest $request)
3131
{
32-
$client = Client::create( $request->all() );
32+
$client = Client::create($request->all());
3333

34-
return response()->json( compact( 'client' ) );
34+
return response()->json(compact('client'));
3535
}
3636

3737
/**
@@ -42,11 +42,11 @@ public function store( ClientRequest $request )
4242
*
4343
* @return \Illuminate\Http\Response
4444
*/
45-
public function update( ClientRequest $request, Client $client )
45+
public function update(ClientRequest $request, Client $client)
4646
{
47-
$client->update( $request->all() );
47+
$client->update($request->all());
4848

49-
return response()->json( compact( 'client' ) );
49+
return response()->json(compact('client'));
5050
}
5151

5252
/**
@@ -56,24 +56,24 @@ public function update( ClientRequest $request, Client $client )
5656
*
5757
* @return \Illuminate\Http\Response
5858
*/
59-
public function destroy( Client $client )
59+
public function destroy(Client $client)
6060
{
6161
$client->delete();
6262

63-
return response()->json( 'success' );
63+
return response()->json('success');
6464
}
6565

66-
public function changeStatus( Client $client )
66+
public function changeStatus(Client $client)
6767
{
6868
$client->changeStatus();
6969

70-
return response()->json( 'success' );
70+
return response()->json('success');
7171
}
7272

73-
public function changeAutoDeploy( Client $client )
73+
public function changeAutoDeploy(Client $client)
7474
{
7575
$client->changeAutoDeploy();
7676

77-
return response()->json( compact( $client ) );
77+
return response()->json(compact($client));
7878
}
7979
}

0 commit comments

Comments
 (0)