Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit dbc65c3

Browse files
adenvtadenvt
committed
Merge branch 'feature/php-linter' into develop
2 parents f5e59d2 + 37a6a15 commit dbc65c3

File tree

19 files changed

+147
-127
lines changed

19 files changed

+147
-127
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ npm-debug.log
1818
yarn-error.log
1919
.env
2020
.DS_Store
21+
.php_cs.cache

‎.php_cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->exclude('vendor')
5+
->in(__DIR__)
6+
;
7+
8+
return PhpCsFixer\Config::create()
9+
->setRules([
10+
'@PSR2' => true,
11+
'binary_operator_spaces' => [
12+
'default' => 'align_single_space',
13+
],
14+
])
15+
->setFinder($finder)
16+
;

‎app/Http/Controllers/AppController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
class AppController extends Controller
88
{
9-
public function index (Request $request) {
9+
public function index(Request $request)
10+
{
1011
return view('app');
1112
}
1213
}

‎app/Http/Controllers/Auth/RegisterController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public function __construct()
4949
protected function validator(array $data)
5050
{
5151
return Validator::make($data, [
52-
'name' => 'required|string|max:255',
53-
'email' => 'required|string|email|max:255|unique:users',
52+
'name' => 'required|string|max:255',
53+
'email' => 'required|string|email|max:255|unique:users',
5454
'password' => 'required|string|min:6|confirmed',
5555
]);
5656
}
@@ -64,8 +64,8 @@ protected function validator(array $data)
6464
protected function create(array $data)
6565
{
6666
return User::create([
67-
'name' => $data['name'],
68-
'email' => $data['email'],
67+
'name' => $data['name'],
68+
'email' => $data['email'],
6969
'password' => Hash::make($data['password']),
7070
]);
7171
}

‎config/app.php‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -175,39 +175,39 @@
175175

176176
'aliases' => [
177177

178-
'App' => Illuminate\Support\Facades\App::class,
179-
'Artisan' => Illuminate\Support\Facades\Artisan::class,
180-
'Auth' => Illuminate\Support\Facades\Auth::class,
181-
'Blade' => Illuminate\Support\Facades\Blade::class,
182-
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
183-
'Bus' => Illuminate\Support\Facades\Bus::class,
184-
'Cache' => Illuminate\Support\Facades\Cache::class,
185-
'Config' => Illuminate\Support\Facades\Config::class,
186-
'Cookie' => Illuminate\Support\Facades\Cookie::class,
187-
'Crypt' => Illuminate\Support\Facades\Crypt::class,
188-
'DB' => Illuminate\Support\Facades\DB::class,
189-
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
190-
'Event' => Illuminate\Support\Facades\Event::class,
191-
'File' => Illuminate\Support\Facades\File::class,
192-
'Gate' => Illuminate\Support\Facades\Gate::class,
193-
'Hash' => Illuminate\Support\Facades\Hash::class,
194-
'Lang' => Illuminate\Support\Facades\Lang::class,
195-
'Log' => Illuminate\Support\Facades\Log::class,
196-
'Mail' => Illuminate\Support\Facades\Mail::class,
178+
'App' => Illuminate\Support\Facades\App::class,
179+
'Artisan' => Illuminate\Support\Facades\Artisan::class,
180+
'Auth' => Illuminate\Support\Facades\Auth::class,
181+
'Blade' => Illuminate\Support\Facades\Blade::class,
182+
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
183+
'Bus' => Illuminate\Support\Facades\Bus::class,
184+
'Cache' => Illuminate\Support\Facades\Cache::class,
185+
'Config' => Illuminate\Support\Facades\Config::class,
186+
'Cookie' => Illuminate\Support\Facades\Cookie::class,
187+
'Crypt' => Illuminate\Support\Facades\Crypt::class,
188+
'DB' => Illuminate\Support\Facades\DB::class,
189+
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
190+
'Event' => Illuminate\Support\Facades\Event::class,
191+
'File' => Illuminate\Support\Facades\File::class,
192+
'Gate' => Illuminate\Support\Facades\Gate::class,
193+
'Hash' => Illuminate\Support\Facades\Hash::class,
194+
'Lang' => Illuminate\Support\Facades\Lang::class,
195+
'Log' => Illuminate\Support\Facades\Log::class,
196+
'Mail' => Illuminate\Support\Facades\Mail::class,
197197
'Notification' => Illuminate\Support\Facades\Notification::class,
198-
'Password' => Illuminate\Support\Facades\Password::class,
199-
'Queue' => Illuminate\Support\Facades\Queue::class,
200-
'Redirect' => Illuminate\Support\Facades\Redirect::class,
201-
'Redis' => Illuminate\Support\Facades\Redis::class,
202-
'Request' => Illuminate\Support\Facades\Request::class,
203-
'Response' => Illuminate\Support\Facades\Response::class,
204-
'Route' => Illuminate\Support\Facades\Route::class,
205-
'Schema' => Illuminate\Support\Facades\Schema::class,
206-
'Session' => Illuminate\Support\Facades\Session::class,
207-
'Storage' => Illuminate\Support\Facades\Storage::class,
208-
'URL' => Illuminate\Support\Facades\URL::class,
209-
'Validator' => Illuminate\Support\Facades\Validator::class,
210-
'View' => Illuminate\Support\Facades\View::class,
198+
'Password' => Illuminate\Support\Facades\Password::class,
199+
'Queue' => Illuminate\Support\Facades\Queue::class,
200+
'Redirect' => Illuminate\Support\Facades\Redirect::class,
201+
'Redis' => Illuminate\Support\Facades\Redis::class,
202+
'Request' => Illuminate\Support\Facades\Request::class,
203+
'Response' => Illuminate\Support\Facades\Response::class,
204+
'Route' => Illuminate\Support\Facades\Route::class,
205+
'Schema' => Illuminate\Support\Facades\Schema::class,
206+
'Session' => Illuminate\Support\Facades\Session::class,
207+
'Storage' => Illuminate\Support\Facades\Storage::class,
208+
'URL' => Illuminate\Support\Facades\URL::class,
209+
'Validator' => Illuminate\Support\Facades\Validator::class,
210+
'View' => Illuminate\Support\Facades\View::class,
211211

212212
],
213213

‎config/broadcasting.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131
'connections' => [
3232

3333
'pusher' => [
34-
'driver' => 'pusher',
35-
'key' => env('PUSHER_APP_KEY'),
36-
'secret' => env('PUSHER_APP_SECRET'),
37-
'app_id' => env('PUSHER_APP_ID'),
34+
'driver' => 'pusher',
35+
'key' => env('PUSHER_APP_KEY'),
36+
'secret' => env('PUSHER_APP_SECRET'),
37+
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
39-
'cluster' => env('PUSHER_APP_CLUSTER'),
39+
'cluster' => env('PUSHER_APP_CLUSTER'),
4040
'encrypted' => true,
4141
],
4242
],
4343

4444
'redis' => [
45-
'driver' => 'redis',
45+
'driver' => 'redis',
4646
'connection' => 'default',
4747
],
4848

‎config/cache.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
],
4040

4141
'database' => [
42-
'driver' => 'database',
43-
'table' => 'cache',
42+
'driver' => 'database',
43+
'table' => 'cache',
4444
'connection' => null,
4545
],
4646

4747
'file' => [
4848
'driver' => 'file',
49-
'path' => storage_path('framework/cache/data'),
49+
'path' => storage_path('framework/cache/data'),
5050
],
5151

5252
'memcached' => [
53-
'driver' => 'memcached',
53+
'driver' => 'memcached',
5454
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
55-
'sasl' => [
55+
'sasl' => [
5656
env('MEMCACHED_USERNAME'),
5757
env('MEMCACHED_PASSWORD'),
5858
],
@@ -61,15 +61,15 @@
6161
],
6262
'servers' => [
6363
[
64-
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
65-
'port' => env('MEMCACHED_PORT', 11211),
64+
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
65+
'port' => env('MEMCACHED_PORT', 11211),
6666
'weight' => 100,
6767
],
6868
],
6969
],
7070

7171
'redis' => [
72-
'driver' => 'redis',
72+
'driver' => 'redis',
7373
'connection' => 'default',
7474
],
7575

‎config/database.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,48 +34,48 @@
3434
'connections' => [
3535

3636
'sqlite' => [
37-
'driver' => 'sqlite',
37+
'driver' => 'sqlite',
3838
'database' => env('DB_DATABASE', database_path('database.sqlite')),
39-
'prefix' => '',
39+
'prefix' => '',
4040
],
4141

4242
'mysql' => [
43-
'driver' => 'mysql',
44-
'host' => env('DB_HOST', '127.0.0.1'),
45-
'port' => env('DB_PORT', '3306'),
46-
'database' => env('DB_DATABASE', 'forge'),
47-
'username' => env('DB_USERNAME', 'forge'),
48-
'password' => env('DB_PASSWORD', ''),
43+
'driver' => 'mysql',
44+
'host' => env('DB_HOST', '127.0.0.1'),
45+
'port' => env('DB_PORT', '3306'),
46+
'database' => env('DB_DATABASE', 'forge'),
47+
'username' => env('DB_USERNAME', 'forge'),
48+
'password' => env('DB_PASSWORD', ''),
4949
'unix_socket' => env('DB_SOCKET', ''),
50-
'charset' => 'utf8mb4',
51-
'collation' => 'utf8mb4_unicode_ci',
52-
'prefix' => '',
53-
'strict' => true,
54-
'engine' => null,
50+
'charset' => 'utf8mb4',
51+
'collation' => 'utf8mb4_unicode_ci',
52+
'prefix' => '',
53+
'strict' => true,
54+
'engine' => null,
5555
],
5656

5757
'pgsql' => [
58-
'driver' => 'pgsql',
59-
'host' => env('DB_HOST', '127.0.0.1'),
60-
'port' => env('DB_PORT', '5432'),
58+
'driver' => 'pgsql',
59+
'host' => env('DB_HOST', '127.0.0.1'),
60+
'port' => env('DB_PORT', '5432'),
6161
'database' => env('DB_DATABASE', 'forge'),
6262
'username' => env('DB_USERNAME', 'forge'),
6363
'password' => env('DB_PASSWORD', ''),
64-
'charset' => 'utf8',
65-
'prefix' => '',
66-
'schema' => 'public',
67-
'sslmode' => 'prefer',
64+
'charset' => 'utf8',
65+
'prefix' => '',
66+
'schema' => 'public',
67+
'sslmode' => 'prefer',
6868
],
6969

7070
'sqlsrv' => [
71-
'driver' => 'sqlsrv',
72-
'host' => env('DB_HOST', 'localhost'),
73-
'port' => env('DB_PORT', '1433'),
71+
'driver' => 'sqlsrv',
72+
'host' => env('DB_HOST', 'localhost'),
73+
'port' => env('DB_PORT', '1433'),
7474
'database' => env('DB_DATABASE', 'forge'),
7575
'username' => env('DB_USERNAME', 'forge'),
7676
'password' => env('DB_PASSWORD', ''),
77-
'charset' => 'utf8',
78-
'prefix' => '',
77+
'charset' => 'utf8',
78+
'prefix' => '',
7979
],
8080

8181
],
@@ -109,9 +109,9 @@
109109
'client' => 'predis',
110110

111111
'default' => [
112-
'host' => env('REDIS_HOST', '127.0.0.1'),
112+
'host' => env('REDIS_HOST', '127.0.0.1'),
113113
'password' => env('REDIS_PASSWORD', null),
114-
'port' => env('REDIS_PORT', 6379),
114+
'port' => env('REDIS_PORT', 6379),
115115
'database' => 0,
116116
],
117117

‎config/filesystems.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@
4545

4646
'local' => [
4747
'driver' => 'local',
48-
'root' => storage_path('app'),
48+
'root' => storage_path('app'),
4949
],
5050

5151
'public' => [
52-
'driver' => 'local',
53-
'root' => storage_path('app/public'),
54-
'url' => env('APP_URL').'/storage',
52+
'driver' => 'local',
53+
'root' => storage_path('app/public'),
54+
'url' => env('APP_URL').'/storage',
5555
'visibility' => 'public',
5656
],
5757

5858
's3' => [
5959
'driver' => 's3',
60-
'key' => env('AWS_ACCESS_KEY_ID'),
60+
'key' => env('AWS_ACCESS_KEY_ID'),
6161
'secret' => env('AWS_SECRET_ACCESS_KEY'),
6262
'region' => env('AWS_DEFAULT_REGION'),
6363
'bucket' => env('AWS_BUCKET'),
64-
'url' => env('AWS_URL'),
64+
'url' => env('AWS_URL'),
6565
],
6666

6767
],

‎config/hashing.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
*/
4545

4646
'argon' => [
47-
'memory' => 1024,
47+
'memory' => 1024,
4848
'threads' => 2,
49-
'time' => 2,
49+
'time' => 2,
5050
],
5151

5252
];

0 commit comments

Comments
 (0)