uccellolabs / uccello

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/Fields/Uitype/Entity.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
                 if (method_exists($modelClass, 'getSearchResult') && property_exists($modelClass, 'searchableColumns')) {
                     // Search related records and get all ids
                     $searchResults = new Search();
-                    $searchResults->registerModel($modelClass, (array) (new $modelClass)->searchableColumns);
+                    $searchResults->registerModel($modelClass, (array)(new $modelClass)->searchableColumns);
                     $recordIds = $searchResults->search($value)->pluck('searchable.id');
 
                     // Search records linked to record ids got previously

app/Fields/Uitype/DateTime.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
         ];
 
         // We want the field displays the datetime in the good format
-        $options['value'] = $this->getFormattedValueToDisplay($field, $record);
+        $options[ 'value' ] = $this->getFormattedValueToDisplay($field, $record);
 
         return $options;
     }
@@ -123,10 +123,10 @@ 
     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) {
                 $values = explode(',', $value); // Start Date, End Date
-                $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[0]));
-                $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[1]));
+                $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[ 0 ]));
+                $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[ 1 ]));
                 $query->whereBetween($field->column, [ $dateStart, $dateEnd ])->get();
             });
         }

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,10 +110,10 @@ 
     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) {
                 $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 ]));
                 $query->whereBetween($field->column, [ $dateStart, $dateEnd ])->get();
             });
         }

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' => 1
         ]);
     }

app/Models/Filter.php

Braces +1 added lines, -2 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -78,24 +78,24 @@
             $filter = new static();
 
             // Refactor $data to mach match 'conditions' filter format...
-            if(!empty($data['columns']) && is_array($data['columns']) && is_array(reset($data['columns'])))
+            if (!empty($data[ 'columns' ]) && 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) {

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()