@@ -21,7 +21,7 @@ |
||
| 21 | 21 | $user = $this->userRepository->getByEmail($email); |
| 22 | 22 | if (isset($user)) { |
| 23 | 23 | $errors['email'] = __('validation.unique', ['attribute' => 'email']); |
| 24 | - $validator->after(function () use ($validator, $errors) { |
|
| 24 | + $validator->after(function() use ($validator, $errors) { |
|
| 25 | 25 | foreach ($errors as $field => $error) { |
| 26 | 26 | $validator->errors()->add($field, $error); |
| 27 | 27 | } |
@@ -22,17 +22,17 @@ |
||
| 22 | 22 | { |
| 23 | 23 | $relativePath = $newPath; |
| 24 | 24 | $finalNewPath = storage_path().'/'.$newPath; |
| 25 | - if(isset($this->ext)){ |
|
| 25 | + if (isset($this->ext)) { |
|
| 26 | 26 | $finalNewPath = storage_path().'/'.$newPath.'.'.$this->ext; |
| 27 | 27 | $relativePath = $newPath.'.'.$this->ext; |
| 28 | 28 | } |
| 29 | - if(app(PictureHandler::class)->width($this->path) > 600) { |
|
| 29 | + if (app(PictureHandler::class)->width($this->path) > 600) { |
|
| 30 | 30 | app(PictureHandler::class)->widen($this->path, $finalNewPath, 600); |
| 31 | 31 | $this->relativePath = $relativePath; |
| 32 | 32 | return; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - if(app(PictureHandler::class)->height($this->path) > 400) { |
|
| 35 | + if (app(PictureHandler::class)->height($this->path) > 400) { |
|
| 36 | 36 | app(PictureHandler::class)->heighten($this->path, $finalNewPath, 400); |
| 37 | 37 | $this->relativePath = $relativePath; |
| 38 | 38 | return; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | { |
| 32 | 32 | $email = $firstname = $lastname = ''; |
| 33 | 33 | |
| 34 | - if($request->session()->has('user_to_register')){ |
|
| 34 | + if ($request->session()->has('user_to_register')) { |
|
| 35 | 35 | $user = $request->session()->get('user_to_register'); |
| 36 | 36 | $email = $user['email']; |
| 37 | 37 | $firstname = $user['firstname']; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | protected function validator(array $data) |
| 49 | 49 | { |
| 50 | - if(session()->has('should_attach_to_organization')) { |
|
| 50 | + if (session()->has('should_attach_to_organization')) { |
|
| 51 | 51 | session()->reflash(); |
| 52 | 52 | } |
| 53 | 53 | return Validator::make($data, [ |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | protected function registered(Request $request, $user) |
| 83 | 83 | { |
| 84 | - if($request->session()->has('should_attach_to_organization')){ |
|
| 84 | + if ($request->session()->has('should_attach_to_organization')) { |
|
| 85 | 85 | app(AttachUserToAnOrganization::class)->attach($user->uuid, $request->session()->get('should_attach_to_organization')); |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | return $request->wantsJson() |
| 102 | 102 | ? new Response('', 201) |
| 103 | 103 | : redirect($this->redirectPath()); |
| 104 | - }catch (ValidationException $e) { |
|
| 104 | + } catch (ValidationException $e) { |
|
| 105 | 105 | $attributes = $e->validator->attributes(); |
| 106 | 106 | $attributes['provider'] = $provider; |
| 107 | 107 | return redirect()->route('register-social-network') |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | return $request->wantsJson() |
| 102 | 102 | ? new Response('', 201) |
| 103 | 103 | : redirect($this->redirectPath()); |
| 104 | - }catch (ValidationException $e) { |
|
| 104 | + } catch (ValidationException $e) { |
|
| 105 | 105 | $attributes = $e->validator->attributes(); |
| 106 | 106 | $attributes['provider'] = $provider; |
| 107 | 107 | return redirect()->route('register-social-network') |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | public function register() |
| 34 | 34 | { |
| 35 | - if(config('app.env') === 'testing'){ |
|
| 35 | + if (config('app.env') === 'testing') { |
|
| 36 | 36 | $this->app->singleton(OrganizationRepository::class, InMemoryOrganizationRepository::class); |
| 37 | 37 | $this->app->singleton(PictureHandler::class, InMemoryPictureHandler::class); |
| 38 | 38 | $this->app->singleton(UserRepository::class, InMemoryUserRepository::class); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $this->app->singleton(HashGen::class, InMemoryHashGen::class); |
| 43 | 43 | $this->app->singleton(InvitationRepository::class, InMemoryInvitationRepository::class); |
| 44 | 44 | } |
| 45 | - if(config('app.env') === 'testing-ti'){ |
|
| 45 | + if (config('app.env') === 'testing-ti') { |
|
| 46 | 46 | $this->app->singleton(OrganizationRepository::class, SqlOrganizationRepository::class); |
| 47 | 47 | $this->app->singleton(InvitationRepository::class, InMemoryInvitationRepository::class); |
| 48 | 48 | $this->app->singleton(PictureHandler::class, InMemoryPictureHandler::class); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $this->app->singleton(HashGen::class, InMemoryHashGen::class); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - if(config('app.env') === 'local'){ |
|
| 55 | + if (config('app.env') === 'local') { |
|
| 56 | 56 | $this->app->singleton(OrganizationRepository::class, SqlOrganizationRepository::class); |
| 57 | 57 | $this->app->singleton(InvitationRepository::class, InvitationRepositorySql::class); |
| 58 | 58 | $this->app->singleton(PictureHandler::class, StoragePictureHandler::class); |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | public function getByEmail(string $email): ?User |
| 17 | 17 | { |
| 18 | 18 | $record = \App\User::where('email', $email)->first(); |
| 19 | - if(!isset($record)){ |
|
| 19 | + if (!isset($record)) { |
|
| 20 | 20 | return null; |
| 21 | 21 | } |
| 22 | 22 | $roles = $record->roles()->pluck('name')->toArray(); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | public function getById(string $id): ?User |
| 27 | 27 | { |
| 28 | 28 | $record = \App\User::where('uuid', $id)->first(); |
| 29 | - if(!isset($record)){ |
|
| 29 | + if (!isset($record)) { |
|
| 30 | 30 | return null; |
| 31 | 31 | } |
| 32 | 32 | $roles = $record->roles()->pluck('name')->toArray(); |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | ->offset(($page-1)*$perPage) |
| 83 | 83 | ->limit($perPage) |
| 84 | 84 | ->get(); |
| 85 | - if(empty($records)){ |
|
| 85 | + if (empty($records)) { |
|
| 86 | 86 | return []; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | $users = []; |
| 90 | - foreach($records as $record){ |
|
| 91 | - if($record->uuid === null){ |
|
| 90 | + foreach ($records as $record) { |
|
| 91 | + if ($record->uuid === null) { |
|
| 92 | 92 | $identity = new Identity(Uuid::uuid4(), $record->iemail, $record->ifirstname, $record->ilastname, null); |
| 93 | 93 | $state = new State($organizationId, null, false, []); |
| 94 | 94 | $users[] = new UserDto($identity, $state); |
@@ -114,11 +114,11 @@ discard block |
||
| 114 | 114 | public function getAdminOfOrganization(string $organizationId): array |
| 115 | 115 | { |
| 116 | 116 | $records = \App\User::role(['admin'])->where('organization_id', $organizationId)->get(); |
| 117 | - if(empty($records)){ |
|
| 117 | + if (empty($records)) { |
|
| 118 | 118 | return []; |
| 119 | 119 | } |
| 120 | 120 | $users = []; |
| 121 | - foreach($records as $record){ |
|
| 121 | + foreach ($records as $record) { |
|
| 122 | 122 | $roles = \App\User::find($record->id)->roles()->pluck('name')->toArray(); |
| 123 | 123 | $users[] = new User($record->uuid, $record->email, $record->firstname, $record->lastname, $record->organization_id, $record->path_picture, $roles); |
| 124 | 124 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | public function getByProvider(string $provider, string $providerId): ?User |
| 129 | 129 | { |
| 130 | 130 | $record = \App\User::where('providers->'.$provider, $providerId)->first(); |
| 131 | - if(!isset($record)){ |
|
| 131 | + if (!isset($record)) { |
|
| 132 | 132 | return null; |
| 133 | 133 | } |
| 134 | 134 | $roles = $record->roles()->pluck('name')->toArray(); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | ->select() |
| 30 | 30 | ->where('hash', $hash) |
| 31 | 31 | ->first(); |
| 32 | - if(!isset($record)){ |
|
| 32 | + if (!isset($record)) { |
|
| 33 | 33 | return null; |
| 34 | 34 | } |
| 35 | 35 | return new Invitation($record->organization_id, $record->email, $record->firstname, $record->lastname); |
@@ -16,10 +16,10 @@ |
||
| 16 | 16 | $this->invitations[] = $i; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function getByHash(string $hash):?Invitation |
|
| 19 | + public function getByHash(string $hash): ?Invitation |
|
| 20 | 20 | { |
| 21 | - foreach ($this->invitations as $invitation){ |
|
| 22 | - if($invitation->hash() === $hash){ |
|
| 21 | + foreach ($this->invitations as $invitation) { |
|
| 22 | + if ($invitation->hash() === $hash) { |
|
| 23 | 23 | return $invitation; |
| 24 | 24 | } |
| 25 | 25 | } |
@@ -16,20 +16,20 @@ discard block |
||
| 16 | 16 | $this->users[] = $u; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function getByEmail(string $email):?User |
|
| 19 | + public function getByEmail(string $email): ?User |
|
| 20 | 20 | { |
| 21 | - foreach ($this->users as $user){ |
|
| 22 | - if($user->email() === $email){ |
|
| 21 | + foreach ($this->users as $user) { |
|
| 22 | + if ($user->email() === $email) { |
|
| 23 | 23 | return $user; |
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | return null; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function getById(string $id):?User |
|
| 29 | + public function getById(string $id): ?User |
|
| 30 | 30 | { |
| 31 | - foreach ($this->users as $user){ |
|
| 32 | - if($user->id() === $id){ |
|
| 31 | + foreach ($this->users as $user) { |
|
| 32 | + if ($user->id() === $id) { |
|
| 33 | 33 | return $user; |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | public function search(string $organizationId, int $page, int $perPage = 10): array |
| 40 | 40 | { |
| 41 | 41 | $users = []; |
| 42 | - foreach($this->users as $user){ |
|
| 43 | - if($user->organizationId() === $organizationId){ |
|
| 42 | + foreach ($this->users as $user) { |
|
| 43 | + if ($user->organizationId() === $organizationId) { |
|
| 44 | 44 | $users[] = $user->toDto(); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | public function update(User $u) |
| 56 | 56 | { |
| 57 | - foreach ($this->users as $key => $user){ |
|
| 58 | - if($user->id() === $u->id()){ |
|
| 57 | + foreach ($this->users as $key => $user) { |
|
| 58 | + if ($user->id() === $u->id()) { |
|
| 59 | 59 | $this->users[$key] = $u; |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -63,8 +63,8 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | public function delete(string $userId) |
| 65 | 65 | { |
| 66 | - foreach ($this->users as $key => $user){ |
|
| 67 | - if($user->id() === $userId){ |
|
| 66 | + foreach ($this->users as $key => $user) { |
|
| 67 | + if ($user->id() === $userId) { |
|
| 68 | 68 | unset($this->users[$key]); |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | public function getAdminOfOrganization(string $organizationId): array |
| 74 | 74 | { |
| 75 | 75 | $users = []; |
| 76 | - foreach ($this->users as $key => $user){ |
|
| 77 | - if($user->organizationId() === $organizationId && $user->isAdmin()){ |
|
| 76 | + foreach ($this->users as $key => $user) { |
|
| 77 | + if ($user->organizationId() === $organizationId && $user->isAdmin()) { |
|
| 78 | 78 | $users[] = $user; |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | public function getByProvider(string $provider, string $providerId): ?User |
| 85 | 85 | { |
| 86 | - foreach ($this->users as $user){ |
|
| 87 | - if($user->provider($provider, $providerId) === true){ |
|
| 86 | + foreach ($this->users as $user) { |
|
| 87 | + if ($user->provider($provider, $providerId) === true) { |
|
| 88 | 88 | return $user; |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -9,5 +9,5 @@ |
||
| 9 | 9 | interface InvitationRepository |
| 10 | 10 | { |
| 11 | 11 | public function add(Invitation $i); |
| 12 | - public function getByHash(string $hash):?Invitation; |
|
| 12 | + public function getByHash(string $hash): ?Invitation; |
|
| 13 | 13 | } |