@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | $response = $this->broker()->reset( |
63 | 63 | $this->credentials($request), |
64 | - function ($user, $password) { |
|
64 | + function($user, $password) { |
|
65 | 65 | $this->resetPassword($user, $password); |
66 | 66 | } |
67 | 67 | ); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $response == Password::PASSWORD_RESET |
71 | 71 | ? $this->sendSuccessResponse() |
72 | 72 | : $this->sendFailedResponse( |
73 | - ['token' => 'Your reset link has expired. Please try to resend it again.'], |
|
73 | + [ 'token' => 'Your reset link has expired. Please try to resend it again.' ], |
|
74 | 74 | self::HTTP_CODE_BAD_REQUEST |
75 | 75 | ); |
76 | 76 | } |
@@ -17,66 +17,66 @@ discard block |
||
17 | 17 | */ |
18 | 18 | public function sendFailedResponse(array $errors, int $statusCode) |
19 | 19 | { |
20 | - $errorsJson = []; |
|
21 | - if (!empty($errors['email'])) { |
|
20 | + $errorsJson = [ ]; |
|
21 | + if (!empty($errors[ 'email' ])) { |
|
22 | 22 | $emailError = [ |
23 | 23 | 'status' => $statusCode, |
24 | 24 | 'title' => 'Email error', |
25 | - 'detail' => $errors['email'][0] |
|
25 | + 'detail' => $errors[ 'email' ][ 0 ] |
|
26 | 26 | ]; |
27 | 27 | array_push($errorsJson, $emailError); |
28 | 28 | } |
29 | 29 | |
30 | - if (!empty($errors['password'])) { |
|
30 | + if (!empty($errors[ 'password' ])) { |
|
31 | 31 | $passwordError = [ |
32 | 32 | 'status' => $statusCode, |
33 | 33 | 'title' => 'Password error', |
34 | - 'detail' => $errors['password'][0] |
|
34 | + 'detail' => $errors[ 'password' ][ 0 ] |
|
35 | 35 | ]; |
36 | 36 | array_push($errorsJson, $passwordError); |
37 | 37 | } |
38 | 38 | |
39 | - if (!empty($errors['password_confirmation'])) { |
|
39 | + if (!empty($errors[ 'password_confirmation' ])) { |
|
40 | 40 | $passwordConfirmationError = [ |
41 | 41 | 'status' => $statusCode, |
42 | 42 | 'title' => 'Password error', |
43 | - 'detail' => $errors['password_confirmation'][0] |
|
43 | + 'detail' => $errors[ 'password_confirmation' ][ 0 ] |
|
44 | 44 | ]; |
45 | 45 | array_push($errorsJson, $passwordConfirmationError); |
46 | 46 | } |
47 | 47 | |
48 | - if (!empty($errors['name'])) { |
|
48 | + if (!empty($errors[ 'name' ])) { |
|
49 | 49 | $nameError = [ |
50 | 50 | 'status' => $statusCode, |
51 | 51 | 'title' => 'Name error', |
52 | - 'detail' => $errors['name'][0] |
|
52 | + 'detail' => $errors[ 'name' ][ 0 ] |
|
53 | 53 | ]; |
54 | 54 | array_push($errorsJson, $nameError); |
55 | 55 | } |
56 | 56 | |
57 | - if (!empty($errors['token'])) { |
|
57 | + if (!empty($errors[ 'token' ])) { |
|
58 | 58 | $tokenError = [ |
59 | 59 | 'status' => $statusCode, |
60 | 60 | 'title' => 'Token error', |
61 | - 'detail' => $errors['token'] |
|
61 | + 'detail' => $errors[ 'token' ] |
|
62 | 62 | ]; |
63 | 63 | array_push($errorsJson, $tokenError); |
64 | 64 | } |
65 | 65 | |
66 | - if (!empty($errors['token'])) { |
|
66 | + if (!empty($errors[ 'token' ])) { |
|
67 | 67 | $tokenError = [ |
68 | 68 | 'status' => $statusCode, |
69 | 69 | 'title' => 'Token error', |
70 | - 'detail' => $errors['token'] |
|
70 | + 'detail' => $errors[ 'token' ] |
|
71 | 71 | ]; |
72 | 72 | array_push($errorsJson, $tokenError); |
73 | 73 | } |
74 | 74 | |
75 | - if (!empty($errors['activation_hash'])) { |
|
75 | + if (!empty($errors[ 'activation_hash' ])) { |
|
76 | 76 | $activationHashError = [ |
77 | 77 | 'status' => $statusCode, |
78 | 78 | 'title' => 'Activation hash error', |
79 | - 'detail' => $errors['activation_hash'][0] |
|
79 | + 'detail' => $errors[ 'activation_hash' ][ 0 ] |
|
80 | 80 | ]; |
81 | 81 | array_push($errorsJson, $activationHashError); |
82 | 82 | } |
@@ -96,6 +96,6 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function sendSuccessResponse() |
98 | 98 | { |
99 | - return response()->json([], self::HTTP_CODE_OK); |
|
99 | + return response()->json([ ], self::HTTP_CODE_OK); |
|
100 | 100 | } |
101 | 101 | } |
@@ -104,8 +104,8 @@ |
||
104 | 104 | { |
105 | 105 | return Mail::send( |
106 | 106 | $this->activationEmailTemplate, |
107 | - ['hash' => $hash], |
|
108 | - function ($message) use ($user) { |
|
107 | + [ 'hash' => $hash ], |
|
108 | + function($message) use ($user) { |
|
109 | 109 | $message->to($user->email, $user->usename)->subject('Laravel api boilerplate'); |
110 | 110 | } |
111 | 111 | ); |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | |
34 | 34 | Mail::send( |
35 | 35 | $this->remindPasswordEmailTemplate, |
36 | - ['hash' => $token, 'email' => $email], |
|
37 | - function ($message) use ($user) { |
|
36 | + [ 'hash' => $token, 'email' => $email ], |
|
37 | + function($message) use ($user) { |
|
38 | 38 | $message->to($user->email, $user->usename)->subject('Laravel api boilerplate'); |
39 | 39 | } |
40 | 40 | ); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $user = Auth::user(); |
56 | 56 | |
57 | 57 | if (Hash::check($request->get('current_password'), $user->password)) { |
58 | - $user->password = Hash::make($request['password']); |
|
58 | + $user->password = Hash::make($request[ 'password' ]); |
|
59 | 59 | $user->save(); |
60 | 60 | |
61 | 61 | return true; |
@@ -175,8 +175,8 @@ |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
178 | - * @param $src |
|
179 | - * @param $dst |
|
178 | + * @param string $src |
|
179 | + * @param string $dst |
|
180 | 180 | */ |
181 | 181 | protected function recurse_copy($src,$dst) |
182 | 182 | { |
@@ -4,9 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | 6 | use org\bovigo\vfs\vfsStream; |
7 | -use Symfony\Component\Console\Input\InputInterface; |
|
8 | -use Symfony\Component\Console\Output\OutputInterface; |
|
9 | - |
|
10 | 7 | use org\bovigo\vfs\vfsStreamDirectory; |
11 | 8 | use org\bovigo\vfs\vfsStreamWrapper; |
12 | 9 |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | /** |
62 | 62 | * @var array |
63 | 63 | */ |
64 | - protected $stubs = []; |
|
64 | + protected $stubs = [ ]; |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * Create a new command instance. |
@@ -135,22 +135,22 @@ discard block |
||
135 | 135 | protected function exportControllers() |
136 | 136 | { |
137 | 137 | if ($this->option('fake')) { |
138 | - $path = $this->stubs['controllers']; |
|
138 | + $path = $this->stubs[ 'controllers' ]; |
|
139 | 139 | $baseDir = new vfsStreamDirectory('app'); |
140 | 140 | vfsStream::copyFromFileSystem($path, $baseDir); |
141 | 141 | return true; |
142 | 142 | } |
143 | 143 | |
144 | 144 | foreach ($this->controllers as $key => $value) { |
145 | - if (file_exists(app_path('Http/Controllers/Api/v1/'.$value)) && ! $this->option('force')) { |
|
146 | - if (! $this->confirm("The [{$value}] already exists. Do you want to replace it?")) { |
|
145 | + if (file_exists(app_path('Http/Controllers/Api/v1/' . $value)) && !$this->option('force')) { |
|
146 | + if (!$this->confirm("The [{$value}] already exists. Do you want to replace it?")) { |
|
147 | 147 | continue; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
151 | 151 | copy( |
152 | - base_path('stubs/Controllers/'.$key), |
|
153 | - app_path('Http/Controllers/Api/v1/'.$value) |
|
152 | + base_path('stubs/Controllers/' . $key), |
|
153 | + app_path('Http/Controllers/Api/v1/' . $value) |
|
154 | 154 | ); |
155 | 155 | } |
156 | 156 | } |
@@ -161,22 +161,22 @@ discard block |
||
161 | 161 | protected function exportModels() |
162 | 162 | { |
163 | 163 | if ($this->option('fake')) { |
164 | - $path = $this->stubs['models']; |
|
164 | + $path = $this->stubs[ 'models' ]; |
|
165 | 165 | $baseDir = new vfsStreamDirectory('app'); |
166 | 166 | vfsStream::copyFromFileSystem($path, $baseDir); |
167 | 167 | return true; |
168 | 168 | } |
169 | 169 | |
170 | 170 | foreach ($this->models as $key => $value) { |
171 | - if (file_exists(app_path('Models/'.$value)) && ! $this->option('force')) { |
|
172 | - if (! $this->confirm("The [{$value}] model already exists. Do you want to replace it?")) { |
|
171 | + if (file_exists(app_path('Models/' . $value)) && !$this->option('force')) { |
|
172 | + if (!$this->confirm("The [{$value}] model already exists. Do you want to replace it?")) { |
|
173 | 173 | continue; |
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | 177 | copy( |
178 | - base_path('stubs/Models/'.$key), |
|
179 | - app_path('Models/'.$value) |
|
178 | + base_path('stubs/Models/' . $key), |
|
179 | + app_path('Models/' . $value) |
|
180 | 180 | ); |
181 | 181 | } |
182 | 182 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | protected function exportMigrations() |
188 | 188 | { |
189 | 189 | if ($this->option('fake')) { |
190 | - $path = $this->stubs['migrations']; |
|
190 | + $path = $this->stubs[ 'migrations' ]; |
|
191 | 191 | $baseDir = new vfsStreamDirectory('app'); |
192 | 192 | vfsStream::copyFromFileSystem($path, $baseDir); |
193 | 193 | return true; |
@@ -195,15 +195,15 @@ discard block |
||
195 | 195 | |
196 | 196 | $counter = 0; |
197 | 197 | foreach ($this->migrations as $key => $value) { |
198 | - if (file_exists(database_path('migrations/'.$value)) && ! $this->option('force')) { |
|
199 | - if (! $this->confirm("The [{$value}] migration already exists. Do you want to replace it?")) { |
|
198 | + if (file_exists(database_path('migrations/' . $value)) && !$this->option('force')) { |
|
199 | + if (!$this->confirm("The [{$value}] migration already exists. Do you want to replace it?")) { |
|
200 | 200 | continue; |
201 | 201 | } |
202 | 202 | } |
203 | 203 | |
204 | 204 | copy( |
205 | 205 | base_path('stubs/migrations/' . $key), |
206 | - database_path('migrations/'. date('Y_m_d_Hi') . '0' . $counter++ . '_' . $value) |
|
206 | + database_path('migrations/' . date('Y_m_d_Hi') . '0' . $counter++ . '_' . $value) |
|
207 | 207 | ); |
208 | 208 | } |
209 | 209 | } |
@@ -214,22 +214,22 @@ discard block |
||
214 | 214 | protected function exportSeeds() |
215 | 215 | { |
216 | 216 | if ($this->option('fake')) { |
217 | - $path = $this->stubs['seeds']; |
|
217 | + $path = $this->stubs[ 'seeds' ]; |
|
218 | 218 | $baseDir = new vfsStreamDirectory('app'); |
219 | 219 | vfsStream::copyFromFileSystem($path, $baseDir); |
220 | 220 | return true; |
221 | 221 | } |
222 | 222 | |
223 | 223 | foreach ($this->seeds as $key => $value) { |
224 | - if (file_exists(database_path('seeds/'.$value)) && ! $this->option('force')) { |
|
225 | - if (! $this->confirm("The [{$value}] already exists. Do you want to replace it?")) { |
|
224 | + if (file_exists(database_path('seeds/' . $value)) && !$this->option('force')) { |
|
225 | + if (!$this->confirm("The [{$value}] already exists. Do you want to replace it?")) { |
|
226 | 226 | continue; |
227 | 227 | } |
228 | 228 | } |
229 | 229 | |
230 | 230 | copy( |
231 | - base_path('stubs/seeds/'.$key), |
|
232 | - database_path('seeds/'.$value) |
|
231 | + base_path('stubs/seeds/' . $key), |
|
232 | + database_path('seeds/' . $value) |
|
233 | 233 | ); |
234 | 234 | } |
235 | 235 | } |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * @param $src |
239 | 239 | * @param $dst |
240 | 240 | */ |
241 | - protected function recurse_copy($src,$dst) |
|
241 | + protected function recurse_copy($src, $dst) |
|
242 | 242 | { |
243 | 243 | $dir = opendir($src); |
244 | 244 | @mkdir($dst); |
@@ -169,7 +169,7 @@ |
||
169 | 169 | |
170 | 170 | if (file_exists(app_path('JsonApi'))) { |
171 | 171 | if(!@rmdir(app_path('JsonApi'))) { |
172 | - throw new \League\Flysystem\Exception('JsonApi directory is not empty!'); |
|
172 | + throw new \League\Flysystem\Exception('JsonApi directory is not empty!'); |
|
173 | 173 | }; |
174 | 174 | } |
175 | 175 | } catch (\League\Flysystem\Exception $e) { |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | { |
131 | 131 | foreach ($this->migrations as $key => $value) { |
132 | 132 | $mask = database_path('migrations/*' . $value); |
133 | - array_map( "unlink", glob( $mask ) ); |
|
133 | + array_map("unlink", glob($mask)); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | if (file_exists(app_path('JsonApi'))) { |
171 | - if(!@rmdir(app_path('JsonApi'))) { |
|
171 | + if (!@rmdir(app_path('JsonApi'))) { |
|
172 | 172 | throw new \League\Flysystem\Exception('JsonApi directory is not empty!'); |
173 | 173 | }; |
174 | 174 | } |