uccellolabs / uccello

app/Helpers/Uccello.php

Spacing +26 added lines, -26 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 = [ ];
 
@@ -462,7 +462,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/Models/Filter.php

Spacing +7 added lines, -7 removed lines

@@ -78,24 +78,24 @@
             $filter = new static();
 
             // Refactor $data to mach match 'conditions' filter format...
-            if(is_array($data['columns']) && is_array(reset($data['columns'])))
+            if (is_array($data[ 'columns' ]) && is_array(reset($data[ 'columns' ])))
             {
-                if (empty($data['conditions'])) {
-                    $data['conditions'] = [];
+                if (empty($data[ 'conditions' ])) {
+                    $data[ 'conditions' ] = [ ];
                 }
                 else {
-                    $data['conditions'] = (array) $data['conditions'];
+                    $data[ 'conditions' ] = (array)$data[ 'conditions' ];
                 }
 
-                foreach ($data['columns'] as $fieldName => $field) {
+                foreach ($data[ 'columns' ] as $fieldName => $field) {
                     foreach ($field as $key => $value) {
                         if (!empty($value) && $key != 'columnName') {
-                            $data['conditions'][$key][$fieldName] = $value;
+                            $data[ 'conditions' ][ $key ][ $fieldName ] = $value;
                         }
                     }
                 }
 
-                unset($data['columns']);
+                unset($data[ 'columns' ]);
             }
 
             foreach ($data as $key => $value) {

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
             {
                 if (empty($data['conditions'])) {
                     $data['conditions'] = [];
-                }
-                else {
+                } else {
                     $data['conditions'] = (array) $data['conditions'];
                 }
 

app/Models/User.php

Spacing +33 added lines, -33 removed lines

@@ -147,7 +147,7 @@ 
 
         $i = 0;
         foreach ($words as $w) {
-            $initials .= $w[0];
+            $initials .= $w[ 0 ];
             $i++;
 
             if ($i === 3) { // Maximum: 3 letters
@@ -168,7 +168,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;
@@ -185,7 +185,7 @@ 
      */
     public function rolesOnDomain($domain) : Collection
     {
-        return Cache::remember('domain_'.$domain->slug.'_roles', 600, function () use($domain) {
+        return Cache::remember('domain_'.$domain->slug.'_roles', 600, function() use($domain) {
             $roles = collect();
 
             if (config('uccello.roles.display_ancestors_roles')) {
@@ -233,7 +233,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();
         });
 
@@ -259,7 +259,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
@@ -313,7 +313,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;
 
@@ -465,8 +465,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();
             }
         );
@@ -478,8 +478,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);
             }
         );
@@ -489,16 +489,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);
@@ -507,7 +507,7 @@ 
         }
 
         foreach ($groups as $uuid => $group) {
-            $allowedUserUuids[] = $uuid;
+            $allowedUserUuids[ ] = $uuid;
         }
 
         return $allowedUserUuids;
@@ -516,19 +516,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;
                         }
                     }
                 }
@@ -540,26 +540,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;
                         }
                     }
                 }
@@ -572,15 +572,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/Models/Group.php

Spacing +3 added lines, -3 removed lines

@@ -61,17 +61,17 @@
 
     public function parentGroups()
     {
-        return $this->belongsToMany(static::class, $this->tablePrefix . 'rl_groups_groups', 'children_id', 'parent_id');
+        return $this->belongsToMany(static::class, $this->tablePrefix.'rl_groups_groups', 'children_id', 'parent_id');
     }
 
     public function childrenGroups()
     {
-        return $this->belongsToMany(static::class, $this->tablePrefix . 'rl_groups_groups', 'parent_id', 'children_id');
+        return $this->belongsToMany(static::class, $this->tablePrefix.'rl_groups_groups', 'parent_id', 'children_id');
     }
 
     public function users()
     {
-        return $this->belongsToMany(User::class, $this->tablePrefix . 'rl_groups_users');
+        return $this->belongsToMany(User::class, $this->tablePrefix.'rl_groups_users');
     }
 
     /**

app/Support/Traits/UccelloModule.php

Spacing +4 added lines, -4 removed lines

@@ -56,15 +56,15 @@
 
     protected static function getModuleFromClass($className)
     {
-        $modules = Cache::rememberForever('modules_by_model_class', function () {
+        $modules = Cache::rememberForever('modules_by_model_class', function() {
             $modulesGroupedByModelClass = collect();
-            Module::all()->map(function ($item) use ($modulesGroupedByModelClass) {
-                $modulesGroupedByModelClass[$item->model_class] = $item;
+            Module::all()->map(function($item) use ($modulesGroupedByModelClass) {
+                $modulesGroupedByModelClass[ $item->model_class ] = $item;
                 return $modulesGroupedByModelClass;
             });
             return $modulesGroupedByModelClass;
         });
-        return $modules[(string) $className] ?? null;
+        return $modules[ (string)$className ] ?? null;
     }
 
     public function getUuidAttribute()

app/Http/Controllers/Core/ListController.php

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
             ->get();
 
         // Order by
-        $filterOrderBy = (array) $selectedFilter->order;
+        $filterOrderBy = (array)$selectedFilter->order;
 
         return $this->autoView(compact('datatableColumns', 'filters', 'selectedFilter', 'filterOrderBy'));
     }
@@ -113,7 +113,7 @@ 
             if ($relatedList && $relatedList->method) {
                 // Related list method
                 $method = $relatedList->method;
-                $recordIdsMethod = $method . 'RecordIds';
+                $recordIdsMethod = $method.'RecordIds';
 
                 // Get related records ids
                 $model = new $modelClass;
@@ -121,7 +121,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
@@ -132,7 +132,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);
@@ -176,7 +176,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));
         }
 
@@ -197,9 +197,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/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');
         });
     }