uccellolabs / uccello

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/Models/User.php

Spacing +34 added lines, -34 removed lines

@@ -152,7 +152,7 @@ 
 
         $i = 0;
         foreach ($words as $w) {
-            $initials .= $w[0];
+            $initials .= $w[ 0 ];
             $i++;
 
             if ($i === 3) { // Maximum: 3 letters
@@ -173,7 +173,7 @@ 
         $image = 'vendor/uccello/uccello/images/user-no-image.png';
 
         if ($this->avatarType === 'gravatar') {
-            $image = 'https://www.gravatar.com/avatar/' . md5($this->email) . '?d=mm';
+            $image = 'https://www.gravatar.com/avatar/'.md5($this->email).'?d=mm';
 
         } elseif ($this->avatarType === 'image' && !empty($this->avatar->path)) {
             $image = $this->avatar->path;
@@ -199,7 +199,7 @@ 
      * @param mixed $defaultValue
      * @return \stdClass|null;
      */
-    public function getSettings($key, $defaultValue=null) {
+    public function getSettings($key, $defaultValue = null) {
         return $this->userSettings->data->{$key} ?? $defaultValue;
     }
 
@@ -211,7 +211,7 @@ 
      */
     public function rolesOnDomain($domain) : Collection
     {
-        return Cache::remember('user_'.$this->id.'_domain_'.$domain->slug.'roles', 600, function () use($domain) {
+        return Cache::remember('user_'.$this->id.'_domain_'.$domain->slug.'roles', 600, function() use($domain) {
             $roles = collect();
 
             if (config('uccello.roles.display_ancestors_roles')) {
@@ -259,7 +259,7 @@ 
 
         $hasRole = false;
 
-        $descendants = Cache::remember('domain_'.$domain->slug.'_descendants', 600, function () use($domain) {
+        $descendants = Cache::remember('domain_'.$domain->slug.'_descendants', 600, function() use($domain) {
             return $domain->findDescendants()->get();
         });
 
@@ -285,7 +285,7 @@ 
     {
         $keyName = 'user_'.$this->id.'_'.$domain->slug.'_'.$module->name.'_capabilities';
 
-        return Cache::remember($keyName, 600, function () use($domain, $module) {
+        return Cache::remember($keyName, 600, function() use($domain, $module) {
             $capabilities = collect();
 
             // Get the domain and all its parents
@@ -339,7 +339,7 @@ 
 
         $keyName = 'user_'.$this->id.'_'.$domain->slug.'_can_access_to_settings_panel';
 
-        return Cache::remember($keyName, 600, function () use($domain) {
+        return Cache::remember($keyName, 600, function() use($domain) {
 
             $hasCapability = false;
 
@@ -491,8 +491,8 @@ 
     {
         // Use cache
         $allowedGroups = Cache::rememberForever(
-            'allowed_groups_for_' . ($this->is_admin ? 'admin' : $this->getKey()),
-            function () {
+            'allowed_groups_for_'.($this->is_admin ? 'admin' : $this->getKey()),
+            function() {
                 return $this->getAllowedGroupUuidsProcess();
             }
         );
@@ -504,8 +504,8 @@ 
     {
         // Use cache
         $allowedGroupsAndUsers = Cache::rememberForever(
-            'allowed_group_users_for_' . ($addUsers ? 'u_' : '') . ($this->is_admin ? 'admin' : $this->getKey()),
-            function () use ($addUsers) {
+            'allowed_group_users_for_'.($addUsers ? 'u_' : '').($this->is_admin ? 'admin' : $this->getKey()),
+            function() use ($addUsers) {
                 return $this->getAllowedGroupsAndUsersProcess($addUsers);
             }
         );
@@ -515,16 +515,16 @@ 
 
     protected function getAllowedGroupUuidsProcess()
     {
-        $allowedUserUuids = collect([$this->uuid]);
+        $allowedUserUuids = collect([ $this->uuid ]);
 
         if ($this->is_admin) {
             $groups = Group::all();
         } else {
-            $groups = [];
-            $users = [];
+            $groups = [ ];
+            $users = [ ];
 
             foreach ($this->groups as $group) {
-                $groups[$group->uuid] = $group;
+                $groups[ $group->uuid ] = $group;
             };
 
             $this->addRecursiveChildrenGroups($groups, $users, $groups, false);
@@ -533,7 +533,7 @@ 
         }
 
         foreach ($groups as $uuid => $group) {
-            $allowedUserUuids[] = $uuid;
+            $allowedUserUuids[ ] = $uuid;
         }
 
         return $allowedUserUuids;
@@ -542,19 +542,19 @@ 
     protected function addRecursiveChildrenGroups(&$groups, &$users, $searchGroups, $addUsers = false)
     {
         foreach ($searchGroups as $uuid => $searchGroup) {
-            $searchChildrenGroups = [];
+            $searchChildrenGroups = [ ];
 
             foreach ($searchGroup->childrenGroups as $childrenGroup) {
-                if (empty($groups[$childrenGroup->uuid])) {
-                    $groups[$childrenGroup->uuid] = $childrenGroup;
-                    $searchChildrenGroups[$childrenGroup->uuid] = $childrenGroup;
+                if (empty($groups[ $childrenGroup->uuid ])) {
+                    $groups[ $childrenGroup->uuid ] = $childrenGroup;
+                    $searchChildrenGroups[ $childrenGroup->uuid ] = $childrenGroup;
                 }
 
-                if($addUsers)
+                if ($addUsers)
                 {
                     foreach ($childrenGroup->users as $user) {
-                        if (empty($users[$user->uuid])) {
-                            $users[$user->uuid] = $user;
+                        if (empty($users[ $user->uuid ])) {
+                            $users[ $user->uuid ] = $user;
                         }
                     }
                 }
@@ -566,26 +566,26 @@ 
 
     protected function getAllowedGroupsAndUsersProcess($addUsers = true)
     {
-        $allowedUserUuids = collect([[
+        $allowedUserUuids = collect([ [
             'uuid' => $this->uuid,
             'recordLabel' => uctrans('me', $this->module)
-        ]]);
+        ] ]);
 
         if ($this->is_admin) {
             $groups = Group::orderBy('name')->get();
             $users  = \App\User::orderBy('name')->get();
         } else {
-            $groups = [];
-            $users = [];
+            $groups = [ ];
+            $users = [ ];
 
             foreach ($this->groups as $group) {
-                $groups[$group->uuid] = $group;
+                $groups[ $group->uuid ] = $group;
 
-                if($addUsers)
+                if ($addUsers)
                 {
                     foreach ($group->users as $user) {
-                        if (empty($users[$user->uuid])) {
-                            $users[$user->uuid] = $user;
+                        if (empty($users[ $user->uuid ])) {
+                            $users[ $user->uuid ] = $user;
                         }
                     }
                 }
@@ -598,15 +598,15 @@ 
         }
 
         foreach ($groups as $uuid => $group) {
-            $allowedUserUuids[] = [
+            $allowedUserUuids[ ] = [
                 'uuid' => $group->uuid,
                 'recordLabel' => $group->recordLabel
             ];
         }
 
         foreach ($users as $uuid => $user) {
-            if($user->getKey() != $this->getKey()) {
-                $allowedUserUuids[] = [
+            if ($user->getKey() != $this->getKey()) {
+                $allowedUserUuids[ ] = [
                     'uuid' => $user->uuid,
                     'recordLabel' => $user->recordLabel
                 ];

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') {

app/Http/Controllers/Core/ListController.php

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
             ->get();
 
         // Order
-        $filterOrderBy = (array) $selectedFilter->order;
+        $filterOrderBy = (array)$selectedFilter->order;
 
         // See descendants
         $seeDescendants = request()->session()->get('descendants');
@@ -120,7 +120,7 @@ 
             if ($relatedList && $relatedList->method) {
                 // Related list method
                 $method = $relatedList->method;
-                $recordIdsMethod = $method . 'RecordIds';
+                $recordIdsMethod = $method.'RecordIds';
 
                 // Get related records ids
                 $model = new $modelClass;
@@ -128,7 +128,7 @@ 
 
                 // Add the record id itself to be filtered
                 if ($relatedList->module_id === $relatedList->related_module_id && !empty($recordId) && !$filteredRecordIds->contains($recordId)) {
-                    $filteredRecordIds[] = (int)$recordId;
+                    $filteredRecordIds[ ] = (int)$recordId;
                 }
 
                 // Make the quer
@@ -139,7 +139,7 @@ 
             $records = $query->paginate($length);
         }
 
-        $records->getCollection()->transform(function ($record) use ($domain, $module) {
+        $records->getCollection()->transform(function($record) use ($domain, $module) {
             foreach ($module->fields as $field) {
                 // If a special template exists, use it. Else use the generic template
                 $uitype = uitype($field->uitype_id);
@@ -183,7 +183,7 @@ 
         $results = collect();
         if (method_exists($modelClass, 'getSearchResult') && property_exists($modelClass, 'searchableColumns')) {
             $searchResults = new Search();
-            $searchResults->registerModel($modelClass, (array) (new $modelClass)->searchableColumns);
+            $searchResults->registerModel($modelClass, (array)(new $modelClass)->searchableColumns);
             $results = $searchResults->search($q)->take(config('uccello.max_results.autocomplete', 10));
         }
 
@@ -204,9 +204,9 @@ 
         $savePageLength = $request->input('save_page_length');
 
         // Optional data
-        $data = [];
+        $data = [ ];
         if ($savePageLength) {
-            $data["length"] = $request->input('page_length');
+            $data[ "length" ] = $request->input('page_length');
         }
 
         $filter = Filter::firstOrNew([

app/Http/Controllers/Core/DomainsTreeController.php

Spacing +6 added lines, -6 removed lines

@@ -19,14 +19,14 @@ 
             $domain = Domain::firstOrFail();
         }
 
-        return Cache::rememberForever('domains_root_user_'.auth()->id(), function () use($domain) {
+        return Cache::rememberForever('domains_root_user_'.auth()->id(), function() use($domain) {
             $rootDomains = app('uccello')->getRootDomains();
 
-            $domains = [];
+            $domains = [ ];
             foreach ($rootDomains as $_domain) {
                 $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain);
                 if ($formattedDomain) {
-                    $domains[] = $formattedDomain;
+                    $domains[ ] = $formattedDomain;
                 }
             }
 
@@ -48,13 +48,13 @@ 
 
         $parentDomain = Domain::find(request('id'));
 
-        return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function () use($domain, $parentDomain) {
-            $domains = [];
+        return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function() use($domain, $parentDomain) {
+            $domains = [ ];
             if ($parentDomain) {
                 foreach ($parentDomain->children()->orderBy('name')->get() as $_domain) {
                     $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain);
                     if ($formattedDomain) {
-                        $domains[] = $formattedDomain;
+                        $domains[ ] = $formattedDomain;
                     }
                 }
             }