Completed
Pull Request — master (#218)
by Philippe
62:15 queued 09:09
created
src/Concerns/Viewable/ViewPath.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public function get(): string
36 36
     {
37
-        $basePath = $this->viewBasePath ? $this->viewBasePath . '.' : '';
37
+        $basePath = $this->viewBasePath ? $this->viewBasePath.'.' : '';
38 38
         $guessedParentViewName = $this->parent ? $this->parent->viewKey() : '';
39 39
         $guessedViewName = $this->viewable->viewKey();
40 40
 
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
         }
54 54
 
55 55
         foreach ($viewPaths as $viewPath) {
56
-            if (! view()->exists($viewPath)) {
56
+            if (!view()->exists($viewPath)) {
57 57
                 continue;
58 58
             }
59 59
 
60 60
             return $viewPath;
61 61
         }
62 62
 
63
-        if (! view()->exists($basePath.'show')) {
63
+        if (!view()->exists($basePath.'show')) {
64 64
             throw new NotFoundView('Viewfile not found for ['.get_class($this->viewable).']. Make sure the view ['.$basePath.$guessedViewName.'] or the default view ['.$basePath.'show] exists.');
65 65
         }
66 66
     }
Please login to merge, or discard this patch.
src/Nav/Nav.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
     public static function fromKeys($keys)
21 21
     {
22
-        $keys = (array) $keys;
22
+        $keys = (array)$keys;
23 23
         $collection = collect();
24 24
 
25 25
         /** @var Managers */
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
     public static function fromTags($tags)
35 35
     {
36
-        $tags = (array) $tags;
36
+        $tags = (array)$tags;
37 37
         $collection = collect();
38 38
 
39 39
         /** @var Managers */
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 
53 53
     private static function fromManagers(Collection $collection)
54 54
     {
55
-        return new static(...$collection->reject(function ($manager) {
55
+        return new static(...$collection->reject(function($manager) {
56 56
             return !$manager->can('index');
57
-        })->map(function ($manager) {
57
+        })->map(function($manager) {
58 58
             return new NavItem($manager->details()->plural, $manager->route('index'), [
59 59
                 'key' => $manager->details()->key,
60 60
                 'tags' => app(Register::class)->filterByKey($manager->details()->key)->first()->tags()
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
     public function rejectKeys($keys)
66 66
     {
67
-        $keys = (array) $keys;
67
+        $keys = (array)$keys;
68 68
 
69 69
         foreach ($this->items as $k => $item) {
70 70
             if (in_array($item->details('key', ''), $keys)) {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
     public function rejectTags($tags)
79 79
     {
80
-        $tags = (array) $tags;
80
+        $tags = (array)$tags;
81 81
 
82 82
         foreach ($this->items as $k => $item) {
83 83
             if (count(array_intersect($item->details('tags', []), $tags)) > 0) {
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         $output = '';
120 120
 
121 121
         foreach ($this->items as $item) {
122
-            $output .= '<a class="' . (isActiveUrl($item->url()) ? 'active' : '') . '" href="'.$item->url().'">';
122
+            $output .= '<a class="'.(isActiveUrl($item->url()) ? 'active' : '').'" href="'.$item->url().'">';
123 123
             $output .= $title ?? ucfirst($item->title());
124 124
             $output .= '</a>';
125 125
         }
@@ -146,14 +146,14 @@  discard block
 block discarded – undo
146 146
 
147 147
         $items = '';
148 148
         foreach ($this->items as $item) {
149
-            $items .= '<a class="' . (isActiveUrl($item->url()) ? 'active' : '') . '" href="'.$item->url().'">';
149
+            $items .= '<a class="'.(isActiveUrl($item->url()) ? 'active' : '').'" href="'.$item->url().'">';
150 150
             $items .= ucfirst($item->title());
151 151
             $items .= '</a>';
152 152
         }
153 153
 
154 154
         // Surround within vue dropdown
155 155
         $output = '<dropdown>';
156
-        $output .= '<span class="center-y nav-item" slot="trigger" slot-scope="{ toggle, isActive }" @click="toggle">'. ($title ?? 'Collecties') .'</span>';
156
+        $output .= '<span class="center-y nav-item" slot="trigger" slot-scope="{ toggle, isActive }" @click="toggle">'.($title ?? 'Collecties').'</span>';
157 157
         $output .= '<div v-cloak class="dropdown-box inset-s">';
158 158
         $output .= $items;
159 159
         $output .= '</div>';
Please login to merge, or discard this patch.
src/Settings/Application/ChangeHomepage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
     {
54 54
         foreach ($flatReferences as $locale => $flatReferenceString) {
55 55
             if (!$flatReferenceString) {
56
-                throw new \InvalidArgumentException('Homepage setting value cannot be empty. Value for locale ' . $locale . ' is missing.');
56
+                throw new \InvalidArgumentException('Homepage setting value cannot be empty. Value for locale '.$locale.' is missing.');
57 57
             }
58 58
         }
59 59
     }
Please login to merge, or discard this patch.
src/Fields/LocalizedFieldValidationRules.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
                 // prepend the name with the expected trans.<locale>. string
28 28
                 $localizedAttr = (false !== strpos($attr, ':locale'))
29 29
                     ? str_replace(':locale', $locale, $attr)
30
-                    : 'trans.' . $locale . '.' . $attr;
30
+                    : 'trans.'.$locale.'.'.$attr;
31 31
 
32 32
                 $localizedAttr = $this->replaceBracketsByDots($localizedAttr);
33 33
 
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
      */
50 50
     public function influenceByPayload(array $data)
51 51
     {
52
-        if (! isset($data['trans'])) {
52
+        if (!isset($data['trans'])) {
53 53
             return $this;
54 54
         }
55 55
 
56 56
         // Remove locales that are considered empty in the request payload
57 57
         foreach ($data['trans'] as $locale => $values) {
58
-            if ($locale == $this->defaultLocale || ! is_array_empty($values)) {
58
+            if ($locale == $this->defaultLocale || !is_array_empty($values)) {
59 59
                 continue;
60 60
             }
61 61
 
Please login to merge, or discard this patch.
src/Urls/UrlHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,21 +15,21 @@
 block discarded – undo
15 15
      */
16 16
     public static function allOnlineModels(bool $onlySingles = false): array
17 17
     {
18
-        return chiefMemoize('all-online-models', function () use ($onlySingles) {
18
+        return chiefMemoize('all-online-models', function() use ($onlySingles) {
19 19
             $builder = UrlRecord::whereNull('redirect_id')->select('model_type', 'model_id')->groupBy('model_type', 'model_id');
20 20
 
21 21
             if ($onlySingles) {
22 22
                 $builder->where('model_type', 'singles');
23 23
             }
24 24
 
25
-            $liveUrlRecords = $builder->get()->mapToGroups(function ($record) {
25
+            $liveUrlRecords = $builder->get()->mapToGroups(function($record) {
26 26
                 return [$record->model_type => $record->model_id];
27 27
             });
28 28
 
29 29
             // Get model for each of these records...
30
-            $models = $liveUrlRecords->map(function ($record, $key) {
30
+            $models = $liveUrlRecords->map(function($record, $key) {
31 31
                 return Morphables::instance($key)->find($record->toArray());
32
-            })->map->reject(function ($model) {
32
+            })->map->reject(function($model) {
33 33
                 // Invalid references to archived or removed models where url record still exists.
34 34
                 return is_null($model) || !$model->isPublished();
35 35
             })->flatten();
Please login to merge, or discard this patch.
src/Urls/UrlSlugFields.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
     public static function redirectsFromModel(ProvidesUrl $model)
20 20
     {
21
-        $records = MemoizedUrlRecord::getByModel($model)->reject(function ($record) {
21
+        $records = MemoizedUrlRecord::getByModel($model)->reject(function($record) {
22 22
             return !$record->isRedirect();
23 23
         })->sortByDesc('created_at');
24 24
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
             $fields[$key] = UrlSlugField::make($key)
30 30
                 ->setUrlRecord($record)
31 31
                 ->setBaseUrlSegment($model->baseUrlSegment($record->locale))
32
-                ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) . ($record->slug != '/' ? '/' : ''));
32
+                ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).($record->slug != '/' ? '/' : ''));
33 33
         }
34 34
 
35 35
         return $fields;
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
         $fields = new static([]);
62 62
 
63 63
         foreach ($locales as $locale) {
64
-            $fields['url-slugs.' . $locale] = UrlSlugField::make('url-slugs.' . $locale)
64
+            $fields['url-slugs.'.$locale] = UrlSlugField::make('url-slugs.'.$locale)
65 65
                                                 ->setBaseUrlSegment($model->baseUrlSegment($locale))
66
-                                                ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)) .'/')
67
-                                                ->name('url-slugs[' . $locale . ']')
66
+                                                ->prepend($model->resolveUrl($locale, $model->baseUrlSegment($locale)).'/')
67
+                                                ->name('url-slugs['.$locale.']')
68 68
                                                 ->label($locale);
69 69
         }
70 70
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
      */
78 78
     private static function fillWithExistingValues(ProvidesUrl $model, self $fields): void
79 79
     {
80
-        $records = UrlRecord::getByModel($model)->reject(function ($record) {
80
+        $records = UrlRecord::getByModel($model)->reject(function($record) {
81 81
             return $record->isRedirect();
82 82
         })->sortBy('locale');
83 83
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
             $fields['url-slugs.'.$record->locale]
90 90
                 ->setUrlRecord($record)
91 91
                 ->setBaseUrlSegment($model->baseUrlSegment($record->locale))
92
-                ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)) .'/');
92
+                ->prepend($model->resolveUrl($record->locale, $model->baseUrlSegment($record->locale)).'/');
93 93
         }
94 94
     }
95 95
 }
Please login to merge, or discard this patch.
src/Management/AbstractManager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
         $builder->orderBy('updated_at', 'DESC');
79 79
 
80
-        return $builder->get()->map(function ($model) {
80
+        return $builder->get()->map(function($model) {
81 81
             return (new static($this->registration))->manage($model);
82 82
         });
83 83
     }
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 
146 146
     public function guard($verb): Manager
147 147
     {
148
-        if (! $this->can($verb)) {
148
+        if (!$this->can($verb)) {
149 149
             NotAllowedManagerRoute::notAllowedVerb($verb, $this);
150 150
         }
151 151
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         $fields = $this->fields();
169 169
 
170 170
         foreach ($this->assistants() as $assistant) {
171
-            if (! method_exists($assistant, 'fields')) {
171
+            if (!method_exists($assistant, 'fields')) {
172 172
                 continue;
173 173
             }
174 174
 
Please login to merge, or discard this patch.
src/Pages/Page.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             return static::$managedModelKey;
84 84
         }
85 85
 
86
-        throw new \Exception('Missing required static property \'managedModelKey\' on ' . static::class. '.');
86
+        throw new \Exception('Missing required static property \'managedModelKey\' on '.static::class.'.');
87 87
     }
88 88
 
89 89
     /**
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
     public function flatReferenceLabel(): string
124 124
     {
125 125
         if ($this->exists) {
126
-            $status = ! $this->isPublished() ? ' [' . $this->statusAsPlainLabel().']' : null;
126
+            $status = !$this->isPublished() ? ' ['.$this->statusAsPlainLabel().']' : null;
127 127
 
128
-            return $this->title ? $this->title . $status : '';
128
+            return $this->title ? $this->title.$status : '';
129 129
         }
130 130
 
131 131
         return '';
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         // What was the creator of the assetlibrary package thinking. It sure wasn't me... I promise...
146 146
         $assets = $this->getAllFiles($type, app()->getLocale())->map->getFileUrl();
147 147
 
148
-        if($assets->first() == null)
148
+        if ($assets->first() == null)
149 149
         {
150 150
             $assets = $this->getAllFiles($type)->map->getFileUrl();
151 151
         }
Please login to merge, or discard this patch.
src/Media/UploadMedia.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
         // When no files are uploaded, we still would like to sort our assets duh
27 27
         if (empty($files_by_type)) {
28
-            foreach($files_order_by_type as $type => $fileIdsCollection){
28
+            foreach ($files_order_by_type as $type => $fileIdsCollection) {
29 29
                 $this->sortFiles($model, $type, $fileIdsCollection);
30 30
             }
31 31
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
         foreach ($files_by_type as $type => $files) {
36 36
 
37
-            foreach($files as $locale => $files)
37
+            foreach ($files as $locale => $files)
38 38
             {
39 39
                 $this->validateFileUploads($files);
40 40
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         if (is_string($file)) {
69 69
             $image_name = json_decode($file)->output->name;
70 70
             $asset      = $this->addAsset(json_decode($file)->output->image, $type, $locale, $image_name, $model);
71
-        } else {
71
+        }else {
72 72
             $image_name = $file->getClientOriginalName();
73 73
             $asset      = $this->addAsset($file, $type, $locale, $image_name, $model);
74 74
         }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         if (is_string($file)) {
93 93
             $asset = AssetUploader::uploadFromBase64($file, $filename);
94
-        } else {
94
+        }else {
95 95
             $asset = AssetUploader::upload($file, $filename);
96 96
         }
97 97
 
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
      */
138 138
     private function sluggifyFilename($filename): string
139 139
     {
140
-        $extension = substr($filename, strrpos($filename, '.') + 1);
140
+        $extension = substr($filename, strrpos($filename, '.')+1);
141 141
         $filename  = substr($filename, 0, strrpos($filename, '.'));
142
-        $filename  = str_slug($filename) . '.' . $extension;
142
+        $filename  = str_slug($filename).'.'.$extension;
143 143
 
144 144
         return $filename;
145 145
     }
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
                 if ($file instanceof UploadedFile && !$file->isValid()) {
156 156
                     if ($file->getError() == UPLOAD_ERR_INI_SIZE) {
157 157
                         throw new FileTooBigException(
158
-                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' .
159
-                            'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' .
160
-                            'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB'
158
+                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '.
159
+                            'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '.
160
+                            'post_max_size: '.(int)(ini_get('post_max_size')).'MB'
161 161
                         );
162 162
                     }
163 163
                 }
@@ -169,31 +169,31 @@  discard block
 block discarded – undo
169 169
     {
170 170
         $actions = ['new', 'replace', 'delete'];
171 171
 
172
-        foreach($files_by_type as $type => $files)
172
+        foreach ($files_by_type as $type => $files)
173 173
         {
174
-            foreach($files as $locale => $_files){
175
-                if(!in_array($locale, config('translatable.locales'))) {
176
-                    throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.');
174
+            foreach ($files as $locale => $_files) {
175
+                if (!in_array($locale, config('translatable.locales'))) {
176
+                    throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.');
177 177
                 }
178 178
 
179
-                if(!is_array($_files)) {
180
-                    throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a ' . gettype($_files) . ' is given.');
179
+                if (!is_array($_files)) {
180
+                    throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a '.gettype($_files).' is given.');
181 181
                 }
182 182
 
183
-                foreach($_files as $action => $file) {
184
-                    if(!in_array($action, $actions)) {
185
-                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.');
183
+                foreach ($_files as $action => $file) {
184
+                    if (!in_array($action, $actions)) {
185
+                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.');
186 186
                     }
187 187
                 }
188 188
             }
189 189
         }
190 190
 
191
-        foreach($files_order_by_type as $type => $fileIdsCollection)
191
+        foreach ($files_order_by_type as $type => $fileIdsCollection)
192 192
         {
193
-            foreach($fileIdsCollection as $locale => $commaSeparatedFileIds){
193
+            foreach ($fileIdsCollection as $locale => $commaSeparatedFileIds) {
194 194
 
195
-                if(!in_array($locale, config('translatable.locales'))) {
196
-                    throw new \InvalidArgumentException('Corrupt file payload. key for the file order is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.');
195
+                if (!in_array($locale, config('translatable.locales'))) {
196
+                    throw new \InvalidArgumentException('Corrupt file payload. key for the file order is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.');
197 197
                 }
198 198
             }
199 199
         }
@@ -203,13 +203,13 @@  discard block
 block discarded – undo
203 203
     {
204 204
         $defaultLocale = config('app.fallback_locale');
205 205
 
206
-        foreach($files_by_type as $type => $files)
206
+        foreach ($files_by_type as $type => $files)
207 207
         {
208
-            foreach($files as $locale => $_files){
209
-                if(!in_array($locale, config('translatable.locales'))) {
208
+            foreach ($files as $locale => $_files) {
209
+                if (!in_array($locale, config('translatable.locales'))) {
210 210
                     unset($files_by_type[$type][$locale]);
211 211
 
212
-                    if(!isset($files_by_type[$type][$defaultLocale])) {
212
+                    if (!isset($files_by_type[$type][$defaultLocale])) {
213 213
                         $files_by_type[$type][$defaultLocale] = [];
214 214
                     }
215 215
 
@@ -225,14 +225,14 @@  discard block
 block discarded – undo
225 225
     {
226 226
         $defaultLocale = config('app.fallback_locale');
227 227
 
228
-        foreach($files_order_by_type as $type => $fileIdsCollection)
228
+        foreach ($files_order_by_type as $type => $fileIdsCollection)
229 229
         {
230
-            if(!is_array($fileIdsCollection)) {
230
+            if (!is_array($fileIdsCollection)) {
231 231
                 $fileIdsCollection = [$defaultLocale => $fileIdsCollection];
232 232
                 $files_order_by_type[$type] = $fileIdsCollection;
233 233
             }
234 234
 
235
-            foreach($fileIdsCollection as $locale => $commaSeparatedFileIds){
235
+            foreach ($fileIdsCollection as $locale => $commaSeparatedFileIds) {
236 236
                 $files_order_by_type[$type][$locale] = explode(',', $commaSeparatedFileIds);
237 237
             }
238 238
         }
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
     {
245 245
         $sortedFileIds = [];
246 246
 
247
-        foreach($fileIdsCollection as $locale => $fileIds) {
247
+        foreach ($fileIdsCollection as $locale => $fileIds) {
248 248
             $sortedFileIds = array_merge($sortedFileIds, $fileIds);
249 249
         }
250 250
 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
     {
256 256
         $assets = $model->assets()->where('asset_pivots.type', $type)->get();
257 257
 
258
-        foreach($assets as $asset)
258
+        foreach ($assets as $asset)
259 259
         {
260 260
             $pivot = $asset->pivot;
261 261
             $pivot->order = array_search($asset->id, $sortedAssetIds);
Please login to merge, or discard this patch.