uccellolabs / uccello

app/Models/Relatedlist.php

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 
         // Add tab id if defined
         if ($this->tab_id) {
-            $params['tab'] = $this->tab_id;
+            $params[ 'tab' ] = $this->tab_id;
         }
 
         return ucroute('uccello.edit.relation.delete', $domain, $this->relatedModule, $params);

app/Models/Group.php

Spacing +3 added lines, -3 removed lines

@@ -60,17 +60,17 @@
 
     public function parentGroups()
     {
-        return $this->belongsToMany(self::class, $this->tablePrefix . 'rl_groups_groups', 'children_id', 'parent_id');
+        return $this->belongsToMany(self::class, $this->tablePrefix.'rl_groups_groups', 'children_id', 'parent_id');
     }
 
     public function childrenGroups()
     {
-        return $this->belongsToMany(self::class, $this->tablePrefix . 'rl_groups_groups', 'parent_id', 'children_id');
+        return $this->belongsToMany(self::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/Models/Entity.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
         'record_id',
     ];
 
-    protected $primaryKey = 'id';   // TODO: Change to "uid" to make joins withs modules tables possible ???
+    protected $primaryKey = 'id'; // TODO: Change to "uid" to make joins withs modules tables possible ???
     public $incrementing = false;
 
     // Allow Eloquent to return id as string instead of int.
-    protected $casts = ['id' => 'string'];
+    protected $casts = [ 'id' => 'string' ];
 
     protected function initTablePrefix()
     {

app/Support/Traits/UccelloModule.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
     {
         parent::boot();
 
-        if(static::isFilteredByUser())
+        if (static::isFilteredByUser())
         {
             static::addGlobalScope(new AssignedUser);
         }
@@ -29,11 +29,11 @@ 
     {
         $user = Auth::user();
 
-        if($user && !$user->is_admin)
+        if ($user && !$user->is_admin)
         {
             $module = static::getModuleFromClass(static::class);
             
-            if($module && $module->data && property_exists($module->data, 'private') &&  $module->data->private)
+            if ($module && $module->data && property_exists($module->data, 'private') && $module->data->private)
             {
                 return true;
             }
@@ -54,15 +54,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 getUidAttribute()
@@ -73,7 +73,7 @@ 
                         ->where('record_id', $this->getKey())
                         ->first();
 
-        if($entity)
+        if ($entity)
         {
             $uid = $entity->getKey();
         }

app/helpers.php

Braces +1 added lines, -2 removed lines

@@ -183,8 +183,7 @@
         if (is_numeric($idOrUid))
         {
             $className::find($idOrUid);
-        }
-        else
+        } else
         {
             return uccello()->getRecordByUid($idOrUid);
         }

app/Http/Controllers/Core/EditController.php

Spacing +3 added lines, -3 removed lines

@@ -274,15 +274,15 @@
 
         // Redirect to source record if a relation was deleted
         if (isset($relatedlist) && $request->input('id')) {
-            $params = ['id' => $request->input('id')];
+            $params = [ 'id' => $request->input('id') ];
 
             // Add tab id if defined to select it automaticaly
             if ($request->input('tab')) {
-                $params['tab'] = $request->input('tab');
+                $params[ 'tab' ] = $request->input('tab');
             }
             // Add related list id to select the related tab automaticaly
             else {
-                $params['relatedlist'] = $relatedlist->id;
+                $params[ 'relatedlist' ] = $relatedlist->id;
             }
 
             $route = ucroute('uccello.detail', $domain, $relatedlist->module, $params);

database/migrations/2018_04_15_000034_create_group_module.php

Spacing +15 added lines, -15 removed lines

@@ -44,9 +44,9 @@ 
     public function down()
     {
         // Drop table
-        Schema::dropIfExists($this->tablePrefix . 'uccello_groups');
-        Schema::dropIfExists($this->tablePrefix . 'uccello_rl_groups_groups');
-        Schema::dropIfExists($this->tablePrefix . 'uccello_rl_groups_users');
+        Schema::dropIfExists($this->tablePrefix.'uccello_groups');
+        Schema::dropIfExists($this->tablePrefix.'uccello_rl_groups_groups');
+        Schema::dropIfExists($this->tablePrefix.'uccello_rl_groups_users');
 
         // Delete module
         Module::where('name', 'group')->forceDelete();
@@ -55,7 +55,7 @@ 
     protected function createTables()
     {
         // Module Table
-        Schema::create($this->tablePrefix . 'uccello_groups', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'uccello_groups', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name')->nullable();
             $table->text('description')->nullable();
@@ -66,7 +66,7 @@ 
         });
 
         // Related List Table: Groups-Groups
-        Schema::create($this->tablePrefix . 'uccello_rl_groups_groups', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'uccello_rl_groups_groups', function(Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('parent_id');
             $table->unsignedInteger('children_id');
@@ -74,19 +74,19 @@ 
 
             // Foreign keys
             $table->foreign('parent_id')
-                ->references('id')->on($this->tablePrefix . 'uccello_groups')
+                ->references('id')->on($this->tablePrefix.'uccello_groups')
                 ->onDelete('cascade');
 
             $table->foreign('children_id')
-                ->references('id')->on($this->tablePrefix . 'uccello_groups')
+                ->references('id')->on($this->tablePrefix.'uccello_groups')
                 ->onDelete('cascade');
 
             // Unique keys
-            $table->unique(['parent_id', 'children_id']);
+            $table->unique([ 'parent_id', 'children_id' ]);
         });
 
         // Related List Table: Groups-Users
-        Schema::create($this->tablePrefix . 'uccello_rl_groups_users', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'uccello_rl_groups_users', function(Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('group_id');
             $table->unsignedInteger('user_id');
@@ -94,15 +94,15 @@ 
 
             // Foreign keys
             $table->foreign('group_id')
-                ->references('id')->on($this->tablePrefix . 'uccello_groups')
+                ->references('id')->on($this->tablePrefix.'uccello_groups')
                 ->onDelete('cascade');
 
             $table->foreign('user_id')
-                ->references('id')->on($this->tablePrefix . 'users')
+                ->references('id')->on($this->tablePrefix.'users')
                 ->onDelete('cascade');
 
             // Unique keys
-            $table->unique(['group_id', 'user_id']);
+            $table->unique([ 'group_id', 'user_id' ]);
         });
     }
 
@@ -168,7 +168,7 @@ 
         $filter->user_id = null;
         $filter->name = 'filter.all';
         $filter->type = 'list';
-        $filter->columns = [ 'name', 'description'];
+        $filter->columns = [ 'name', 'description' ];
         $filter->conditions = null;
         $filter->order_by = null;
         $filter->is_default = true;
@@ -200,7 +200,7 @@ 
             'method' => 'getRelatedList',
             'data' => [
                 "relationName" => "childrenGroups",
-                "actions" => ["select", "add"]
+                "actions" => [ "select", "add" ]
             ],
             'sequence' => 0
         ]);
@@ -217,7 +217,7 @@ 
             'label' => 'relatedlist.users',
             'type' => 'n-n',
             'method' => 'getRelatedList',
-            'data' => ["actions" => ["select", "add"]],
+            'data' => [ "actions" => [ "select", "add" ] ],
             'sequence' => 0
         ]);
     }

app/Models/User.php

Spacing +32 added lines, -32 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->getAllowedGroupUidsProcess();
             }
         );
@@ -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);
             }
         );
@@ -494,13 +494,13 @@ 
         if ($this->is_admin) {
             $groups = Group::orderBy('name')->get();
         } else {
-            $allowedUserUids[] = $this->uid;
+            $allowedUserUids[ ] = $this->uid;
 
-            $groups = [];
-            $users = [];
+            $groups = [ ];
+            $users = [ ];
 
             foreach ($this->groups as $group) {
-                $groups[$group->uid] = $group;
+                $groups[ $group->uid ] = $group;
             };
 
             $this->addRecursiveChildrenGroups($groups, $users, $groups, false);
@@ -509,7 +509,7 @@ 
         }
 
         foreach ($groups as $uid => $group) {
-            $allowedUserUids[] = $uid;
+            $allowedUserUids[ ] = $uid;
         }
 
         return $allowedUserUids;
@@ -518,19 +518,19 @@ 
     protected function addRecursiveChildrenGroups(&$groups, &$users, $searchGroups, $addUsers = false)
     {
         foreach ($searchGroups as $uid => $searchGroup) {
-            $searchChildrenGroups = [];
+            $searchChildrenGroups = [ ];
 
             foreach ($searchGroup->childrenGroups as $childrenGroup) {
-                if (empty($groups[$childrenGroup->uid])) {
-                    $groups[$childrenGroup->uid] = $childrenGroup;
-                    $searchChildrenGroups[$childrenGroup->uid] = $childrenGroup;
+                if (empty($groups[ $childrenGroup->uid ])) {
+                    $groups[ $childrenGroup->uid ] = $childrenGroup;
+                    $searchChildrenGroups[ $childrenGroup->uid ] = $childrenGroup;
                 }
 
-                if($addUsers)
+                if ($addUsers)
                 {
                     foreach ($childrenGroup->users as $user) {
-                        if (empty($users[$user->uid])) {
-                            $users[$user->uid] = $user;
+                        if (empty($users[ $user->uid ])) {
+                            $users[ $user->uid ] = $user;
                         }
                     }
                 }
@@ -548,22 +548,22 @@ 
             $groups = Group::orderBy('name')->get();
             $users  = \App\User::orderBy('name')->get();
         } else {
-            $allowedUserUids[] = [
+            $allowedUserUids[ ] = [
                 'uid' => $this->uid,
                 'recordLabel' => $this->recordLabel
             ];
 
-            $groups = [];
-            $users = [];
+            $groups = [ ];
+            $users = [ ];
 
             foreach ($this->groups as $group) {
-                $groups[$group->uid] = $group;
+                $groups[ $group->uid ] = $group;
 
-                if($addUsers)
+                if ($addUsers)
                 {
                     foreach ($group->users as $user) {
-                        if (empty($users[$user->uid])) {
-                            $users[$user->uid] = $user;
+                        if (empty($users[ $user->uid ])) {
+                            $users[ $user->uid ] = $user;
                         }
                     }
                 }
@@ -576,15 +576,15 @@ 
         }
 
         foreach ($groups as $uid => $group) {
-            $allowedUserUids[] = [
+            $allowedUserUids[ ] = [
                 'uid' => $group->uid,
                 'recordLabel' => $group->recordLabel
             ];
         }
 
         foreach ($users as $uid => $user) {
-            if($user->getKey() != $this->getKey()) {
-                $allowedUserUids[] = [
+            if ($user->getKey() != $this->getKey()) {
+                $allowedUserUids[ ] = [
                     'uid' => $user->uid,
                     'recordLabel' => $user->recordLabel
                 ];

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 = [ ];
 
@@ -492,7 +492,7 @@ 
     {
         $entity = Entity::find($uid);
         
-        if($entity) {
+        if ($entity) {
             return $entity->record;
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -494,8 +494,7 @@
         
         if($entity) {
             return $entity->record;
-        }
-        else {
+        } else {
             return null;
         }
     }