@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | $httpClient = new Client(); |
26 | 26 | |
27 | - PageModel::query()->where('dry', true)->chunkById(50, function ($items, $count) use($httpClient){ |
|
27 | + PageModel::query()->where('dry', true)->chunkById(50, function($items, $count) use($httpClient){ |
|
28 | 28 | $this->info(($count*50).' Pages'); |
29 | 29 | $pages = $items->pluck('page_id')->toArray(); |
30 | 30 | $pagesApiUri = config('wiki.api_uri').$this->queryPages.implode('|', $pages); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $content = json_decode($response->getBody()->getContents(), true); |
33 | 33 | $wikiPages = $content['query']['pages']; |
34 | 34 | |
35 | - foreach($wikiPages as $page){ |
|
35 | + foreach ($wikiPages as $page) { |
|
36 | 36 | $pageModel = PageModel::query()->where('page_id', $page['pageid'])->first(); |
37 | 37 | |
38 | 38 | if (!isset($page['title'])) |
@@ -18,12 +18,12 @@ discard block |
||
18 | 18 | ') |
19 | 19 | ->join('users', 'users.id', 'interactions.user_id') |
20 | 20 | ->join('contexts', 'users.context_id', 'contexts.id') |
21 | - ->where(function ($query) use ($type){ |
|
22 | - $query->when($type === 'follow', function ($query) { |
|
21 | + ->where(function($query) use ($type){ |
|
22 | + $query->when($type === 'follow', function($query) { |
|
23 | 23 | $query->where('follow', true); |
24 | 24 | $query->orWhere('done', true); |
25 | 25 | }) |
26 | - ->when($type === 'do', function ($query) { |
|
26 | + ->when($type === 'do', function($query) { |
|
27 | 27 | $query->where('done', true); |
28 | 28 | }); |
29 | 29 | }) |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | ->get(); |
34 | 34 | |
35 | 35 | $interactionsToReturn = []; |
36 | - foreach($interactions as $interaction){ |
|
36 | + foreach ($interactions as $interaction) { |
|
37 | 37 | $characteristicsModel = CharacteristicsModel::query()->where('code', $interaction->department)->first(); |
38 | 38 | |
39 | 39 | // FIXME : This test is only necessary because corsica breaks the line above. When corsica is correctly handled, |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | ->join('contexts', 'users.context_id', 'contexts.id') |
59 | 59 | ->join('user_characteristics', 'user_characteristics.user_id', 'users.id') |
60 | 60 | ->join('characteristics', 'characteristics.id', 'user_characteristics.characteristic_id') |
61 | - ->where(function ($query) use ($type){ |
|
62 | - $query->when($type === 'follow', function ($query) { |
|
61 | + ->where(function($query) use ($type){ |
|
62 | + $query->when($type === 'follow', function($query) { |
|
63 | 63 | $query->where('follow', true); |
64 | 64 | $query->orWhere('done', true); |
65 | 65 | }) |
66 | - ->when($type === 'do', function ($query) { |
|
66 | + ->when($type === 'do', function($query) { |
|
67 | 67 | $query->where('done', true); |
68 | 68 | }); |
69 | 69 | }) |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | ->get(); |
77 | 77 | |
78 | 78 | $characteristicsToReturn = []; |
79 | - foreach($characteristicsCount as $characteristicCount){ |
|
79 | + foreach ($characteristicsCount as $characteristicCount) { |
|
80 | 80 | $characteristic = CharacteristicsModel::query()->find($characteristicCount->characteristic_id); |
81 | 81 | $characteristic->count = $characteristicCount->count; |
82 | 82 | $c = $characteristic->toArray(); |
@@ -61,14 +61,14 @@ discard block |
||
61 | 61 | return $this->firstname.' '.$this->lastname; |
62 | 62 | } |
63 | 63 | |
64 | - public function organizationId():?string |
|
64 | + public function organizationId(): ?string |
|
65 | 65 | { |
66 | 66 | return $this->organizationId; |
67 | 67 | } |
68 | 68 | |
69 | 69 | public function provider(string $provider, string $providerId):bool |
70 | 70 | { |
71 | - if(isset($this->providers[$provider]) && $this->providers[$provider] == $providerId){ |
|
71 | + if (isset($this->providers[$provider]) && $this->providers[$provider] == $providerId) { |
|
72 | 72 | return true; |
73 | 73 | } |
74 | 74 | return false; |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | |
88 | 88 | public function create(string $passwordHashed = null, Picture $picture = null) |
89 | 89 | { |
90 | - if(isset($picture)) { |
|
91 | - $picture->resize('app/public/users/' . $this->id); |
|
90 | + if (isset($picture)) { |
|
91 | + $picture->resize('app/public/users/'.$this->id); |
|
92 | 92 | $this->pathPicture = $picture->relativePath(); |
93 | 93 | } |
94 | 94 | app(UserRepository::class)->add($this, $passwordHashed); |
@@ -130,20 +130,20 @@ discard block |
||
130 | 130 | $this->email = $email; |
131 | 131 | $this->firstname = $firstname; |
132 | 132 | $this->lastname = $lastname; |
133 | - if($pathPicture !== "") { |
|
133 | + if ($pathPicture !== "") { |
|
134 | 134 | $picture = new Picture($pathPicture); |
135 | - $picture->resize('app/public/users/' . $this->id . '.' . $ext); |
|
136 | - $this->pathPicture = 'app/public/users/' . $this->id . '.' . $ext; |
|
135 | + $picture->resize('app/public/users/'.$this->id.'.'.$ext); |
|
136 | + $this->pathPicture = 'app/public/users/'.$this->id.'.'.$ext; |
|
137 | 137 | } |
138 | 138 | app(UserRepository::class)->update($this); |
139 | 139 | } |
140 | 140 | |
141 | 141 | public function updateAvatar(string $pathPicture, string $ext = 'jpg') |
142 | 142 | { |
143 | - if($pathPicture !== "") { |
|
143 | + if ($pathPicture !== "") { |
|
144 | 144 | $picture = new Picture($pathPicture); |
145 | - $picture->resize('app/public/users/' . $this->id . '.' . $ext); |
|
146 | - $this->pathPicture = 'app/public/users/' . $this->id . '.' . $ext; |
|
145 | + $picture->resize('app/public/users/'.$this->id.'.'.$ext); |
|
146 | + $this->pathPicture = 'app/public/users/'.$this->id.'.'.$ext; |
|
147 | 147 | } |
148 | 148 | app(UserRepository::class)->update($this); |
149 | 149 | return $this->pathPicture; |
@@ -9,8 +9,8 @@ |
||
9 | 9 | |
10 | 10 | interface ContextRepository |
11 | 11 | { |
12 | - public function getByUser(string $userId):?Context; |
|
12 | + public function getByUser(string $userId): ?Context; |
|
13 | 13 | public function add(Context $context, string $userId); |
14 | 14 | public function update(Context $context, string $userId); |
15 | - public function getByUserDto(string $userId):?ContextDto; |
|
15 | + public function getByUserDto(string $userId): ?ContextDto; |
|
16 | 16 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $content = json_decode($response->getBody()->getContents(), true); |
24 | 24 | |
25 | 25 | $features = $content['features']; |
26 | - if(isset($features) && !empty($features)){ |
|
26 | + if (isset($features) && !empty($features)) { |
|
27 | 27 | $feature = $features[0]; |
28 | 28 | $coordinates = $feature['geometry']['coordinates']; |
29 | 29 | $departmentNumber = explode(',', $feature['properties']['context'])[0]; |
@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | return $list->toArray(); |
31 | 31 | } |
32 | 32 | |
33 | - public function getByPageId(int $pageId):?Characteristic |
|
33 | + public function getByPageId(int $pageId): ?Characteristic |
|
34 | 34 | { |
35 | 35 | $c = CharacteristicsModel::query() |
36 | 36 | ->where('page_id', $pageId) |
37 | 37 | ->first(); |
38 | - if(!isset($c)){ |
|
38 | + if (!isset($c)) { |
|
39 | 39 | return null; |
40 | 40 | } |
41 | 41 | return $c->toDomain(); |
@@ -61,14 +61,14 @@ discard block |
||
61 | 61 | public function getBy(array $conditions): ?Characteristic |
62 | 62 | { |
63 | 63 | $characteristicModel = CharacteristicsModel::query() |
64 | - ->when(isset($conditions['type']), function ($query) use($conditions){ |
|
64 | + ->when(isset($conditions['type']), function($query) use($conditions){ |
|
65 | 65 | $query->where('type', $conditions['type']); |
66 | 66 | }) |
67 | - ->when(isset($conditions['title']), function ($query) use($conditions){ |
|
67 | + ->when(isset($conditions['title']), function($query) use($conditions){ |
|
68 | 68 | $query->where('code', $conditions['title']); |
69 | 69 | }) |
70 | 70 | ->first(); |
71 | - if(!isset($characteristicModel)){ |
|
71 | + if (!isset($characteristicModel)) { |
|
72 | 72 | return null; |
73 | 73 | } |
74 | 74 | return $characteristicModel->toDomain(); |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | { |
79 | 79 | $characteristicModel = CharacteristicsModel::query() |
80 | 80 | ->where('type', $type) |
81 | - ->where('pretty_page_label','LIKE', '%'.$search.'%') |
|
81 | + ->where('pretty_page_label', 'LIKE', '%'.$search.'%') |
|
82 | 82 | ->get(); |
83 | 83 | |
84 | - if(!isset($characteristicModel)){ |
|
84 | + if (!isset($characteristicModel)) { |
|
85 | 85 | return []; |
86 | 86 | } |
87 | - foreach ($characteristicModel as $characteristic){ |
|
87 | + foreach ($characteristicModel as $characteristic) { |
|
88 | 88 | $characteristics[] = $characteristic->toArray(); |
89 | 89 | } |
90 | 90 | return $characteristics ?? []; |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | class ContextRepositorySql implements ContextRepository |
14 | 14 | { |
15 | - public function getByUser(string $userId):?Context |
|
15 | + public function getByUser(string $userId): ?Context |
|
16 | 16 | { |
17 | 17 | $user = User::where('uuid', $userId)->first(); |
18 | 18 | return $user->context !== null ? $user->context->toDomain() : null; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function getByUserDto(string $userId): ?ContextDto |
36 | 36 | { |
37 | 37 | $user = User::where('uuid', $userId)->first(); |
38 | - if($user === null){ |
|
38 | + if ($user === null) { |
|
39 | 39 | return null; |
40 | 40 | } |
41 | 41 | return $user->context !== null ? $user->context->toDto($user->uuid) : null; |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | public function update(Context $context, string $userId) |
45 | 45 | { |
46 | 46 | $user = User::where('uuid', $userId)->first(); |
47 | - if($user === null){ |
|
47 | + if ($user === null) { |
|
48 | 48 | return null; |
49 | 49 | } |
50 | 50 | |
51 | 51 | $contextModel = $user->context; |
52 | - if($contextModel === null){ |
|
52 | + if ($contextModel === null) { |
|
53 | 53 | return null; |
54 | 54 | } |
55 | 55 | $contextData = collect($context->toArray()); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | public function adminlte_image() |
38 | 38 | { |
39 | 39 | $urlPicture = $this->path_picture != "" ? asset('storage/'.str_replace('app/public/', '', $this->path_picture)) : null; |
40 | - if(!isset($urlPicture) || $urlPicture === ""){ |
|
40 | + if (!isset($urlPicture) || $urlPicture === "") { |
|
41 | 41 | $urlPicture = url('').'/'.config('adminlte.logo_img'); |
42 | 42 | } |
43 | 43 | return $urlPicture; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | public function adminlte_desc() |
47 | 47 | { |
48 | 48 | $desc = $this->firstname.' '.$this->lastname; |
49 | - if($this->organization_id !== null){ |
|
49 | + if ($this->organization_id !== null) { |
|
50 | 50 | $organization = app(OrganizationRepository::class)->get($this->organization_id); |
51 | 51 | $desc .= ' - organisme : '.$organization->name(); |
52 | 52 | } |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | |
86 | 86 | public function addCharacteristics(array $characteristics) |
87 | 87 | { |
88 | - foreach($characteristics as $characteristicUuid){ |
|
89 | - $characteristic = CharacteristicsModel::where('uuid', (string)$characteristicUuid)->first(); |
|
90 | - if(isset($characteristic)) { |
|
88 | + foreach ($characteristics as $characteristicUuid) { |
|
89 | + $characteristic = CharacteristicsModel::where('uuid', (string) $characteristicUuid)->first(); |
|
90 | + if (isset($characteristic)) { |
|
91 | 91 | $this->characteristics()->save($characteristic); |
92 | 92 | } |
93 | 93 | } |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | public function syncCharacteristics(array $characteristics) |
97 | 97 | { |
98 | 98 | $characteristicsToSync = []; |
99 | - foreach($characteristics as $characteristicUuid){ |
|
100 | - $characteristicModel = CharacteristicsModel::where('uuid', (string)$characteristicUuid)->first(); |
|
101 | - if(isset($characteristicModel)) { |
|
99 | + foreach ($characteristics as $characteristicUuid) { |
|
100 | + $characteristicModel = CharacteristicsModel::where('uuid', (string) $characteristicUuid)->first(); |
|
101 | + if (isset($characteristicModel)) { |
|
102 | 102 | $characteristicsToSync[] = $characteristicModel->id; |
103 | 103 | } |
104 | 104 | } |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $farmingType = $request->input('farming_type') !== null ? $request->input('farming_type') : []; |
45 | 45 | |
46 | 46 | $fillWikiUserProfile->fill(Auth::user()->uuid, $role, $firstname, $lastname, $email, $postalCode, $farmingType); |
47 | - if(session()->has('wiki_callback')){ |
|
47 | + if (session()->has('wiki_callback')) { |
|
48 | 48 | return $this->redirectToWiki(); |
49 | 49 | } |
50 | 50 | return redirect(config('neayi.wiki_url')); |