Completed
Pull Request — master (#78)
by Bertrand
07:18
created
app/Console/Commands/ImportCharacteristicsFromWiki.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
     // @see https://wiki.tripleperformance.fr/wiki/Aide:Requettes_Insights
23 23
     private $queryFarming = "?action=ask&api_version=3&query=[[Est un élément de profil::Production]]|?A un fichier d'icone de caractéristique|?Doit être affiché par défaut|?A une priorité d'affichage|?A un label|sort=A une priorité d'affichage|order=asc&format=json";
24
-    private $queryCroppingSystem  = "?action=ask&api_version=3&query=[[Est un élément de profil::Cahier des charges]]|?A un fichier d'icone de caractéristique|?Doit être affiché par défaut|?A une priorité d'affichage|?A un label|sort=A une priorité d'affichage|order=asc&format=json";
24
+    private $queryCroppingSystem = "?action=ask&api_version=3&query=[[Est un élément de profil::Cahier des charges]]|?A un fichier d'icone de caractéristique|?Doit être affiché par défaut|?A une priorité d'affichage|?A un label|sort=A une priorité d'affichage|order=asc&format=json";
25 25
 
26 26
 
27 27
     public function __construct()
@@ -46,27 +46,27 @@  discard block
 block discarded – undo
46 46
         $content = json_decode($response->getBody()->getContents(), true);
47 47
         $characteristics = $content['query']['results'];
48 48
 
49
-        foreach ($characteristics as $key => $characteristic){
49
+        foreach ($characteristics as $key => $characteristic) {
50 50
             $page = key($characteristic);
51 51
             $characteristic = last($characteristic);
52 52
 
53 53
             $uuid = Uuid::uuid4();
54 54
             $path = '';
55
-            if(isset($characteristic['printouts']['A un fichier d\'icone de caractéristique'][0]['fulltext'])) {
55
+            if (isset($characteristic['printouts']['A un fichier d\'icone de caractéristique'][0]['fulltext'])) {
56 56
                 $picture = $characteristic['printouts']['A un fichier d\'icone de caractéristique'][0]['fulltext'];
57 57
                 $picturesApiUri = config('wiki.api_uri').$queryPictures.$picture;
58 58
 
59 59
                 $response = $this->httpClient->get($picturesApiUri);
60 60
                 $content = json_decode($response->getBody()->getContents(), true);
61 61
                 $picturesInfo = $content['query']['pages'];
62
-                foreach($picturesInfo as $picture) {
62
+                foreach ($picturesInfo as $picture) {
63 63
                     if (isset(last($picture['imageinfo'])['url'])) {
64 64
                         try {
65 65
                             $response = $this->httpClient->get(last($picture['imageinfo'])['url']);
66 66
                             $content = $response->getBody()->getContents();
67
-                            $path = 'public/characteristics/' . $uuid . '.png';
68
-                            Storage::put('public/characteristics/' . $uuid . '.png', $content);
69
-                        }catch (ClientException $e){
67
+                            $path = 'public/characteristics/'.$uuid.'.png';
68
+                            Storage::put('public/characteristics/'.$uuid.'.png', $content);
69
+                        } catch (ClientException $e) {
70 70
                             $path = '';
71 71
                         }
72 72
                     }
@@ -86,17 +86,17 @@  discard block
 block discarded – undo
86 86
             $characteristicsToSave = [
87 87
                 'uuid' => $uuid,
88 88
                 'main' => $main,
89
-                'priority' => (int)last($characteristic['printouts']['A une priorité d\'affichage']),
89
+                'priority' => (int) last($characteristic['printouts']['A une priorité d\'affichage']),
90 90
                 'icon' => $path,
91 91
                 'page_label' => $label,
92 92
                 'pretty_page_label' => $prettyPage,
93
-                'page_id' => (int)$pageInfo['pageid'],
93
+                'page_id' => (int) $pageInfo['pageid'],
94 94
                 'type' => $type,
95 95
                 'code' => $pageInfo['title']
96 96
             ];
97 97
 
98
-            $model = CharacteristicsModel::where('page_id', (int)$pageInfo['pageid'])->first();
99
-            if(!isset($model)) {
98
+            $model = CharacteristicsModel::where('page_id', (int) $pageInfo['pageid'])->first();
99
+            if (!isset($model)) {
100 100
                 $model = new CharacteristicsModel();
101 101
             }
102 102
             $model->fill($characteristicsToSave);
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
                             $content = $response->getBody()->getContents();
67 67
                             $path = 'public/characteristics/' . $uuid . '.png';
68 68
                             Storage::put('public/characteristics/' . $uuid . '.png', $content);
69
-                        }catch (ClientException $e){
69
+                        } catch (ClientException $e){
70 70
                             $path = '';
71 71
                         }
72 72
                     }
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Ports/CharacteristicsRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,6 @@
 block discarded – undo
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 16
 }
Please login to merge, or discard this patch.
app/Src/UseCases/Infra/Sql/CharacteristicsRepositorySql.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
      */
40 40
     public function add(array $cs)
41 41
     {
42
-        foreach ($cs as $c){
42
+        foreach ($cs as $c) {
43 43
             $cModel = new CharacteristicsModel();
44 44
             $cModel->fill($c);
45 45
             $cModel->save();
@@ -64,13 +64,13 @@  discard block
 block discarded – undo
64 64
     public function getBy(array $conditions): ?Characteristic
65 65
     {
66 66
         $characteristicModel = CharacteristicsModel::query()
67
-            ->when(isset($conditions['type']), function ($query) use($conditions){
67
+            ->when(isset($conditions['type']), function($query) use($conditions){
68 68
                 $query->where('type', $conditions['type']);
69
-            })->when(isset($conditions['title']), function ($query) use($conditions){
69
+            })->when(isset($conditions['title']), function($query) use($conditions){
70 70
                 $query->where('code', $conditions['title']);
71 71
             })
72 72
             ->first();
73
-        if(!isset($characteristicModel)){
73
+        if (!isset($characteristicModel)) {
74 74
             return null;
75 75
         }
76 76
         return $characteristicModel->toDomain();
@@ -80,13 +80,13 @@  discard block
 block discarded – undo
80 80
     {
81 81
         $characteristicModel = CharacteristicsModel::query()
82 82
             ->where('type', $type)
83
-            ->where('pretty_page_label','LIKE', '%'.$search.'%')
83
+            ->where('pretty_page_label', 'LIKE', '%'.$search.'%')
84 84
             ->get();
85 85
 
86
-        if(!isset($characteristicModel)){
86
+        if (!isset($characteristicModel)) {
87 87
             return [];
88 88
         }
89
-        foreach ($characteristicModel as $characteristic){
89
+        foreach ($characteristicModel as $characteristic) {
90 90
             $characteristics[] = $characteristic->toArray();
91 91
         }
92 92
         return $characteristics ?? [];
Please login to merge, or discard this patch.
app/Src/UseCases/Domain/Users/RemoveAvatar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
     public function execute(string $uuid)
12 12
     {
13 13
         $user = User::query()->where('uuid', $uuid)->first();
14
-        if(!isset($user)){
14
+        if (!isset($user)) {
15 15
             return null;
16 16
         }
17 17
         $pathPicture = $user->path_picture;
Please login to merge, or discard this patch.
app/Http/Controllers/Profile/ProfileController.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@  discard block
 block discarded – undo
31 31
         $allCharacteristics = app(GetAllCharacteristics::class)->get();
32 32
         try {
33 33
             $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray();
34
-        }catch (\Throwable $e){
34
+        } catch (\Throwable $e) {
35 35
             return redirect()->route('wizard.profile');
36 36
         }
37 37
         $user = app(AuthGateway::class)->current()->toArray();
38 38
         $roles = app(GetUserRole::class)->get()->toArray();
39 39
         $practises = app(GetUserPractises::class)->get(Auth::user()->uuid);
40 40
         $interactions = app(InteractionsQueryByUser::class)->get(Auth::user()->uuid);
41
-        $usersCharacteristics =  array_merge($context['productions'], $context['characteristics']);
41
+        $usersCharacteristics = array_merge($context['productions'], $context['characteristics']);
42 42
         $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid');
43 43
         $role = last($user['roles']);
44 44
 
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
         $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$qry.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json';
105 105
         $response = $client->get($uri);
106 106
         $content = json_decode($response->getBody()->getContents(), true);
107
-        if(isset($content['query']['search'])){
107
+        if (isset($content['query']['search'])) {
108 108
             $results = array_column($content['query']['search'], 'title');
109
-            return array_map(function ($item){
109
+            return array_map(function($item) {
110 110
                 return str_replace('Structure:', '', $item);
111 111
             }, $results);
112 112
         }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         $allCharacteristics = app(GetAllCharacteristics::class)->get();
32 32
         try {
33 33
             $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray();
34
-        }catch (\Throwable $e){
34
+        } catch (\Throwable $e){
35 35
             return redirect()->route('wizard.profile');
36 36
         }
37 37
         $user = app(AuthGateway::class)->current()->toArray();
Please login to merge, or discard this patch.