Passed
Push — master ( 17c8d8...65308f )
by Jonathan
09:04
created
resources/views/modules/default/detail/relatedlists/table.blade.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <div class="autoscroll-x">
2
-    <?php $filterOrder = !empty($selectedFilter) ? (array) $selectedFilter->order : []; ?>
2
+    <?php $filterOrder = !empty($selectedFilter) ? (array)$selectedFilter->order : [ ]; ?>
3 3
     <table
4 4
         id="{{ $datatableId }}"
5 5
         class="striped highlight"
@@ -31,15 +31,15 @@  discard block
 block discarded – undo
31 31
                     <div class="search hide-on-small-only hide-on-med-only">
32 32
                         <?php
33 33
                             $searchValue = null;
34
-                            if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column['name']})) {
35
-                                $searchValue = $selectedFilter->conditions->search->{$column['name']};
34
+                            if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column[ 'name' ]})) {
35
+                                $searchValue = $selectedFilter->conditions->search->{$column[ 'name' ]};
36 36
                             }
37 37
 
38 38
                             // If a special template exists, use it. Else use the generic template
39 39
                             $uitypeViewName = sprintf('uitypes.search.%s', $column[ 'uitype' ]);
40 40
                             $uitypeFallbackView = 'uccello::modules.default.uitypes.search.text';
41 41
                             $uitypeViewToInclude = uccello()->view($column[ 'package' ], $module, $uitypeViewName, $uitypeFallbackView);
42
-                            $field = $module->fields()->where('name', $column['name'])->first();
42
+                            $field = $module->fields()->where('name', $column[ 'name' ])->first();
43 43
                         ?>
44 44
                         @include($uitypeViewToInclude, [ 'field' => $field ])
45 45
                     </div>
Please login to merge, or discard this patch.
app/Support/Traits/RelatedlistTrait.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
     {
34 34
         // Related field
35 35
         $relatedField = $relatedList->relatedField;
36
-        $filter = ['order' => request('order')];
36
+        $filter = [ 'order' => request('order') ];
37 37
 
38 38
         $query = $query->where($relatedField->column, $recordId)
39 39
                         ->filterBy($filter);
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         $relationName = $relatedList->relationName;
75 75
 
76 76
         $record = $modelClass::find($recordId);
77
-        $filter = ['order' => request('order')];
77
+        $filter = [ 'order' => request('order') ];
78 78
 
79 79
         $query = $record->$relationName()
80 80
                         ->filterBy($filter);
Please login to merge, or discard this patch.
app/Http/Controllers/Core/Controller.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * @param Module $module
76 76
      * @param boolean $forBlade
77 77
      */
78
-    protected function preProcess(?Domain &$domain, Module $module, Request $request, $forBlade=true)
78
+    protected function preProcess(?Domain &$domain, Module $module, Request $request, $forBlade = true)
79 79
     {
80 80
         // If we don't use multi domains, find the first one
81 81
         if (!uccello()->useMultiDomains()) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
     {
154 154
         $keyName = $getAdminModules ? 'modules_all' : 'modules_not_admin';
155 155
 
156
-        return Cache::rememberForever($keyName, function () use($getAdminModules) {
156
+        return Cache::rememberForever($keyName, function() use($getAdminModules) {
157 157
             $modules = [ ];
158 158
 
159 159
             $allModules = Module::all();
Please login to merge, or discard this patch.
app/Fields/Uitype/Date.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         ];
46 46
 
47 47
         // We want the field displays the date in the good format
48
-        $options['value'] = $this->getFormattedValueToDisplay($field, $record);
48
+        $options[ 'value' ] = $this->getFormattedValueToDisplay($field, $record);
49 49
 
50 50
         return $options;
51 51
     }
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
     public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder
111 111
     {
112 112
         if (!$this->isEmptyOrNotEmptySearchQuery($query, $field, $value)) {
113
-            $query->where(function ($query) use($field, $value) {
113
+            $query->where(function($query) use($field, $value) {
114 114
                 if (strpos($value, ',') > -1) {
115 115
                     $values = explode(',', $value); // Start Date, End Date
116
-                    $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[0]));
117
-                    $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[1]));
116
+                    $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 0 ]));
117
+                    $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 1 ]));
118 118
                 } else {
119 119
                     switch ($value) {
120 120
                         // Today
Please login to merge, or discard this patch.
app/Fields/Traits/DefaultUitype.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
     protected function isEmptyOrNotEmptySearchQuery(Builder &$query, Field $field, $value): bool
124 124
     {
125 125
         if ($value === uctrans('filter.search_flag.empty', $field->module)) {
126
-            $query->where(function ($q) use ($field) {
126
+            $query->where(function($q) use ($field) {
127 127
                 $q->whereNull($field->column)
128 128
                     ->orWhere($field->column, '=', '');
129 129
             });
Please login to merge, or discard this patch.
app/Helpers/Uccello.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -234,26 +234,26 @@  discard block
 block discarded – undo
234 234
 
235 235
         if (is_numeric($nameOrId)) {
236 236
             // Use cache
237
-            $modules = Cache::rememberForever('modules_by_id', function () {
237
+            $modules = Cache::rememberForever('modules_by_id', function() {
238 238
                 $modulesGroupedById = collect();
239 239
                 Module::all()->map(function($item) use($modulesGroupedById) {
240
-                    $modulesGroupedById[$item->id] = $item;
240
+                    $modulesGroupedById[ $item->id ] = $item;
241 241
                     return $modulesGroupedById;
242 242
                 });
243 243
                 return $modulesGroupedById;
244 244
             });
245
-            return $modules[(string) $nameOrId] ?? null;
245
+            return $modules[ (string)$nameOrId ] ?? null;
246 246
         } else {
247 247
             // Use cache
248
-            $modules = Cache::rememberForever('modules_by_name', function () {
248
+            $modules = Cache::rememberForever('modules_by_name', function() {
249 249
                 $modulesGroupedByName = collect();
250 250
                 Module::all()->map(function($item) use($modulesGroupedByName) {
251
-                    $modulesGroupedByName[$item->name] = $item;
251
+                    $modulesGroupedByName[ $item->name ] = $item;
252 252
                     return $modulesGroupedByName;
253 253
                 });
254 254
                 return $modulesGroupedByName;
255 255
             });
256
-            return $modules[(string) $nameOrId] ?? null;
256
+            return $modules[ (string)$nameOrId ] ?? null;
257 257
         }
258 258
     }
259 259
 
@@ -271,26 +271,26 @@  discard block
 block discarded – undo
271 271
 
272 272
         if (is_numeric($nameOrId)) {
273 273
             // Use cache
274
-            $uitypes = Cache::rememberForever('uitypes_by_id', function () {
274
+            $uitypes = Cache::rememberForever('uitypes_by_id', function() {
275 275
                 $uitypesGroupedById = collect();
276 276
                 Uitype::all()->map(function($item) use($uitypesGroupedById) {
277
-                    $uitypesGroupedById[$item->id] = $item;
277
+                    $uitypesGroupedById[ $item->id ] = $item;
278 278
                     return $uitypesGroupedById;
279 279
                 });
280 280
                 return $uitypesGroupedById;
281 281
             });
282
-            return $uitypes[(string) $nameOrId] ?? null;
282
+            return $uitypes[ (string)$nameOrId ] ?? null;
283 283
         } else {
284 284
             // Use cache
285
-            $uitypes = Cache::rememberForever('uitypes_by_name', function () {
285
+            $uitypes = Cache::rememberForever('uitypes_by_name', function() {
286 286
                 $uitypesGroupedByName = collect();
287 287
                 Uitype::all()->map(function($item) use($uitypesGroupedByName) {
288
-                    $uitypesGroupedByName[$item->name] = $item;
288
+                    $uitypesGroupedByName[ $item->name ] = $item;
289 289
                     return $uitypesGroupedByName;
290 290
                 });
291 291
                 return $uitypesGroupedByName;
292 292
             });
293
-            return $uitypes[(string) $nameOrId] ?? null;
293
+            return $uitypes[ (string)$nameOrId ] ?? null;
294 294
         }
295 295
     }
296 296
 
@@ -308,26 +308,26 @@  discard block
 block discarded – undo
308 308
 
309 309
         if (is_numeric($nameOrId)) {
310 310
             // Use cache
311
-            $displaytypes = Cache::rememberForever('displaytypes_by_id', function () {
311
+            $displaytypes = Cache::rememberForever('displaytypes_by_id', function() {
312 312
                 $displaytypesGroupedById = collect();
313 313
                 Displaytype::all()->map(function($item) use($displaytypesGroupedById) {
314
-                    $displaytypesGroupedById[$item->id] = $item;
314
+                    $displaytypesGroupedById[ $item->id ] = $item;
315 315
                     return $displaytypesGroupedById;
316 316
                 });
317 317
                 return $displaytypesGroupedById;
318 318
             });
319
-            return $displaytypes[(string) $nameOrId] ?? null;
319
+            return $displaytypes[ (string)$nameOrId ] ?? null;
320 320
         } else {
321 321
             // Use cache
322
-            $displaytypes = Cache::rememberForever('displaytypes_by_name', function () {
322
+            $displaytypes = Cache::rememberForever('displaytypes_by_name', function() {
323 323
                 $displaytypesGroupedByName = collect();
324 324
                 Displaytype::all()->map(function($item) use($displaytypesGroupedByName) {
325
-                    $displaytypesGroupedByName[$item->name] = $item;
325
+                    $displaytypesGroupedByName[ $item->name ] = $item;
326 326
                     return $displaytypesGroupedByName;
327 327
                 });
328 328
                 return $displaytypesGroupedByName;
329 329
             });
330
-            return $displaytypes[(string) $nameOrId] ?? null;
330
+            return $displaytypes[ (string)$nameOrId ] ?? null;
331 331
         }
332 332
     }
333 333
 
@@ -345,26 +345,26 @@  discard block
 block discarded – undo
345 345
 
346 346
         if (is_numeric($nameOrId)) {
347 347
             // Use cache
348
-            $capabilities = Cache::rememberForever('capabilities_by_id', function () {
348
+            $capabilities = Cache::rememberForever('capabilities_by_id', function() {
349 349
                 $capabilitiesGroupedById = collect();
350 350
                 Capability::all()->map(function($item) use($capabilitiesGroupedById) {
351
-                    $capabilitiesGroupedById[$item->id] = $item;
351
+                    $capabilitiesGroupedById[ $item->id ] = $item;
352 352
                     return $capabilitiesGroupedById;
353 353
                 });
354 354
                 return $capabilitiesGroupedById;
355 355
             });
356
-            return $capabilities[(string) $nameOrId] ?? null;
356
+            return $capabilities[ (string)$nameOrId ] ?? null;
357 357
         } else {
358 358
             // Use cache
359
-            $capabilities = Cache::rememberForever('capabilities_by_name', function () {
359
+            $capabilities = Cache::rememberForever('capabilities_by_name', function() {
360 360
                 $capabilitiesGroupedByName = collect();
361 361
                 Capability::all()->map(function($item) use($capabilitiesGroupedByName) {
362
-                    $capabilitiesGroupedByName[$item->name] = $item;
362
+                    $capabilitiesGroupedByName[ $item->name ] = $item;
363 363
                     return $capabilitiesGroupedByName;
364 364
                 });
365 365
                 return $capabilitiesGroupedByName;
366 366
             });
367
-            return $capabilities[(string) $nameOrId] ?? null;
367
+            return $capabilities[ (string)$nameOrId ] ?? null;
368 368
         }
369 369
     }
370 370
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
      * @param string $type
407 407
      * @return array
408 408
      */
409
-    public function getDatatableColumns(Module $module, $filterId=null, $type='list'): array
409
+    public function getDatatableColumns(Module $module, $filterId = null, $type = 'list'): array
410 410
     {
411 411
         $columns = [ ];
412 412
 
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
             $field = $module->fields->where('name', $fieldName)->first();
440 440
 
441 441
             // If the field does not exist or is not listable, continue
442
-            if (!$field  || !$field->isListable() || in_array($fieldName, $fieldsAdded)) {
442
+            if (!$field || !$field->isListable() || in_array($fieldName, $fieldsAdded)) {
443 443
                 continue;
444 444
             }
445 445
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
      * @param string $type
491 491
      * @return Filter
492 492
      */
493
-    public function getDefaultFilter(Module $module, $type="list")
493
+    public function getDefaultFilter(Module $module, $type = "list")
494 494
     {
495 495
         $filter = Filter::where('module_id', $module->id)
496 496
         ->where('type', $type)
Please login to merge, or discard this patch.
app/Http/Controllers/User/AccountController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
         });
54 54
 
55 55
         $validator = Validator::make(request()->all(), [
56
-            'username' => $rules['username'],
57
-            'name' => $rules['name'],
58
-            'email' => $rules['email'],
56
+            'username' => $rules[ 'username' ],
57
+            'name' => $rules[ 'name' ],
58
+            'email' => $rules[ 'email' ],
59 59
         ]);
60 60
 
61 61
         if ($validator->fails()) {
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
         if (request('avatar')) {
95 95
             $image = str_replace('data:image/png;base64,', '', request('avatar'));
96 96
             $image = str_replace(' ', '+', $image);
97
-            $imageName = 'user-' . $user->id . '.png';
97
+            $imageName = 'user-'.$user->id.'.png';
98 98
             $path = storage_path('app/public/avatar/');
99
-            $filepath = $path . $imageName;
99
+            $filepath = $path.$imageName;
100 100
 
101
-            if(!\File::isDirectory($path)){
101
+            if (!\File::isDirectory($path)) {
102 102
                 \File::makeDirectory($path, 0777, true, true);
103 103
             }
104 104
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 
130 130
         $field = Field::where('module_id', ucmodule('user')->id)->where('name', 'password')->first();
131 131
         $password_rules = isset($field->data->rules) ? explode('|', $field->data->rules) : '';
132
-        $password_rules[] = 'confirmed';
132
+        $password_rules[ ] = 'confirmed';
133 133
 
134 134
         $validator = Validator::make(request()->all(), [
135 135
             'current_password' => function($attribute, $value, $fail) use ($user) {
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
         $data = $userSettings->data ?? new \stdClass;
174 174
 
175
-        foreach ((array) request('settings') as $key => $value) {
175
+        foreach ((array)request('settings') as $key => $value) {
176 176
             if ($value === 'true') {
177 177
                 $value = true;
178 178
             } elseif ($value === 'false') {
Please login to merge, or discard this patch.
app/Http/Controllers/Core/DomainsTreeController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
             $domain = Domain::firstOrFail();
20 20
         }
21 21
 
22
-        return Cache::rememberForever('domains_root_user_'.auth()->id(), function () use($domain) {
22
+        return Cache::rememberForever('domains_root_user_'.auth()->id(), function() use($domain) {
23 23
             $rootDomains = app('uccello')->getRootDomains();
24 24
 
25
-            $domains = [];
25
+            $domains = [ ];
26 26
             foreach ($rootDomains as $_domain) {
27 27
                 $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain);
28 28
                 if ($formattedDomain) {
29
-                    $domains[] = $formattedDomain;
29
+                    $domains[ ] = $formattedDomain;
30 30
                 }
31 31
             }
32 32
 
@@ -48,13 +48,13 @@  discard block
 block discarded – undo
48 48
 
49 49
         $parentDomain = Domain::find(request('id'));
50 50
 
51
-        return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function () use($domain, $parentDomain) {
52
-            $domains = [];
51
+        return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function() use($domain, $parentDomain) {
52
+            $domains = [ ];
53 53
             if ($parentDomain) {
54 54
                 foreach ($parentDomain->children()->orderBy('name')->get() as $_domain) {
55 55
                     $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain);
56 56
                     if ($formattedDomain) {
57
-                        $domains[] = $formattedDomain;
57
+                        $domains[ ] = $formattedDomain;
58 58
                     }
59 59
                 }
60 60
             }
Please login to merge, or discard this patch.
database/migrations/2018_04_15_000034_create_group_module.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
     public function down()
45 45
     {
46 46
         // Drop table
47
-        Schema::dropIfExists($this->tablePrefix . 'groups');
48
-        Schema::dropIfExists($this->tablePrefix . 'rl_groups_groups');
49
-        Schema::dropIfExists($this->tablePrefix . 'rl_groups_users');
47
+        Schema::dropIfExists($this->tablePrefix.'groups');
48
+        Schema::dropIfExists($this->tablePrefix.'rl_groups_groups');
49
+        Schema::dropIfExists($this->tablePrefix.'rl_groups_users');
50 50
 
51 51
         // Delete module
52 52
         Module::where('name', 'group')->forceDelete();
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     protected function createTables()
56 56
     {
57 57
         // Module Table
58
-        Schema::create($this->tablePrefix . 'groups', function (Blueprint $table) {
58
+        Schema::create($this->tablePrefix.'groups', function(Blueprint $table) {
59 59
             $table->increments('id');
60 60
             $table->string('name')->nullable();
61 61
             $table->text('description')->nullable();
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         });
65 65
 
66 66
         // Related List Table: Groups-Groups
67
-        Schema::create($this->tablePrefix . 'rl_groups_groups', function (Blueprint $table) {
67
+        Schema::create($this->tablePrefix.'rl_groups_groups', function(Blueprint $table) {
68 68
             $table->increments('id');
69 69
             $table->unsignedInteger('parent_id');
70 70
             $table->unsignedInteger('children_id');
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
72 72
 
73 73
             // Foreign keys
74 74
             $table->foreign('parent_id')
75
-                ->references('id')->on($this->tablePrefix . 'groups')
75
+                ->references('id')->on($this->tablePrefix.'groups')
76 76
                 ->onDelete('cascade');
77 77
 
78 78
             $table->foreign('children_id')
79
-                ->references('id')->on($this->tablePrefix . 'groups')
79
+                ->references('id')->on($this->tablePrefix.'groups')
80 80
                 ->onDelete('cascade');
81 81
 
82 82
             // Unique keys
83
-            $table->unique(['parent_id', 'children_id']);
83
+            $table->unique([ 'parent_id', 'children_id' ]);
84 84
         });
85 85
 
86 86
         // Related List Table: Groups-Users
87
-        Schema::create($this->tablePrefix . 'rl_groups_users', function (Blueprint $table) {
87
+        Schema::create($this->tablePrefix.'rl_groups_users', function(Blueprint $table) {
88 88
             $table->increments('id');
89 89
             $table->unsignedInteger('group_id');
90 90
             $table->unsignedInteger('user_id');
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
             // Foreign keys
94 94
             $table->foreign('group_id')
95
-                ->references('id')->on($this->tablePrefix . 'groups')
95
+                ->references('id')->on($this->tablePrefix.'groups')
96 96
                 ->onDelete('cascade');
97 97
 
98 98
             $table->foreign('user_id')
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                 ->onDelete('cascade');
101 101
 
102 102
             // Unique keys
103
-            $table->unique(['group_id', 'user_id']);
103
+            $table->unique([ 'group_id', 'user_id' ]);
104 104
         });
105 105
     }
106 106
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         $filter->user_id = null;
167 167
         $filter->name = 'filter.all';
168 168
         $filter->type = 'list';
169
-        $filter->columns = [ 'name', 'description'];
169
+        $filter->columns = [ 'name', 'description' ];
170 170
         $filter->conditions = null;
171 171
         $filter->order_by = null;
172 172
         $filter->is_default = true;
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
             'method' => 'getRelatedList',
199 199
             'data' => [
200 200
                 "relationName" => "childrenGroups",
201
-                "actions" => ["select", "add"]
201
+                "actions" => [ "select", "add" ]
202 202
             ],
203 203
             'sequence' => 0
204 204
         ]);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
             'label' => 'relatedlist.users',
216 216
             'type' => 'n-n',
217 217
             'method' => 'getRelatedList',
218
-            'data' => ["actions" => ["select", "add"]],
218
+            'data' => [ "actions" => [ "select", "add" ] ],
219 219
             'sequence' => 1
220 220
         ]);
221 221
     }
Please login to merge, or discard this patch.