uccellolabs / uccello

app/Http/Controllers/Core/ExportController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         // With conditions
         if ($request->input('with_conditions') === '1') {
             // TODO: Build $conditions['search'] earlier in the export process to match filter format...
-            $conditions = ['search' => json_decode($request->input('conditions'))];
+            $conditions = [ 'search' => json_decode($request->input('conditions')) ];
             $export = $export->withConditions($conditions);
         }
 

database/migrations/2018_04_15_000035_alter_filter_module.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      */
     public function down()
     {
-        Schema::table($this->tablePrefix . 'filters', function (Blueprint $table) {
+        Schema::table($this->tablePrefix.'filters', function(Blueprint $table) {
             $table->renameColumn('order', 'order_by');
         });
     }

resources/views/modules/default/detail/relatedlists/table.blade.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <div class="autoscroll-x">
-    <?php $filterOrder = !empty($selectedFilter) ? (array) $selectedFilter->order : []; ?>
+    <?php $filterOrder = !empty($selectedFilter) ? (array)$selectedFilter->order : [ ]; ?>
     <table
         id="{{ $datatableId }}"
         class="striped highlight"
@@ -31,15 +31,15 @@ 
                     <div class="search hide-on-small-only hide-on-med-only">
                         <?php
                             $searchValue = null;
-                            if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column['name']})) {
-                                $searchValue = $selectedFilter->conditions->search->{$column['name']};
+                            if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column[ 'name' ]})) {
+                                $searchValue = $selectedFilter->conditions->search->{$column[ 'name' ]};
                             }
 
                             // If a special template exists, use it. Else use the generic template
                             $uitypeViewName = sprintf('uitypes.search.%s', $column[ 'uitype' ]);
                             $uitypeFallbackView = 'uccello::modules.default.uitypes.search.text';
                             $uitypeViewToInclude = uccello()->view($column[ 'package' ], $module, $uitypeViewName, $uitypeFallbackView);
-                            $field = $module->fields()->where('name', $column['name'])->first();
+                            $field = $module->fields()->where('name', $column[ 'name' ])->first();
                         ?>
                         @include($uitypeViewToInclude, [ 'field' => $field ])
                     </div>

app/Support/Traits/RelatedlistTrait.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         // Related field
         $relatedField = $relatedList->relatedField;
-        $filter = ['order' => request('order')];
+        $filter = [ 'order' => request('order') ];
 
         $query = $query->where($relatedField->column, $recordId)
                         ->filterBy($filter);
@@ -74,7 +74,7 @@ 
         $relationName = $relatedList->relationName;
 
         $record = $modelClass::find($recordId);
-        $filter = ['order' => request('order')];
+        $filter = [ 'order' => request('order') ];
 
         $query = $record->$relationName()
                         ->filterBy($filter);

app/Http/Controllers/Core/Controller.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
      * @param Module $module
      * @param boolean $forBlade
      */
-    protected function preProcess(?Domain &$domain, Module $module, Request $request, $forBlade=true)
+    protected function preProcess(?Domain &$domain, Module $module, Request $request, $forBlade = true)
     {
         // If we don't use multi domains, find the first one
         if (!uccello()->useMultiDomains()) {
@@ -153,7 +153,7 @@ 
     {
         $keyName = $getAdminModules ? 'modules_all' : 'modules_not_admin';
 
-        return Cache::rememberForever($keyName, function () use($getAdminModules) {
+        return Cache::rememberForever($keyName, function() use($getAdminModules) {
             $modules = [ ];
 
             $allModules = Module::all();

app/Fields/Uitype/Date.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
         ];
 
         // We want the field displays the date in the good format
-        $options['value'] = $this->getFormattedValueToDisplay($field, $record);
+        $options[ 'value' ] = $this->getFormattedValueToDisplay($field, $record);
 
         return $options;
     }
@@ -110,11 +110,11 @@ 
     public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder
     {
         if (!$this->isEmptyOrNotEmptySearchQuery($query, $field, $value)) {
-            $query->where(function ($query) use($field, $value) {
+            $query->where(function($query) use($field, $value) {
                 if (strpos($value, ',') > -1) {
                     $values = explode(',', $value); // Start Date, End Date
-                    $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[0]));
-                    $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[1]));
+                    $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 0 ]));
+                    $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 1 ]));
                 } else {
                     switch ($value) {
                         // Today

app/Fields/Traits/DefaultUitype.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
     protected function isEmptyOrNotEmptySearchQuery(Builder &$query, Field $field, $value): bool
     {
         if ($value === uctrans('filter.search_flag.empty', $field->module)) {
-            $query->where(function ($q) use ($field) {
+            $query->where(function($q) use ($field) {
                 $q->whereNull($field->column)
                     ->orWhere($field->column, '=', '');
             });

app/Helpers/Uccello.php

Spacing +27 added lines, -27 removed lines

@@ -234,26 +234,26 @@ 
 
         if (is_numeric($nameOrId)) {
             // Use cache
-            $modules = Cache::rememberForever('modules_by_id', function () {
+            $modules = Cache::rememberForever('modules_by_id', function() {
                 $modulesGroupedById = collect();
                 Module::all()->map(function($item) use($modulesGroupedById) {
-                    $modulesGroupedById[$item->id] = $item;
+                    $modulesGroupedById[ $item->id ] = $item;
                     return $modulesGroupedById;
                 });
                 return $modulesGroupedById;
             });
-            return $modules[(string) $nameOrId] ?? null;
+            return $modules[ (string)$nameOrId ] ?? null;
         } else {
             // Use cache
-            $modules = Cache::rememberForever('modules_by_name', function () {
+            $modules = Cache::rememberForever('modules_by_name', function() {
                 $modulesGroupedByName = collect();
                 Module::all()->map(function($item) use($modulesGroupedByName) {
-                    $modulesGroupedByName[$item->name] = $item;
+                    $modulesGroupedByName[ $item->name ] = $item;
                     return $modulesGroupedByName;
                 });
                 return $modulesGroupedByName;
             });
-            return $modules[(string) $nameOrId] ?? null;
+            return $modules[ (string)$nameOrId ] ?? null;
         }
     }
 
@@ -271,26 +271,26 @@ 
 
         if (is_numeric($nameOrId)) {
             // Use cache
-            $uitypes = Cache::rememberForever('uitypes_by_id', function () {
+            $uitypes = Cache::rememberForever('uitypes_by_id', function() {
                 $uitypesGroupedById = collect();
                 Uitype::all()->map(function($item) use($uitypesGroupedById) {
-                    $uitypesGroupedById[$item->id] = $item;
+                    $uitypesGroupedById[ $item->id ] = $item;
                     return $uitypesGroupedById;
                 });
                 return $uitypesGroupedById;
             });
-            return $uitypes[(string) $nameOrId] ?? null;
+            return $uitypes[ (string)$nameOrId ] ?? null;
         } else {
             // Use cache
-            $uitypes = Cache::rememberForever('uitypes_by_name', function () {
+            $uitypes = Cache::rememberForever('uitypes_by_name', function() {
                 $uitypesGroupedByName = collect();
                 Uitype::all()->map(function($item) use($uitypesGroupedByName) {
-                    $uitypesGroupedByName[$item->name] = $item;
+                    $uitypesGroupedByName[ $item->name ] = $item;
                     return $uitypesGroupedByName;
                 });
                 return $uitypesGroupedByName;
             });
-            return $uitypes[(string) $nameOrId] ?? null;
+            return $uitypes[ (string)$nameOrId ] ?? null;
         }
     }
 
@@ -308,26 +308,26 @@ 
 
         if (is_numeric($nameOrId)) {
             // Use cache
-            $displaytypes = Cache::rememberForever('displaytypes_by_id', function () {
+            $displaytypes = Cache::rememberForever('displaytypes_by_id', function() {
                 $displaytypesGroupedById = collect();
                 Displaytype::all()->map(function($item) use($displaytypesGroupedById) {
-                    $displaytypesGroupedById[$item->id] = $item;
+                    $displaytypesGroupedById[ $item->id ] = $item;
                     return $displaytypesGroupedById;
                 });
                 return $displaytypesGroupedById;
             });
-            return $displaytypes[(string) $nameOrId] ?? null;
+            return $displaytypes[ (string)$nameOrId ] ?? null;
         } else {
             // Use cache
-            $displaytypes = Cache::rememberForever('displaytypes_by_name', function () {
+            $displaytypes = Cache::rememberForever('displaytypes_by_name', function() {
                 $displaytypesGroupedByName = collect();
                 Displaytype::all()->map(function($item) use($displaytypesGroupedByName) {
-                    $displaytypesGroupedByName[$item->name] = $item;
+                    $displaytypesGroupedByName[ $item->name ] = $item;
                     return $displaytypesGroupedByName;
                 });
                 return $displaytypesGroupedByName;
             });
-            return $displaytypes[(string) $nameOrId] ?? null;
+            return $displaytypes[ (string)$nameOrId ] ?? null;
         }
     }
 
@@ -345,26 +345,26 @@ 
 
         if (is_numeric($nameOrId)) {
             // Use cache
-            $capabilities = Cache::rememberForever('capabilities_by_id', function () {
+            $capabilities = Cache::rememberForever('capabilities_by_id', function() {
                 $capabilitiesGroupedById = collect();
                 Capability::all()->map(function($item) use($capabilitiesGroupedById) {
-                    $capabilitiesGroupedById[$item->id] = $item;
+                    $capabilitiesGroupedById[ $item->id ] = $item;
                     return $capabilitiesGroupedById;
                 });
                 return $capabilitiesGroupedById;
             });
-            return $capabilities[(string) $nameOrId] ?? null;
+            return $capabilities[ (string)$nameOrId ] ?? null;
         } else {
             // Use cache
-            $capabilities = Cache::rememberForever('capabilities_by_name', function () {
+            $capabilities = Cache::rememberForever('capabilities_by_name', function() {
                 $capabilitiesGroupedByName = collect();
                 Capability::all()->map(function($item) use($capabilitiesGroupedByName) {
-                    $capabilitiesGroupedByName[$item->name] = $item;
+                    $capabilitiesGroupedByName[ $item->name ] = $item;
                     return $capabilitiesGroupedByName;
                 });
                 return $capabilitiesGroupedByName;
             });
-            return $capabilities[(string) $nameOrId] ?? null;
+            return $capabilities[ (string)$nameOrId ] ?? null;
         }
     }
 
@@ -406,7 +406,7 @@ 
      * @param string $type
      * @return array
      */
-    public function getDatatableColumns(Module $module, $filterId=null, $type='list'): array
+    public function getDatatableColumns(Module $module, $filterId = null, $type = 'list'): array
     {
         $columns = [ ];
 
@@ -439,7 +439,7 @@ 
             $field = $module->fields->where('name', $fieldName)->first();
 
             // If the field does not exist or is not listable, continue
-            if (!$field  || !$field->isListable() || in_array($fieldName, $fieldsAdded)) {
+            if (!$field || !$field->isListable() || in_array($fieldName, $fieldsAdded)) {
                 continue;
             }
 
@@ -490,7 +490,7 @@ 
      * @param string $type
      * @return Filter
      */
-    public function getDefaultFilter(Module $module, $type="list")
+    public function getDefaultFilter(Module $module, $type = "list")
     {
         $filter = Filter::where('module_id', $module->id)
         ->where('type', $type)

app/Http/Controllers/User/AccountController.php

Spacing +8 added lines, -8 removed lines

@@ -53,9 +53,9 @@ 
         });
 
         $validator = Validator::make(request()->all(), [
-            'username' => $rules['username'],
-            'name' => $rules['name'],
-            'email' => $rules['email'],
+            'username' => $rules[ 'username' ],
+            'name' => $rules[ 'name' ],
+            'email' => $rules[ 'email' ],
         ]);
 
         if ($validator->fails()) {
@@ -94,11 +94,11 @@ 
         if (request('avatar')) {
             $image = str_replace('data:image/png;base64,', '', request('avatar'));
             $image = str_replace(' ', '+', $image);
-            $imageName = 'user-' . $user->id . '.png';
+            $imageName = 'user-'.$user->id.'.png';
             $path = storage_path('app/public/avatar/');
-            $filepath = $path . $imageName;
+            $filepath = $path.$imageName;
 
-            if(!\File::isDirectory($path)){
+            if (!\File::isDirectory($path)) {
                 \File::makeDirectory($path, 0777, true, true);
             }
 
@@ -129,7 +129,7 @@ 
 
         $field = Field::where('module_id', ucmodule('user')->id)->where('name', 'password')->first();
         $password_rules = isset($field->data->rules) ? explode('|', $field->data->rules) : '';
-        $password_rules[] = 'confirmed';
+        $password_rules[ ] = 'confirmed';
 
         $validator = Validator::make(request()->all(), [
             'current_password' => function($attribute, $value, $fail) use ($user) {
@@ -172,7 +172,7 @@ 
 
         $data = $userSettings->data ?? new \stdClass;
 
-        foreach ((array) request('settings') as $key => $value) {
+        foreach ((array)request('settings') as $key => $value) {
             if ($value === 'true') {
                 $value = true;
             } elseif ($value === 'false') {