@@ -29,7 +29,7 @@ |
||
29 | 29 | public function execute(string $id, string $type, string $title) |
30 | 30 | { |
31 | 31 | $characteristic = $this->characteristicRepository->getBy(['title' => $title, 'type' => $type]); |
32 | - if(!isset($characteristic)){ |
|
32 | + if (!isset($characteristic)) { |
|
33 | 33 | $characteristic = new Characteristic($id, $type, $title, false); |
34 | 34 | $characteristic->create(); |
35 | 35 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | |
32 | 32 | public function create(string $icon = null) |
33 | 33 | { |
34 | - if(isset($icon)){ |
|
34 | + if (isset($icon)) { |
|
35 | 35 | copy(storage_path('app/'.$icon), storage_path('app/public/characteristics/'.$this->id.'.png')); |
36 | 36 | $this->icon = 'public/characteristics/'.$this->id.'.png'; |
37 | 37 | } |
@@ -34,17 +34,17 @@ |
||
34 | 34 | return $this->pageId; |
35 | 35 | } |
36 | 36 | |
37 | - public function title():?string |
|
37 | + public function title(): ?string |
|
38 | 38 | { |
39 | 39 | return $this->title; |
40 | 40 | } |
41 | 41 | |
42 | - public function type():?string |
|
42 | + public function type(): ?string |
|
43 | 43 | { |
44 | 44 | return $this->type; |
45 | 45 | } |
46 | 46 | |
47 | - public function icon():?string |
|
47 | + public function icon(): ?string |
|
48 | 48 | { |
49 | 49 | return $this->icon; |
50 | 50 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | public function getByType(string $type, bool $isMain):array; |
12 | 12 | public function getAllByType(string $type):array; |
13 | 13 | public function save(Characteristic $c); |
14 | - public function getBy(array $conditions):?Characteristic; |
|
14 | + public function getBy(array $conditions): ?Characteristic; |
|
15 | 15 | public function search(string $type, string $search):array; |
16 | - public function getByPageId(int $pageId):?Characteristic; |
|
16 | + public function getByPageId(int $pageId): ?Characteristic; |
|
17 | 17 | } |
@@ -45,12 +45,12 @@ |
||
45 | 45 | return $this->visible; |
46 | 46 | } |
47 | 47 | |
48 | - public function icon():? string |
|
48 | + public function icon(): ? string |
|
49 | 49 | { |
50 | 50 | return $this->icon; |
51 | 51 | } |
52 | 52 | |
53 | - public function pageId():? int |
|
53 | + public function pageId(): ? int |
|
54 | 54 | { |
55 | 55 | return $this->pageId; |
56 | 56 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $allCharacteristics = app(GetAllCharacteristics::class)->get(); |
36 | 36 | try { |
37 | 37 | $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray(); |
38 | - }catch (\Throwable $e){ |
|
38 | + } catch (\Throwable $e){ |
|
39 | 39 | Log::emergency($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString()); |
40 | 40 | return redirect()->route('wizard.profile'); |
41 | 41 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | try { |
68 | 68 | $user = app(GetUser::class)->get($userId)->toArray(); |
69 | - }catch (UserNotFound $e){ |
|
69 | + } catch (UserNotFound $e){ |
|
70 | 70 | throw new NotFoundHttpException(); |
71 | 71 | } |
72 | 72 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $allCharacteristics = app(GetAllCharacteristics::class)->get(); |
36 | 36 | try { |
37 | 37 | $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray(); |
38 | - }catch (\Throwable $e){ |
|
38 | + } catch (\Throwable $e) { |
|
39 | 39 | Log::emergency($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString()); |
40 | 40 | return redirect()->route('wizard.profile'); |
41 | 41 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $roles = app(GetUserRole::class)->get()->toArray(); |
44 | 44 | $practises = app(GetUserPractises::class)->get(Auth::user()->uuid); |
45 | 45 | $interactions = app(InteractionsQueryByUser::class)->get(Auth::user()->uuid); |
46 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics'], $context['characteristicsDepartement']); |
|
46 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics'], $context['characteristicsDepartement']); |
|
47 | 47 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
48 | 48 | $role = last($user['roles']); |
49 | 49 | $routeComment = route('profile.comments.show'); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | try { |
70 | 70 | $user = app(GetUser::class)->get($userId)->toArray(); |
71 | - }catch (UserNotFound $e){ |
|
71 | + } catch (UserNotFound $e) { |
|
72 | 72 | throw new NotFoundHttpException(); |
73 | 73 | } |
74 | 74 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $roles = app(GetUserRole::class)->get()->toArray(); |
78 | 78 | $practises = app(GetUserPractises::class)->get($userId); |
79 | 79 | $interactions = app(InteractionsQueryByUser::class)->get($userId); |
80 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
80 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
81 | 81 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
82 | 82 | $role = last($user['roles']); |
83 | 83 | |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$qry.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json'; |
144 | 144 | $response = $client->get($uri); |
145 | 145 | $content = json_decode($response->getBody()->getContents(), true); |
146 | - if(isset($content['query']['search'])){ |
|
146 | + if (isset($content['query']['search'])) { |
|
147 | 147 | $results = array_column($content['query']['search'], 'title'); |
148 | - return array_map(function ($item){ |
|
148 | + return array_map(function($item) { |
|
149 | 149 | return str_replace('Structure:', '', $item); |
150 | 150 | }, $results); |
151 | 151 | } |
@@ -38,9 +38,9 @@ |
||
38 | 38 | $pages = $this->pageRepository->getByIds($pagesIds); |
39 | 39 | |
40 | 40 | $characteristics = []; |
41 | - foreach ($pages as $page){ |
|
41 | + foreach ($pages as $page) { |
|
42 | 42 | $characteristic = $this->characteristicsRepository->getByPageId($page->pageId()); |
43 | - if(!isset($characteristic)){ |
|
43 | + if (!isset($characteristic)) { |
|
44 | 44 | $type = $page->type() === 'Culture' ? Characteristic::FARMING_TYPE : Characteristic::CROPPING_SYSTEM; |
45 | 45 | $characteristic = new Characteristic( |
46 | 46 | Uuid::uuid4(), |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | |
16 | 16 | class ContextRepositorySql implements ContextRepository |
17 | 17 | { |
18 | - public function getByUser(string $userId):?Context |
|
18 | + public function getByUser(string $userId): ?Context |
|
19 | 19 | { |
20 | 20 | $user = User::where('uuid', $userId)->first(); |
21 | 21 | $context = DB::table('contexts')->where('id', $user->context_id)->first(); |
22 | - if($context == null){ |
|
22 | + if ($context == null) { |
|
23 | 23 | return null; |
24 | 24 | } |
25 | 25 | return new Context( |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | $user = User::where('uuid', $userId)->first(); |
39 | 39 | |
40 | 40 | $farmings = $contextData->get('farmings'); |
41 | - foreach($farmings as $farming){ |
|
42 | - $characteristic = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
41 | + foreach ($farmings as $farming) { |
|
42 | + $characteristic = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
43 | 43 | $user->characteristics()->save($characteristic); |
44 | 44 | } |
45 | 45 | |
@@ -51,21 +51,21 @@ discard block |
||
51 | 51 | public function getByUserDto(string $userId): ?ContextDto |
52 | 52 | { |
53 | 53 | $user = User::where('uuid', $userId)->first(); |
54 | - if($user == null){ |
|
54 | + if ($user == null) { |
|
55 | 55 | return null; |
56 | 56 | } |
57 | 57 | $context = ContextModel::find($user->context_id); |
58 | - if($context == null){ |
|
58 | + if ($context == null) { |
|
59 | 59 | return null; |
60 | 60 | } |
61 | - $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
61 | + $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
62 | 62 | return $item->toDto(); |
63 | 63 | }); |
64 | 64 | |
65 | 65 | $numberDepartment = (new PostalCode($context->postal_code))->department(); |
66 | 66 | $characteristicDepartment = CharacteristicsModel::query()->where('code', $numberDepartment)->first(); |
67 | 67 | |
68 | - if(isset($characteristicDepartment)){ |
|
68 | + if (isset($characteristicDepartment)) { |
|
69 | 69 | $characteristics->push($characteristicDepartment->toDto()); |
70 | 70 | } |
71 | 71 | |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | public function update(Context $context, string $userId) |
84 | 84 | { |
85 | 85 | $user = User::where('uuid', $userId)->first(); |
86 | - if($user == null){ |
|
86 | + if ($user == null) { |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | |
90 | 90 | $contextModel = ContextModel::where('uuid', $context->id())->first(); |
91 | - if($contextModel == null){ |
|
91 | + if ($contextModel == null) { |
|
92 | 92 | return null; |
93 | 93 | } |
94 | 94 | $contextData = collect($context->toArray()); |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | |
97 | 97 | $farmings = $contextData->get('farmings'); |
98 | 98 | $characteristics = []; |
99 | - foreach($farmings as $farming){ |
|
100 | - $characteristicModel = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
101 | - if(isset($characteristicModel)) { |
|
99 | + foreach ($farmings as $farming) { |
|
100 | + $characteristicModel = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
101 | + if (isset($characteristicModel)) { |
|
102 | 102 | $characteristics[] = $characteristicModel->id; |
103 | 103 | } |
104 | 104 | } |
@@ -19,7 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | $practisesToReturn = []; |
21 | 21 | $practises = $this->interactionsRepository->getDoneByUser($userId); |
22 | - foreach ($practises as $practise){ |
|
22 | + foreach ($practises as $practise) { |
|
23 | 23 | $year = $practise->doneAt() !== null ? $practise->doneAt()->format('Y') : 'Non datée'; |
24 | 24 | $practisesToReturn[$year][] = $practise->toArray(); |
25 | 25 | } |