@@ -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 | } |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | class ContextRepositorySql implements ContextRepository |
| 16 | 16 | { |
| 17 | - public function getByUser(string $userId):?Context |
|
| 17 | + public function getByUser(string $userId): ?Context |
|
| 18 | 18 | { |
| 19 | 19 | $user = User::where('uuid', $userId)->first(); |
| 20 | 20 | $context = DB::table('contexts')->where('id', $user->context_id)->first(); |
| 21 | - if($context == null){ |
|
| 21 | + if ($context == null) { |
|
| 22 | 22 | return null; |
| 23 | 23 | } |
| 24 | 24 | return new Context( |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | $user = User::where('uuid', $userId)->first(); |
| 38 | 38 | |
| 39 | 39 | $farmings = $contextData->get('farmings'); |
| 40 | - foreach($farmings as $farming){ |
|
| 41 | - $characteristic = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
| 40 | + foreach ($farmings as $farming) { |
|
| 41 | + $characteristic = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
| 42 | 42 | $user->characteristics()->save($characteristic); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -50,14 +50,14 @@ discard block |
||
| 50 | 50 | public function getByUserDto(string $userId): ?ContextDto |
| 51 | 51 | { |
| 52 | 52 | $user = User::where('uuid', $userId)->first(); |
| 53 | - if($user == null){ |
|
| 53 | + if ($user == null) { |
|
| 54 | 54 | return null; |
| 55 | 55 | } |
| 56 | 56 | $context = ContextModel::find($user->context_id); |
| 57 | - if($context == null){ |
|
| 57 | + if ($context == null) { |
|
| 58 | 58 | return null; |
| 59 | 59 | } |
| 60 | - $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
| 60 | + $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
| 61 | 61 | return $item->toDto(); |
| 62 | 62 | }); |
| 63 | 63 | return new ContextDto( |
@@ -74,12 +74,12 @@ discard block |
||
| 74 | 74 | public function update(Context $context, string $userId) |
| 75 | 75 | { |
| 76 | 76 | $user = User::where('uuid', $userId)->first(); |
| 77 | - if($user == null){ |
|
| 77 | + if ($user == null) { |
|
| 78 | 78 | return null; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | $contextModel = ContextModel::where('uuid', $context->id())->first(); |
| 82 | - if($contextModel == null){ |
|
| 82 | + if ($contextModel == null) { |
|
| 83 | 83 | return null; |
| 84 | 84 | } |
| 85 | 85 | $contextData = collect($context->toArray()); |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | $farmings = $contextData->get('farmings'); |
| 89 | 89 | $characteristics = []; |
| 90 | - foreach($farmings as $farming){ |
|
| 91 | - $characteristicModel = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
| 92 | - if(isset($characteristicModel)) { |
|
| 90 | + foreach ($farmings as $farming) { |
|
| 91 | + $characteristicModel = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
| 92 | + if (isset($characteristicModel)) { |
|
| 93 | 93 | $characteristics[] = $characteristicModel->id; |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -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']); |
|
| 46 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
| 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(), |