Passed
Pull Request — 1.2 (#405)
by
unknown
08:49
created
src/Http/Requests/Admin/UserRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
                         'name' => 'required',
41 41
                         'role' => 'not_in:SUPERADMIN',
42 42
                         'email' => 'required|email|unique:' . config('twill.users_table', 'twill_users') . ',email,' . $this->route('user'),
43
-                        'verify-code' => function ($attribute, $value, $fail) {
43
+                        'verify-code' => function($attribute, $value, $fail) {
44 44
                             $user = Auth::guard('twill_users')->user();
45 45
                             $with2faSettings = config('twill.enabled.users-2fa') && $user->id == $this->route('user');
46 46
 
Please login to merge, or discard this patch.
src/Commands/GenerateBlocks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 
65 65
         $this->info(self::SCANNING_BLOCKS);
66 66
 
67
-        Collection::make($this->filesystem->files($path))->each(function ($viewFile) {
67
+        Collection::make($this->filesystem->files($path))->each(function($viewFile) {
68 68
             $blockName = $viewFile->getBasename('.blade.php');
69 69
 
70 70
             $vueBlockTemplate = $this->viewFactory->make('admin.blocks.' . $blockName, ['renderForBlocks' => true])->render();
Please login to merge, or discard this patch.
src/AuthServiceProvider.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -31,72 +31,72 @@
 block discarded – undo
31 31
 
32 32
     public function boot()
33 33
     {
34
-        Gate::define('list', function ($user) {
35
-            return $this->authorize($user, function ($user) {
34
+        Gate::define('list', function($user) {
35
+            return $this->authorize($user, function($user) {
36 36
                 return $this->userHasRole($user, [UserRole::VIEWONLY, UserRole::PUBLISHER, UserRole::ADMIN]);
37 37
             });
38 38
         });
39 39
 
40
-        Gate::define('edit', function ($user) {
41
-            return $this->authorize($user, function ($user) {
40
+        Gate::define('edit', function($user) {
41
+            return $this->authorize($user, function($user) {
42 42
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
43 43
             });
44 44
         });
45 45
 
46
-        Gate::define('reorder', function ($user) {
47
-            return $this->authorize($user, function ($user) {
46
+        Gate::define('reorder', function($user) {
47
+            return $this->authorize($user, function($user) {
48 48
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
49 49
             });
50 50
         });
51 51
 
52
-        Gate::define('publish', function ($user) {
53
-            return $this->authorize($user, function ($user) {
52
+        Gate::define('publish', function($user) {
53
+            return $this->authorize($user, function($user) {
54 54
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
55 55
             });
56 56
         });
57 57
 
58
-        Gate::define('feature', function ($user) {
59
-            return $this->authorize($user, function ($user) {
58
+        Gate::define('feature', function($user) {
59
+            return $this->authorize($user, function($user) {
60 60
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
61 61
             });
62 62
         });
63 63
 
64
-        Gate::define('delete', function ($user) {
65
-            return $this->authorize($user, function ($user) {
64
+        Gate::define('delete', function($user) {
65
+            return $this->authorize($user, function($user) {
66 66
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
67 67
             });
68 68
         });
69 69
 
70
-        Gate::define('upload', function ($user) {
71
-            return $this->authorize($user, function ($user) {
70
+        Gate::define('upload', function($user) {
71
+            return $this->authorize($user, function($user) {
72 72
                 return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]);
73 73
             });
74 74
         });
75 75
 
76
-        Gate::define('manage-users', function ($user) {
77
-            return $this->authorize($user, function ($user) {
76
+        Gate::define('manage-users', function($user) {
77
+            return $this->authorize($user, function($user) {
78 78
                 return $this->userHasRole($user, [UserRole::ADMIN]);
79 79
             });
80 80
         });
81 81
 
82 82
         // As an admin, I can edit users, except superadmins
83 83
         // As a non-admin, I can edit myself only
84
-        Gate::define('edit-user', function ($user, $editedUser = null) {
85
-            return $this->authorize($user, function ($user) use ($editedUser) {
84
+        Gate::define('edit-user', function($user, $editedUser = null) {
85
+            return $this->authorize($user, function($user) use ($editedUser) {
86 86
                 $editedUserObject = User::find($editedUser);
87 87
                 return ($this->userHasRole($user, [UserRole::ADMIN]) || $user->id == $editedUser)
88 88
                     && ($editedUserObject ? $editedUserObject->role !== self::SUPERADMIN : true);
89 89
             });
90 90
         });
91 91
 
92
-        Gate::define('publish-user', function ($user) {
93
-            return $this->authorize($user, function ($user) {
92
+        Gate::define('publish-user', function($user) {
93
+            return $this->authorize($user, function($user) {
94 94
                 $editedUserObject = User::find(request('id'));
95 95
                 return $this->userHasRole($user, [UserRole::ADMIN]) && ($editedUserObject ? $user->id !== $editedUserObject->id && $editedUserObject->role !== self::SUPERADMIN : false);
96 96
             });
97 97
         });
98 98
 
99
-        Gate::define('impersonate', function ($user) {
99
+        Gate::define('impersonate', function($user) {
100 100
             return $user->role === self::SUPERADMIN;
101 101
         });
102 102
 
Please login to merge, or discard this patch.
src/Repositories/SettingRepository.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public function byKey($key, $section = null)
36 36
     {
37
-        return $this->model->when($section, function ($query) use ($section) {
37
+        return $this->model->when($section, function($query) use ($section) {
38 38
             $query->where('section', $section);
39 39
         })->where('key', $key)->exists() ? $this->model->where('key', $key)->with('translations')->first()->value : null;
40 40
     }
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
      */
46 46
     public function getFormFields($section = null)
47 47
     {
48
-        $settings = $this->model->when($section, function ($query) use ($section) {
48
+        $settings = $this->model->when($section, function($query) use ($section) {
49 49
             $query->where('section', $section);
50 50
         })->with('translations', 'medias')->get();
51 51
 
52
-        $medias = $settings->mapWithKeys(function ($setting) {
52
+        $medias = $settings->mapWithKeys(function($setting) {
53 53
             return [$setting->key => parent::getFormFields($setting)['medias'][$setting->key] ?? null];
54 54
         })->filter()->toArray();
55 55
 
56
-        return $settings->mapWithKeys(function ($setting) {
56
+        return $settings->mapWithKeys(function($setting) {
57 57
             $settingValue = [];
58 58
 
59 59
             foreach ($setting->translations as $translation) {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             $this->updateOrCreate($section + ['key' => $role], $section + [
102 102
                 'key' => $role,
103 103
                 'medias' => [
104
-                    $role => Collection::make($settingsFields['medias'][$role])->map(function ($media) {
104
+                    $role => Collection::make($settingsFields['medias'][$role])->map(function($media) {
105 105
                         return json_decode($media, true);
106 106
                     })->values()->filter()->toArray(),
107 107
                 ],
Please login to merge, or discard this patch.
src/Repositories/UserRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
      */
63 63
     public function filter($query, array $scopes = [])
64 64
     {
65
-        $query->when(isset($scopes['role']), function ($query) use ($scopes) {
65
+        $query->when(isset($scopes['role']), function($query) use ($scopes) {
66 66
             $query->where('role', $scopes['role']);
67 67
         });
68 68
         $query->where('role', '<>', 'SUPERADMIN');
Please login to merge, or discard this patch.
src/Repositories/Behaviors/HandleTranslations.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,12 +23,12 @@  discard block
 block discarded – undo
23 23
 
24 24
             $submittedLanguages = Collection::make($fields['languages'] ?? []);
25 25
 
26
-            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) {
26
+            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) {
27 27
                 return $language['published'];
28 28
             });
29 29
 
30 30
             foreach ($locales as $index => $locale) {
31
-                $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) {
31
+                $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) {
32 32
                     return $lang['value'] == $locale;
33 33
                 }));
34 34
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
                 $fields[$locale] = [
40 40
                     'active' => $activeField,
41
-                ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) {
41
+                ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) {
42 42
                     $attributeValue = $fields[$attribute] ?? null;
43 43
 
44 44
                     // if we are at the last locale,
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     {
80 80
         if (property_exists($this->model, 'translatedAttributes')) {
81 81
             $attributes = $this->model->translatedAttributes;
82
-            $query->whereHas('translations', function ($q) use ($scopes, $attributes) {
82
+            $query->whereHas('translations', function($q) use ($scopes, $attributes) {
83 83
                 foreach ($attributes as $attribute) {
84 84
                     if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) {
85 85
                         $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%');
Please login to merge, or discard this patch.
src/Repositories/Behaviors/HandleFiles.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         $filesCollection = Collection::make();
24 24
         $filesFromFields = $this->getFiles($fields);
25 25
 
26
-        $filesFromFields->each(function ($file) use ($object, $filesCollection) {
26
+        $filesFromFields->each(function($file) use ($object, $filesCollection) {
27 27
             $newFile = File::withTrashed()->find($file['id']);
28 28
             $pivot = $newFile->newPivot($object, Arr::except($file, ['id']), 'fileables', true);
29 29
             $newFile->setRelation('pivot', $pivot);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
         $object->files()->sync([]);
50 50
 
51
-        $this->getFiles($fields)->each(function ($file) use ($object) {
51
+        $this->getFiles($fields)->each(function($file) use ($object) {
52 52
             $object->files()->attach($file['id'], Arr::except($file, ['id']));
53 53
         });
54 54
     }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
                 if (in_array($role, $this->model->filesParams ?? [])
75 75
                     || in_array($role, config('twill.block_editor.files', []))) {
76 76
 
77
-                    Collection::make($filesForRole)->each(function ($file) use (&$files, $role, $locale) {
77
+                    Collection::make($filesForRole)->each(function($file) use (&$files, $role, $locale) {
78 78
                         $files->push([
79 79
                             'id' => $file['id'],
80 80
                             'role' => $role,
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         if ($object->has('files')) {
100 100
             foreach ($object->files->groupBy('pivot.role') as $role => $filesByRole) {
101 101
                 foreach ($filesByRole->groupBy('pivot.locale') as $locale => $filesByLocale) {
102
-                    $fields['files'][$locale][$role] = $filesByLocale->map(function ($file) {
102
+                    $fields['files'][$locale][$role] = $filesByLocale->map(function($file) {
103 103
                         return $file->toCmsArray();
104 104
                     });
105 105
                 }
Please login to merge, or discard this patch.
src/Services/Uploader/SignAzureUpload.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         try {
34 34
             $blobUri = $request->input('bloburi');
35 35
             $method = $request->input('_method');
36
-            $permissions = '' ;
36
+            $permissions = '';
37 37
             if (strtolower($method) === 'put') {
38 38
                 $permissions = 'w';
39 39
             } else if (strtolower($method) === 'delete') {
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             $now = new DateTime("now", new DateTimeZone("UTC"));
49 49
             $expire = $now->modify('+15 min');
50 50
 
51
-            $path = $this->config->get('filesystems.disks.' . $disk .'.container') . str_replace(azureEndpoint($disk), '', $blobUri);
51
+            $path = $this->config->get('filesystems.disks.' . $disk . '.container') . str_replace(azureEndpoint($disk), '', $blobUri);
52 52
             $sasUrl = $blobUri . '?' . $this->blobSharedAccessSignatureHelper->generateBlobServiceSharedAccessSignatureToken('b', $path, $permissions, $expire);
53 53
             return $listener->uploadIsSigned($sasUrl, false);
54 54
         } catch (\Exception $e) {
Please login to merge, or discard this patch.
src/Http/Controllers/Admin/MediaLibraryController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         $items = $this->getIndexItems($scopes);
100 100
 
101 101
         return [
102
-            'items' => $items->map(function ($item) {
102
+            'items' => $items->map(function($item) {
103 103
                 return $item->toCmsArray();
104 104
             })->toArray(),
105 105
             'maxPage' => $items->lastPage(),
@@ -220,11 +220,11 @@  discard block
 block discarded – undo
220 220
     {
221 221
         $ids = explode(',', $this->request->input('ids'));
222 222
 
223
-        $metadatasFromRequest = $this->getExtraMetadatas()->reject(function ($meta) {
223
+        $metadatasFromRequest = $this->getExtraMetadatas()->reject(function($meta) {
224 224
             return is_null($meta);
225 225
         })->toArray();
226 226
 
227
-        $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array)$this->request->get('fieldsRemovedFromBulkEditing', [])));
227
+        $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array) $this->request->get('fieldsRemovedFromBulkEditing', [])));
228 228
 
229 229
         if (in_array('tags', $this->request->get('fieldsRemovedFromBulkEditing', []))) {
230 230
             $this->repository->addIgnoreFieldsBeforeSave('bulk_tags');
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
         $items = $this->getIndexItems($scopes);
245 245
 
246 246
         return $this->responseFactory->json([
247
-            'items' => $items->map(function ($item) {
247
+            'items' => $items->map(function($item) {
248 248
                 return $item->toCmsArray();
249 249
             })->toArray(),
250 250
             'tags' => $this->repository->getTagsList(),
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
      */
297 297
     private function getExtraMetadatas()
298 298
     {
299
-        return Collection::make($this->customFields)->mapWithKeys(function ($field) {
299
+        return Collection::make($this->customFields)->mapWithKeys(function($field) {
300 300
             $fieldInRequest = $this->request->get($field['name']);
301 301
 
302 302
             if (isset($field['type']) && $field['type'] === 'checkbox') {
Please login to merge, or discard this patch.