Completed
Pull Request — master (#77)
by guillaume
06:20
created
app/Src/UseCases/Infra/Gateway/SessionAuthGateway.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
     public function current(): ?User
15 15
     {
16 16
         $userModel = Auth::user();
17
-        if(!isset($userModel)){
17
+        if (!isset($userModel)) {
18 18
             return null;
19 19
         }
20 20
         $roles = $userModel->roles()->pluck('name')->toArray();
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         Auth::login($authenticate, true);
28 28
     }
29 29
 
30
-    public function wikiSessionId():? string
30
+    public function wikiSessionId(): ? string
31 31
     {
32 32
         return Session::get('wiki_session_id');
33 33
     }
Please login to merge, or discard this patch.
app/Src/UseCases/Infra/Sql/InteractionPageRepositorySql.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
             ->where('page_id', $interaction->pageId())
25 25
             ->first();
26 26
 
27
-        if($interactionModel === null) {
27
+        if ($interactionModel === null) {
28 28
             $interactionModel = new InteractionModel();
29 29
             $interactionModel->{$canInteract->key()} = isset($user->id) ? $user->id : $canInteract->identifier();
30 30
         }
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
     public function getByInteractUser(CanInteract $canInteract, int $pageId): ?Interaction
38 38
     {
39
-        if($canInteract->key() == 'user_id') {
39
+        if ($canInteract->key() == 'user_id') {
40 40
             $user = User::query()->where('uuid', $canInteract->identifier())->first();
41 41
         }
42 42
 
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             ->where('page_id', $pageId)
46 46
             ->first();
47 47
 
48
-        if(!isset($interactionModel)){
48
+        if (!isset($interactionModel)) {
49 49
             return null;
50 50
         }
51 51
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             ->orderBy('updated_at', 'desc')
82 82
             ->get();
83 83
 
84
-        foreach($interactionsModel as $interaction) {
84
+        foreach ($interactionsModel as $interaction) {
85 85
             $page = PageModel::query()->where('page_id', $interaction->page_id)->first();
86 86
             $applause = InteractionModel::query()->where('page_id', $interaction->page_id)->where('applause', true)->count();
87 87
             if ($interaction->follow) {
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
             ->where('user_id', $user->id)
104 104
             ->where('done', true)
105 105
             ->get();
106
-        foreach ($records as $record){
106
+        foreach ($records as $record) {
107 107
             $practises[] = new PractiseVo(
108 108
                 $record->page_id,
109 109
                 $record->page->title ?? '',
Please login to merge, or discard this patch.
app/Src/UseCases/Infra/Sql/ContextRepositorySql.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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,8 +87,8 @@  discard block
 block discarded – undo
87 87
 
88 88
         $farmings = $contextData->get('farmings');
89 89
         $characteristics = [];
90
-        foreach($farmings as $farming){
91
-            $characteristicModel = CharacteristicsModel::where('uuid', (string)$farming)->first();
90
+        foreach ($farmings as $farming) {
91
+            $characteristicModel = CharacteristicsModel::where('uuid', (string) $farming)->first();
92 92
             $characteristics[] = isset($characteristicModel) ? $characteristicModel->id : '';
93 93
         }
94 94
         $user->characteristics()->sync($characteristics);
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/User.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
         return ucfirst($this->firstname).' '.ucfirst($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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Agricultural/Queries/GetLastWikiUserComments.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $userData = $user->toArray();
29 29
         $username = ucfirst($userData['firstname']).'_'.ucfirst($userData['lastname']);
30 30
         $comments = Cache::get("comments_".$userId);
31
-        if(isset($comments)){
31
+        if (isset($comments)) {
32 32
             return json_decode($comments, true);
33 33
         }
34 34
 
@@ -37,13 +37,13 @@  discard block
 block discarded – undo
37 37
         $comments = $content['query']['usercontribs'];
38 38
 
39 39
         $commentsToRetrieved = [];
40
-        foreach($comments as $comment){
41
-            if(!isset($commentsToRetrieved[$comment['pageid']])) {
40
+        foreach ($comments as $comment) {
41
+            if (!isset($commentsToRetrieved[$comment['pageid']])) {
42 42
                 $commentsToRetrieved[$comment['pageid']] = $comment;
43 43
             }
44 44
         }
45 45
 
46
-        foreach($commentsToRetrieved as $pageId => $commentToRetrieved){
46
+        foreach ($commentsToRetrieved as $pageId => $commentToRetrieved) {
47 47
             $response = $this->httpClient->get(config('wiki.api_uri').$this->commentEndPoint.$pageId);
48 48
             $content = json_decode($response->getBody()->getContents(), true);
49 49
             $commentsToRetrieved[$pageId] = array_merge($commentsToRetrieved[$pageId], $content['csquerycomment']);
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Agricultural/Dto/PractiseVo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
         $this->doneAt = $doneAt;
18 18
     }
19 19
 
20
-    public function doneAt():?\DateTime
20
+    public function doneAt(): ?\DateTime
21 21
     {
22 22
         return $this->doneAt;
23 23
     }
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Agricultural/Dto/GetUserPractises.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
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()->format('Y');
24 24
             $practisesToReturn[$year][] = $practise->toArray();
25 25
         }
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Agricultural/Dto/ContextDto.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
         $this->postalCode = $postalCode;
34 34
         $this->department = (new PostalCode($postalCode))->department();
35 35
         $this->characteristics = $characteristics;
36
-        foreach($this->characteristics as $characteristic){
36
+        foreach ($this->characteristics as $characteristic) {
37 37
             $this->characteristicsByType[$characteristic->type()][] = $characteristic;
38 38
         }
39 39
         $this->description = $description;
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Agricultural/Dto/CharacteristicDto.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     public $type;
13 13
     public $icon;
14 14
 
15
-    public function __construct(string $uuid,  string $label, string $type, ?string $icon, $prettyLabel)
15
+    public function __construct(string $uuid, string $label, string $type, ?string $icon, $prettyLabel)
16 16
     {
17 17
         $this->uuid = $uuid;
18 18
         $this->label = $label;
Please login to merge, or discard this patch.