@@ -23,14 +23,14 @@ discard block |
||
| 23 | 23 | $usersToProcess = []; |
| 24 | 24 | $usersLoop = $this->getUsersToProcess($users, $usersLoop, $filePathUsers); |
| 25 | 25 | $errors = $imported = 0; |
| 26 | - foreach($usersLoop as $userToInvite){ |
|
| 26 | + foreach ($usersLoop as $userToInvite) { |
|
| 27 | 27 | $rules = [ |
| 28 | 28 | 'email' => 'email|required|min:2|max:255', |
| 29 | 29 | 'firstname' => 'string|max:100', |
| 30 | 30 | 'lastname' => 'string|max:100', |
| 31 | 31 | ]; |
| 32 | 32 | $validator = Validator::make($userToInvite, $rules); |
| 33 | - if($validator->fails()){ |
|
| 33 | + if ($validator->fails()) { |
|
| 34 | 34 | $userToInvite['error'] = 'email.error.syntax'; |
| 35 | 35 | $usersToProcess['users'][] = $userToInvite; |
| 36 | 36 | $errors++; |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $user = $this->userRepository->getByEmail($userToInvite['email']); |
| 41 | - if(isset($user) && $user->organizationId() === $organizationId) { |
|
| 41 | + if (isset($user) && $user->organizationId() === $organizationId) { |
|
| 42 | 42 | $userToInvite["error"] = 'already_in'; |
| 43 | 43 | $errors++; |
| 44 | 44 | } |
| 45 | 45 | $usersToProcess['users'][] = $userToInvite; |
| 46 | 46 | |
| 47 | - if(!isset($userToInvite["error"])){ |
|
| 47 | + if (!isset($userToInvite["error"])) { |
|
| 48 | 48 | $imported++; |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | public function invite(string $organizationId, array $users) |
| 21 | 21 | { |
| 22 | 22 | $organization = $this->organizationRepository->get($organizationId); |
| 23 | - foreach($users as $user){ |
|
| 23 | + foreach ($users as $user) { |
|
| 24 | 24 | $email = $user['email']; |
| 25 | 25 | $firstname = isset($user['firstname']) ? $user['firstname'] : ''; |
| 26 | 26 | $lastname = isset($user['lastname']) ? $user['lastname'] : ''; |
@@ -33,10 +33,10 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function create(string $ext = 'jpg') |
| 35 | 35 | { |
| 36 | - if($this->pathPicture !== "") { |
|
| 36 | + if ($this->pathPicture !== "") { |
|
| 37 | 37 | $picture = new Picture($this->pathPicture); |
| 38 | - $picture->resize('app/public/organizations/' . $this->id . '.' . $ext); |
|
| 39 | - $this->pathPicture = 'app/public/organizations/' . $this->id . '.' . $ext; |
|
| 38 | + $picture->resize('app/public/organizations/'.$this->id.'.'.$ext); |
|
| 39 | + $this->pathPicture = 'app/public/organizations/'.$this->id.'.'.$ext; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | app(OrganizationRepository::class)->add($this); |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | $this->name = $name; |
| 48 | 48 | $this->address = $address; |
| 49 | - if($picture['path'] !== "") { |
|
| 49 | + if ($picture['path'] !== "") { |
|
| 50 | 50 | $logo = new Picture($picture['path']); |
| 51 | 51 | $ext = $picture['ext']; |
| 52 | - $logo->resize('app/public/organizations/' . $this->id . '.' . $ext); |
|
| 53 | - $this->pathPicture = 'app/public/organizations/' . $this->id . '.' . $ext; |
|
| 52 | + $logo->resize('app/public/organizations/'.$this->id.'.'.$ext); |
|
| 53 | + $this->pathPicture = 'app/public/organizations/'.$this->id.'.'.$ext; |
|
| 54 | 54 | } |
| 55 | 55 | app(OrganizationRepository::class)->update($this); |
| 56 | 56 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | interface OrganizationRepository |
| 10 | 10 | { |
| 11 | - public function get(string $id):? Organization; |
|
| 11 | + public function get(string $id): ? Organization; |
|
| 12 | 12 | public function add(Organization $o); |
| 13 | 13 | public function update(Organization $o); |
| 14 | 14 | public function search(int $page, int $perPage = 10): array; |
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | |
| 9 | 9 | interface UserRepository |
| 10 | 10 | { |
| 11 | - public function getByEmail(string $email):? User; |
|
| 12 | - public function getById(string $id):?User; |
|
| 11 | + public function getByEmail(string $email): ? User; |
|
| 12 | + public function getById(string $id): ?User; |
|
| 13 | 13 | public function search(string $organizationId, int $page, int $perPage = 10): array; |
| 14 | 14 | public function add(User $u, string $password = null); |
| 15 | 15 | public function update(User $u); |
@@ -17,12 +17,12 @@ |
||
| 17 | 17 | |
| 18 | 18 | public function resize(string $newPath) |
| 19 | 19 | { |
| 20 | - if(app(PictureHandler::class)->width($this->path) > 600) { |
|
| 20 | + if (app(PictureHandler::class)->width($this->path) > 600) { |
|
| 21 | 21 | app(PictureHandler::class)->widen($this->path, storage_path().'/'.$newPath, 600); |
| 22 | 22 | return; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - if(app(PictureHandler::class)->height($this->path) > 400) { |
|
| 25 | + if (app(PictureHandler::class)->height($this->path) > 400) { |
|
| 26 | 26 | app(PictureHandler::class)->heighten($this->path, storage_path().'/'.$newPath, 400); |
| 27 | 27 | return; |
| 28 | 28 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | return $this->id; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function organizationId():?string |
|
| 42 | + public function organizationId(): ?string |
|
| 43 | 43 | { |
| 44 | 44 | return $this->organizationId; |
| 45 | 45 | } |
@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | $this->email = $email; |
| 79 | 79 | $this->firstname = $firstname; |
| 80 | 80 | $this->lastname = $lastname; |
| 81 | - if($pathPicture !== "") { |
|
| 81 | + if ($pathPicture !== "") { |
|
| 82 | 82 | $picture = new Picture($pathPicture); |
| 83 | - $picture->resize('app/public/users/' . $this->id . '.' . $ext); |
|
| 84 | - $this->pathPicture = 'app/public/users/' . $this->id . '.' . $ext; |
|
| 83 | + $picture->resize('app/public/users/'.$this->id.'.'.$ext); |
|
| 84 | + $this->pathPicture = 'app/public/users/'.$this->id.'.'.$ext; |
|
| 85 | 85 | } |
| 86 | 86 | app(UserRepository::class)->update($this); |
| 87 | 87 | } |
@@ -33,11 +33,11 @@ discard block |
||
| 33 | 33 | $organizationToJoin = $this->organizationRepository->get($organizationId); |
| 34 | 34 | |
| 35 | 35 | $currentUser = $this->authGateway->current(); |
| 36 | - if(isset($currentUser) && $currentUser->email() !== $email){ |
|
| 36 | + if (isset($currentUser) && $currentUser->email() !== $email) { |
|
| 37 | 37 | $action = 'logout'; |
| 38 | 38 | $action .= !isset($user) ? '-register' : '-login'; |
| 39 | 39 | |
| 40 | - if($action == 'logout-login') { |
|
| 40 | + if ($action == 'logout-login') { |
|
| 41 | 41 | return [ |
| 42 | 42 | 'action' => $action, |
| 43 | 43 | 'organization_to_join' => $organizationToJoin, |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | |
| 59 | - if(!isset($user)){ |
|
| 59 | + if (!isset($user)) { |
|
| 60 | 60 | return [ |
| 61 | 61 | 'action' => 'register', |
| 62 | 62 | 'organization_id' => $organizationId, |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $currentUser = $this->authGateway->current(); |
| 72 | - if(!isset($currentUser)){ |
|
| 72 | + if (!isset($currentUser)) { |
|
| 73 | 73 | return [ |
| 74 | 74 | 'action' => 'login', |
| 75 | 75 | 'organization_to_join' => $organizationToJoin, |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $organization = null; |
| 80 | - if($user->organizationId() !== null) { |
|
| 80 | + if ($user->organizationId() !== null) { |
|
| 81 | 81 | $organization = $this->organizationRepository->get($user->organizationId()); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | public function get(string $userId):User |
| 21 | 21 | { |
| 22 | 22 | $user = $this->userRepository->getById($userId); |
| 23 | - if(!isset($user)){ |
|
| 23 | + if (!isset($user)) { |
|
| 24 | 24 | throw new UserNotFound(); |
| 25 | 25 | } |
| 26 | 26 | return $user; |