@@ -25,7 +25,7 @@ |
||
25 | 25 | $this->authGateway = $authGateway; |
26 | 26 | } |
27 | 27 | |
28 | - public function execute(int $pageId):?Interaction |
|
28 | + public function execute(int $pageId): ?Interaction |
|
29 | 29 | { |
30 | 30 | $canInteractUser = $this->getInteractUser(); |
31 | 31 | return $this->interactionRepository->getByInteractUser($canInteractUser, $pageId); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | $this->contextRepository = $contextRepository; |
17 | 17 | } |
18 | 18 | |
19 | - public function execute(string $userId):?ContextDto |
|
19 | + public function execute(string $userId): ?ContextDto |
|
20 | 20 | { |
21 | 21 | return $this->contextRepository->getByUserDto($userId); |
22 | 22 | } |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | private function serialize(array $properties) |
15 | 15 | { |
16 | - foreach ($properties as $key => $property){ |
|
17 | - if(is_object($property)){ |
|
16 | + foreach ($properties as $key => $property) { |
|
17 | + if (is_object($property)) { |
|
18 | 18 | $params[$this->camelToSnake($key)] = $this->serialize(get_object_vars($property)); |
19 | - }else { |
|
19 | + } else { |
|
20 | 20 | $params[$this->camelToSnake($key)] = $property; |
21 | 21 | } |
22 | 22 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | foreach ($properties as $key => $property){ |
17 | 17 | if(is_object($property)){ |
18 | 18 | $params[$this->camelToSnake($key)] = $this->serialize(get_object_vars($property)); |
19 | - }else { |
|
19 | + } else { |
|
20 | 20 | $params[$this->camelToSnake($key)] = $property; |
21 | 21 | } |
22 | 22 | } |
@@ -15,12 +15,12 @@ discard block |
||
15 | 15 | ->selectRaw('count(*) AS count, contexts.department_number as department_number') |
16 | 16 | ->join('users', 'users.id', 'interactions.user_id') |
17 | 17 | ->join('contexts', 'users.context_id', 'contexts.id') |
18 | - ->where(function ($query) use ($type){ |
|
19 | - $query->when($type === 'follow', function ($query) { |
|
18 | + ->where(function($query) use ($type){ |
|
19 | + $query->when($type === 'follow', function($query) { |
|
20 | 20 | $query->where('follow', true); |
21 | 21 | $query->orWhere('done', true); |
22 | 22 | }) |
23 | - ->when($type === 'do', function ($query) { |
|
23 | + ->when($type === 'do', function($query) { |
|
24 | 24 | $query->where('done', true); |
25 | 25 | }); |
26 | 26 | }) |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | ->get(); |
31 | 31 | |
32 | 32 | $interactionsToReturn = []; |
33 | - foreach($interactions as $interaction){ |
|
33 | + foreach ($interactions as $interaction) { |
|
34 | 34 | $characteristicsModel = CharacteristicsModel::query()->where('code', $interaction->department_number)->first(); |
35 | - if(!isset($characteristicsModel)){ |
|
35 | + if (!isset($characteristicsModel)) { |
|
36 | 36 | continue; |
37 | 37 | } |
38 | 38 | $characteristicsModel->icon = route('api.icon.serve', ['id' => $characteristicsModel->uuid]); |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | ->join('contexts', 'users.context_id', 'contexts.id') |
54 | 54 | ->join('user_characteristics', 'user_characteristics.user_id', 'users.id') |
55 | 55 | ->join('characteristics', 'characteristics.id', 'user_characteristics.characteristic_id') |
56 | - ->where(function ($query) use ($type){ |
|
57 | - $query->when($type === 'follow', function ($query) { |
|
56 | + ->where(function($query) use ($type){ |
|
57 | + $query->when($type === 'follow', function($query) { |
|
58 | 58 | $query->where('follow', true); |
59 | 59 | $query->orWhere('done', true); |
60 | 60 | }) |
61 | - ->when($type === 'do', function ($query) { |
|
61 | + ->when($type === 'do', function($query) { |
|
62 | 62 | $query->where('done', true); |
63 | 63 | }); |
64 | 64 | }) |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | ->get(); |
72 | 72 | |
73 | 73 | $characteristicsToReturn = []; |
74 | - foreach($characteristicsCount as $characteristicCount){ |
|
74 | + foreach ($characteristicsCount as $characteristicCount) { |
|
75 | 75 | $characteristic = CharacteristicsModel::query()->find($characteristicCount->characteristic_id); |
76 | 76 | $characteristic->count = $characteristicCount->count; |
77 | 77 | $c = $characteristic->toArray(); |
@@ -17,13 +17,13 @@ |
||
17 | 17 | $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$search.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json'; |
18 | 18 | try { |
19 | 19 | $response = $client->get($uri); |
20 | - }catch (\Throwable $e){ |
|
20 | + } catch (\Throwable $e) { |
|
21 | 21 | return ['results' => []]; |
22 | 22 | } |
23 | 23 | $content = json_decode($response->getBody()->getContents(), true); |
24 | - if(isset($content['query']['search'])){ |
|
24 | + if (isset($content['query']['search'])) { |
|
25 | 25 | $results = array_column($content['query']['search'], 'title'); |
26 | - return array_map(function ($item){ |
|
26 | + return array_map(function($item) { |
|
27 | 27 | return str_replace('Structure:', '', $item); |
28 | 28 | }, $results); |
29 | 29 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$search.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json'; |
18 | 18 | try { |
19 | 19 | $response = $client->get($uri); |
20 | - }catch (\Throwable $e){ |
|
20 | + } catch (\Throwable $e){ |
|
21 | 21 | return ['results' => []]; |
22 | 22 | } |
23 | 23 | $content = json_decode($response->getBody()->getContents(), true); |
@@ -14,8 +14,9 @@ |
||
14 | 14 | public function showComments(Request $request) |
15 | 15 | { |
16 | 16 | $userId = $request->input('user_id'); |
17 | - if (empty($userId)) |
|
18 | - $userId = Auth::user()->uuid; |
|
17 | + if (empty($userId)) { |
|
18 | + $userId = Auth::user()->uuid; |
|
19 | + } |
|
19 | 20 | |
20 | 21 | $comments = app(GetLastWikiUserComments::class)->get($userId); |
21 | 22 | return view('users.profile.comments', [ |
@@ -187,7 +187,7 @@ |
||
187 | 187 | { |
188 | 188 | $user = \App\User::where('uuid', $userId)->first(); |
189 | 189 | if(!isset($user)){ |
190 | - return; |
|
190 | + return; |
|
191 | 191 | } |
192 | 192 | $user->markEmailAsVerified(); |
193 | 193 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public function getByEmail(string $email): ?User |
18 | 18 | { |
19 | 19 | $record = \App\User::where('email', $email)->first(); |
20 | - if(!isset($record)){ |
|
20 | + if (!isset($record)) { |
|
21 | 21 | return null; |
22 | 22 | } |
23 | 23 | $roles = $record->roles()->pluck('name')->toArray(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | public function getById(string $id): ?User |
28 | 28 | { |
29 | 29 | $record = \App\User::where('uuid', $id)->first(); |
30 | - if(!isset($record)){ |
|
30 | + if (!isset($record)) { |
|
31 | 31 | return null; |
32 | 32 | } |
33 | 33 | $roles = $record->roles()->pluck('name')->toArray(); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | unset($data['roles']); |
60 | 60 | $userModel->fill($data); |
61 | 61 | |
62 | - if($oldEmail !== $data['email']){ |
|
62 | + if ($oldEmail !== $data['email']) { |
|
63 | 63 | $userModel->email_verified_at = null; |
64 | 64 | $userModel->sendEmailVerificationNotification(); |
65 | 65 | } |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | ->offset(($page-1)*$perPage) |
101 | 101 | ->limit($perPage) |
102 | 102 | ->get(); |
103 | - if(empty($records)){ |
|
103 | + if (empty($records)) { |
|
104 | 104 | return []; |
105 | 105 | } |
106 | 106 | |
107 | 107 | $users = []; |
108 | - foreach($records as $record){ |
|
109 | - if($record->uuid === null){ |
|
108 | + foreach ($records as $record) { |
|
109 | + if ($record->uuid === null) { |
|
110 | 110 | $identity = new Identity(Uuid::uuid4(), $record->iemail, $record->ifirstname, $record->ilastname, null); |
111 | 111 | $state = new State($organizationId, null, false, []); |
112 | 112 | $users[] = new UserDto($identity, $state); |
@@ -132,11 +132,11 @@ discard block |
||
132 | 132 | public function getAdminOfOrganization(string $organizationId): array |
133 | 133 | { |
134 | 134 | $records = \App\User::role(['admin'])->where('organization_id', $organizationId)->get(); |
135 | - if(empty($records)){ |
|
135 | + if (empty($records)) { |
|
136 | 136 | return []; |
137 | 137 | } |
138 | 138 | $users = []; |
139 | - foreach($records as $record){ |
|
139 | + foreach ($records as $record) { |
|
140 | 140 | $roles = \App\User::find($record->id)->roles()->pluck('name')->toArray(); |
141 | 141 | $users[] = new User($record->uuid, $record->email, $record->firstname, $record->lastname, $record->organization_id, $record->path_picture, $roles); |
142 | 142 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function getByProvider(string $provider, string $providerId): ?User |
147 | 147 | { |
148 | 148 | $record = \App\User::where('providers->'.$provider, $providerId)->first(); |
149 | - if(!isset($record)){ |
|
149 | + if (!isset($record)) { |
|
150 | 150 | return null; |
151 | 151 | } |
152 | 152 | $roles = $record->roles()->pluck('name')->toArray(); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | public function getStats(string $userId): Stats |
157 | 157 | { |
158 | 158 | $record = \App\User::where('uuid', $userId)->first(); |
159 | - if(isset($record) && $record->wiki_stats !== null){ |
|
159 | + if (isset($record) && $record->wiki_stats !== null) { |
|
160 | 160 | return new Stats($record->wiki_stats); |
161 | 161 | } |
162 | 162 | return new Stats([]); |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | public function verifyEmail(string $userId) |
192 | 192 | { |
193 | 193 | $user = \App\User::where('uuid', $userId)->first(); |
194 | - if(!isset($user)){ |
|
194 | + if (!isset($user)) { |
|
195 | 195 | return; |
196 | 196 | } |
197 | 197 | $user->markEmailAsVerified(); |
@@ -11,7 +11,7 @@ |
||
11 | 11 | public function handle($request, \Closure $next) |
12 | 12 | { |
13 | 13 | $user = Auth::user(); |
14 | - if($user->context_id === null){ |
|
14 | + if ($user->context_id === null) { |
|
15 | 15 | return $next($request); |
16 | 16 | } |
17 | 17 | return redirect('/profile'); |
@@ -14,12 +14,12 @@ |
||
14 | 14 | */ |
15 | 15 | protected function redirectTo($request) |
16 | 16 | { |
17 | - if($request->has('sso')){ |
|
17 | + if ($request->has('sso')) { |
|
18 | 18 | session()->put('sso', $request->get('sso')); |
19 | 19 | session()->put('sig', $request->get('sig')); |
20 | 20 | } |
21 | 21 | |
22 | - if (! $request->expectsJson()) { |
|
22 | + if (!$request->expectsJson()) { |
|
23 | 23 | return route('login'); |
24 | 24 | } |
25 | 25 | } |