uccellolabs / uccello

app/Support/Traits/RelatedlistTrait.php

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
     {
         // Related field
         $relatedField = $relatedList->relatedField;
-        $filter = ['order' => request('order')];
+        $filter = [ 'order' => request('order') ];
 
-        $query = $query->where(function (Builder $_query) use ($recordId, $relatedList, $relatedField) {
+        $query = $query->where(function(Builder $_query) use ($recordId, $relatedList, $relatedField) {
             // Search by id
             $_query->where($relatedField->column, $recordId);
 
@@ -64,7 +64,7 @@ 
         // Related field
         $relatedField = $relatedList->relatedField;
 
-        return $relatedModel::where(function (Builder $_query) use ($recordId, $relatedList, $relatedField) {
+        return $relatedModel::where(function(Builder $_query) use ($recordId, $relatedList, $relatedField) {
             // Search by id
             $_query->where($relatedField->column, $recordId);
 
@@ -115,7 +115,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/ListController.php

Spacing +15 added lines, -15 removed lines

@@ -51,17 +51,17 @@ 
         // Get filters
         $filters = Filter::where('module_id', $module->id)  // Module
             ->where('type', 'list')                         // Type (list)
-            ->where(function ($query) use($domain) {        // Domain
+            ->where(function($query) use($domain) {        // Domain
                 $query->whereNull('domain_id')
                     ->orWhere('domain_id', $domain->getKey());
             })
-            ->where(function ($query) {                     // User
+            ->where(function($query) {                     // User
                 $query->where('is_public', true)
-                    ->orWhere(function ($query) {
+                    ->orWhere(function($query) {
                         $query->where('is_public', false)
                             ->where('user_id', '=', auth()->id());
                     })
-                    ->orWhere(function ($query) {
+                    ->orWhere(function($query) {
                         $query->where('is_public', false)
                             ->whereNull('user_id');
                     });
@@ -70,7 +70,7 @@ 
             ->get();
 
         // Order
-        $filterOrder = (array) $selectedFilter->order;
+        $filterOrder = (array)$selectedFilter->order;
 
         // See descendants
         $seeDescendants = request()->session()->get('descendants');
@@ -154,7 +154,7 @@ 
             if ($relatedList && $relatedList->method) {
                 // Related list method
                 $method = $relatedList->method;
-                $recordIdsMethod = $method . 'RecordIds';
+                $recordIdsMethod = $method.'RecordIds';
 
                 // Get related records ids
                 $model = new $modelClass;
@@ -162,7 +162,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;
                 }
 
                 if ($relatedList->module_id) {
@@ -177,7 +177,7 @@ 
             $records = $query->paginate($length);
         }
 
-        $records->getCollection()->transform(function ($record) use ($domain, $module, $relatedModule) {
+        $records->getCollection()->transform(function($record) use ($domain, $module, $relatedModule) {
             foreach ($module->fields as $field) {
                 // If a special template exists, use it. Else use the generic template
                 $uitype = uitype($field->uitype_id);
@@ -228,7 +228,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));
         }
 
@@ -249,9 +249,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([
@@ -343,9 +343,9 @@ 
     protected function addSearchConditions($filter)
     {
         if ($this->request->has('search')) {
-            $conditions = [];
-            foreach ((array) $this->request->search as $fieldName => $value) {
-                $conditions[$fieldName] = $value;
+            $conditions = [ ];
+            foreach ((array)$this->request->search as $fieldName => $value) {
+                $conditions[ $fieldName ] = $value;
             }
 
             if ($conditions) {
@@ -384,7 +384,7 @@ 
 
             if ($rules) {
                 foreach ($rules as $column => $rule) {
-                    $filter['columns'][$column]['search'] = $rule;
+                    $filter[ 'columns' ][ $column ][ 'search' ] = $rule;
                 }
             }
         }

app/Console/Commands/GenerateUuidCacheCommand.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             $modelClass = $module->model_class;
 
             $query = Entity::where('module_id', $module->id)
-                ->whereNotIn('record_id', function ($query) use ($modelClass) {
+                ->whereNotIn('record_id', function($query) use ($modelClass) {
                     $query->select('id')
                         ->from((new $modelClass)->getTable())
                         ->get();
@@ -73,7 +73,7 @@ 
             $modelClass = $module->model_class;
             $count = $modelClass::count();
             $cpt = 0;
-            $modelClass::chunkById(300, function ($records) use (&$cpt, $count) {
+            $modelClass::chunkById(300, function($records) use (&$cpt, $count) {
                 $this->comment($cpt.'/'.$count);
                 foreach ($records as $record) {
                     $record->uuid; // Automaticaly generate cache (see \Uccello\Core\Support\Traits\UccelloModule getUuidAttribute())

app/Support/Traits/UccelloModule.php

Spacing +10 added lines, -10 removed lines

@@ -28,11 +28,11 @@ 
         }
 
         // Create uuid after save
-        static::created(function ($model) {
+        static::created(function($model) {
             $module = Module::where('model_class', get_class($model))->first();
             if ($module) {
                 Entity::create([
-                    'id' => (string) Str::uuid(),
+                    'id' => (string)Str::uuid(),
                     'module_id' => $module->id,
                     'record_id' => $model->getKey(),
                     'creator_id' => auth()->id(),
@@ -41,7 +41,7 @@ 
         });
 
         // Delete uuid after forced delete
-        static::deleted(function ($model) {
+        static::deleted(function($model) {
             if (!empty($model->uuid) && (!method_exists($model, 'isForceDeleting') || $model->isForceDeleting() === true)) {
                 $entity = Entity::find($model->uuid);
                 if ($entity) {
@@ -53,7 +53,7 @@ 
 
     public function initializeUccelloModule()
     {
-        $this->appends = array_merge($this->appends, ['recordLabel','uuid']);
+        $this->appends = array_merge($this->appends, [ 'recordLabel', 'uuid' ]);
     }
 
     protected static function isFilteredByUser()
@@ -85,15 +85,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()
@@ -103,7 +103,7 @@ 
         $module = $this->module;
 
         if ($module) {
-            return Cache::rememberForever('uuid_'.$module->getKey().'_'.$this->getKey(), function () use ($module) {
+            return Cache::rememberForever('uuid_'.$module->getKey().'_'.$this->getKey(), function() use ($module) {
                 $entity = Entity::where('module_id', $module->getKey())
                 ->where('record_id', $this->getKey())
                 ->first();
@@ -159,7 +159,7 @@ 
         if (!empty($domain) && Schema::hasColumn($this->table, 'domain_id')) {
             // Activate descendant view if the user is allowed
             if (Auth::user() && Auth::user()->canSeeDescendantsRecords($domain) && $withDescendants) {
-                $query->whereIn('domain_id', function ($query) use ($domain) {
+                $query->whereIn('domain_id', function($query) use ($domain) {
                     $query->select('id')
                     ->from((new Domain)->getTable())
                     ->where('path', 'like', $domain->id.'/%')

app/Models/User.php

Spacing +36 added lines, -36 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @var array
      */
-    protected $dates = ['deleted_at'];
+    protected $dates = [ 'deleted_at' ];
 
     /**
      * The attributes that should be casted to native types.
@@ -109,8 +109,8 @@ 
         // Check if user is admin or if he has at least a role on the domain
         // or on descendants domains if withDescendants option is on
         $builder->where('domain_id', $domain->id)
-            ->orWhereIn($this->getKeyName(), function ($query) use ($domain, $withDescendants) {
-                $privilegesTable = env('UCCELLO_TABLE_PREFIX', 'uccello_') . 'privileges';
+            ->orWhereIn($this->getKeyName(), function($query) use ($domain, $withDescendants) {
+                $privilegesTable = env('UCCELLO_TABLE_PREFIX', 'uccello_').'privileges';
 
                 $query->select('user_id')
                     ->from($privilegesTable);
@@ -124,7 +124,7 @@ 
                 }
 
                 if (Auth::user() && Auth::user()->canSeeDescendantsRecords($domain) && $withDescendants) {
-                    $query->orWhereIn('domain_id', function ($query) use ($domain) {
+                    $query->orWhereIn('domain_id', function($query) use ($domain) {
                         $query->select('id')
                             ->from((new Domain)->getTable())
                             ->where('path', 'like', $domain->id.'/%')
@@ -205,7 +205,7 @@ 
 
         $i = 0;
         foreach ($words as $w) {
-            $initials .= $w[0];
+            $initials .= $w[ 0 ];
             $i++;
 
             if ($i === 3) { // Maximum: 3 letters
@@ -226,7 +226,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;
         }
@@ -272,14 +272,14 @@ 
         if ($withAncestors && config('uccello.roles.display_ancestors_roles')) {
             $treeDomainsIds = $domain->findAncestors()->pluck('id');
         } else {
-            $treeDomainsIds = collect([$domain->id]);
+            $treeDomainsIds = collect([ $domain->id ]);
         }
 
         foreach ($treeDomainsIds as $treeDomainId) {
             $_domain = Domain::find($treeDomainId);
             foreach ($this->privileges->where('domain_id', $_domain->id) as $privilege) {
                 if (!$roles->contains($privilege->role)) {
-                    $roles[] = $privilege->role;
+                    $roles[ ] = $privilege->role;
                 }
             }
         }
@@ -303,7 +303,7 @@ 
         if ($withAncestors) {
             $treeDomainsIds = $domain->findAncestors()->pluck('id');
         } else {
-            $treeDomainsIds = collect([$domain->id]);
+            $treeDomainsIds = collect([ $domain->id ]);
         }
 
         foreach ($treeDomainsIds as $treeDomainId) {
@@ -317,7 +317,7 @@ 
 
             foreach ($_privileges as $privilege) {
                 if (!$privileges->contains($privilege)) {
-                    $privileges[] = $privilege;
+                    $privileges[ ] = $privilege;
                 }
             }
         }
@@ -372,7 +372,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();
         });
 
@@ -396,9 +396,9 @@ 
      */
     public function capabilitiesOnModule(Domain $domain, Module $module): Collection
     {
-        $keyName = 'user_' . $this->id . '_' . $domain->slug . '_' . $module->name . '_capabilities';
+        $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
@@ -449,9 +449,9 @@ 
             $domain = Domain::first();
         }
 
-        $keyName = 'user_' . $this->id . '_' . $domain->slug . '_can_access_to_settings_panel';
+        $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;
 
@@ -603,8 +603,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();
             }
         );
@@ -616,11 +616,11 @@ 
     {
         // Use cache
         $allowedGroupsAndUsers = Cache::rememberForever(
-            'allowed_group_users_for_' .
-                'd_' . $domain->getKey() . '_' .
-                ($addUsers ? 'u_' : '') .
+            'allowed_group_users_for_'.
+                'd_'.$domain->getKey().'_'.
+                ($addUsers ? 'u_' : '').
                 ($this->is_admin ? 'admin' : $this->getKey()),
-            function () use ($domain, $addUsers) {
+            function() use ($domain, $addUsers) {
                 return $this->getAllowedGroupsAndUsersProcess($domain, $addUsers);
             }
         );
@@ -630,16 +630,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);
@@ -648,7 +648,7 @@ 
         }
 
         foreach ($groups as $uuid => $group) {
-            $allowedUserUuids[] = $uuid;
+            $allowedUserUuids[ ] = $uuid;
         }
 
         return $allowedUserUuids;
@@ -657,18 +657,18 @@ 
     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) {
                     foreach ($childrenGroup->users as $user) {
-                        if (empty($users[$user->uuid])) {
-                            $users[$user->uuid] = $user;
+                        if (empty($users[ $user->uuid ])) {
+                            $users[ $user->uuid ] = $user;
                         }
                     }
                 }
@@ -680,10 +680,10 @@ 
 
     protected function getAllowedGroupsAndUsersProcess(Domain $domain, $addUsers = true)
     {
-        $allowedUserUuids = collect([[
+        $allowedUserUuids = collect([ [
             'uuid' => $this->uuid,
             'recordLabel' => uctrans('me', $this->module)
-        ]]);
+        ] ]);
 
         // if ($this->is_admin) {
         $groups = Group::inDomain($domain)->orderBy('name')->get();
@@ -712,7 +712,7 @@ 
         // }
 
         foreach ($groups as $uuid => $group) {
-            $allowedUserUuids[] = [
+            $allowedUserUuids[ ] = [
                 'uuid' => $group->uuid,
                 'recordLabel' => $group->recordLabel
             ];
@@ -720,7 +720,7 @@ 
 
         foreach ($users as $uuid => $user) {
             if ($user->getKey() != $this->getKey()) {
-                $allowedUserUuids[] = [
+                $allowedUserUuids[ ] = [
                     'uuid' => $user->uuid,
                     'recordLabel' => $user->recordLabel
                 ];