@@ -14,7 +14,7 @@  | 
                                                    ||
| 14 | 14 | */  | 
                                                        
| 15 | 15 | protected function redirectTo($request)  | 
                                                        
| 16 | 16 |      { | 
                                                        
| 17 | -        if (! $request->expectsJson()) { | 
                                                        |
| 17 | +        if (!$request->expectsJson()) { | 
                                                        |
| 18 | 18 |              return route('login'); | 
                                                        
| 19 | 19 | }  | 
                                                        
| 20 | 20 | }  | 
                                                        
@@ -11,10 +11,10 @@ discard block  | 
                                                    ||
| 11 | 11 |  { | 
                                                        
| 12 | 12 | private $organizations = [];  | 
                                                        
| 13 | 13 | |
| 14 | - public function get(string $id):? Organization  | 
                                                        |
| 14 | + public function get(string $id): ? Organization  | 
                                                        |
| 15 | 15 |      { | 
                                                        
| 16 | -        foreach ($this->organizations as $organization){ | 
                                                        |
| 17 | -            if($organization->id() === $id){ | 
                                                        |
| 16 | +        foreach ($this->organizations as $organization) { | 
                                                        |
| 17 | +            if ($organization->id() === $id) { | 
                                                        |
| 18 | 18 | return $organization;  | 
                                                        
| 19 | 19 | }  | 
                                                        
| 20 | 20 | }  | 
                                                        
@@ -38,8 +38,8 @@ discard block  | 
                                                    ||
| 38 | 38 | |
| 39 | 39 | public function update(Organization $o)  | 
                                                        
| 40 | 40 |      { | 
                                                        
| 41 | -        foreach ($this->organizations as $key => $organization){ | 
                                                        |
| 42 | -            if($organization->id() === $o->id()){ | 
                                                        |
| 41 | +        foreach ($this->organizations as $key => $organization) { | 
                                                        |
| 42 | +            if ($organization->id() === $o->id()) { | 
                                                        |
| 43 | 43 | $this->organizations[$key] = $organization;  | 
                                                        
| 44 | 44 | }  | 
                                                        
| 45 | 45 | }  | 
                                                        
@@ -12,7 +12,7 @@  | 
                                                    ||
| 12 | 12 | public function current(): ?User  | 
                                                        
| 13 | 13 |      { | 
                                                        
| 14 | 14 | $userModel = Auth::user();  | 
                                                        
| 15 | -        if(!isset($userModel)){ | 
                                                        |
| 15 | +        if (!isset($userModel)) { | 
                                                        |
| 16 | 16 | return null;  | 
                                                        
| 17 | 17 | }  | 
                                                        
| 18 | 18 | return new User($userModel->uuid, $userModel->email, $userModel->firstname, $userModel->lastname, $userModel->organization_id);  | 
                                                        
@@ -8,6 +8,6 @@  | 
                                                    ||
| 8 | 8 | |
| 9 | 9 | interface AuthGateway  | 
                                                        
| 10 | 10 |  { | 
                                                        
| 11 | - public function current():? User;  | 
                                                        |
| 11 | + public function current(): ? User;  | 
                                                        |
| 12 | 12 | public function log(User $u);  | 
                                                        
| 13 | 13 | }  | 
                                                        
@@ -17,7 +17,7 @@ discard block  | 
                                                    ||
| 17 | 17 | ->select()  | 
                                                        
| 18 | 18 |              ->where('uuid', $id) | 
                                                        
| 19 | 19 | ->first();  | 
                                                        
| 20 | -        if(!isset($record)){ | 
                                                        |
| 20 | +        if (!isset($record)) { | 
                                                        |
| 21 | 21 | return null;  | 
                                                        
| 22 | 22 | }  | 
                                                        
| 23 | 23 | $address = new Address($record->city, $record->address1, $record->address2, $record->postal_code);  | 
                                                        
@@ -42,11 +42,11 @@ discard block  | 
                                                    ||
| 42 | 42 | ->offset(($page-1)*$perPage)  | 
                                                        
| 43 | 43 | ->limit($perPage)  | 
                                                        
| 44 | 44 | ->get();  | 
                                                        
| 45 | -        if(empty($records)){ | 
                                                        |
| 45 | +        if (empty($records)) { | 
                                                        |
| 46 | 46 | return [];  | 
                                                        
| 47 | 47 | }  | 
                                                        
| 48 | 48 | $organizations = [];  | 
                                                        
| 49 | -        foreach($records as $record){ | 
                                                        |
| 49 | +        foreach ($records as $record) { | 
                                                        |
| 50 | 50 | $address = new Address($record->city, $record->address1, $record->address2, $record->postal_code);  | 
                                                        
| 51 | 51 | $organizations[] = new Organization($record->uuid, $record->name, $record->path_picture, $address);  | 
                                                        
| 52 | 52 | }  | 
                                                        
@@ -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 | }  | 
                                                        
@@ -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;  | 
                                                        
@@ -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 | |