uccellolabs / uccello

database/migrations/2018_04_15_000034_create_group_module.php

Spacing +14 added lines, -14 removed lines

@@ -44,9 +44,9 @@ 
     public function down()
     {
         // Drop table
-        Schema::dropIfExists($this->tablePrefix . 'groups');
-        Schema::dropIfExists($this->tablePrefix . 'rl_groups_groups');
-        Schema::dropIfExists($this->tablePrefix . 'rl_groups_users');
+        Schema::dropIfExists($this->tablePrefix.'groups');
+        Schema::dropIfExists($this->tablePrefix.'rl_groups_groups');
+        Schema::dropIfExists($this->tablePrefix.'rl_groups_users');
 
         // Delete module
         Module::where('name', 'group')->forceDelete();
@@ -55,7 +55,7 @@ 
     protected function createTables()
     {
         // Module Table
-        Schema::create($this->tablePrefix . 'groups', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'groups', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name')->nullable();
             $table->text('description')->nullable();
@@ -64,7 +64,7 @@ 
         });
 
         // Related List Table: Groups-Groups
-        Schema::create($this->tablePrefix . 'rl_groups_groups', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'rl_groups_groups', function(Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('parent_id');
             $table->unsignedInteger('children_id');
@@ -72,19 +72,19 @@ 
 
             // Foreign keys
             $table->foreign('parent_id')
-                ->references('id')->on($this->tablePrefix . 'groups')
+                ->references('id')->on($this->tablePrefix.'groups')
                 ->onDelete('cascade');
 
             $table->foreign('children_id')
-                ->references('id')->on($this->tablePrefix . 'groups')
+                ->references('id')->on($this->tablePrefix.'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 . 'rl_groups_users', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'rl_groups_users', function(Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('group_id');
             $table->unsignedInteger('user_id');
@@ -92,7 +92,7 @@ 
 
             // Foreign keys
             $table->foreign('group_id')
-                ->references('id')->on($this->tablePrefix . 'groups')
+                ->references('id')->on($this->tablePrefix.'groups')
                 ->onDelete('cascade');
 
             $table->foreign('user_id')
@@ -100,7 +100,7 @@ 
                 ->onDelete('cascade');
 
             // Unique keys
-            $table->unique(['group_id', 'user_id']);
+            $table->unique([ 'group_id', 'user_id' ]);
         });
     }
 
@@ -166,7 +166,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;
@@ -198,7 +198,7 @@ 
             'method' => 'getRelatedList',
             'data' => [
                 "relationName" => "childrenGroups",
-                "actions" => ["select", "add"]
+                "actions" => [ "select", "add" ]
             ],
             'sequence' => 0
         ]);
@@ -215,7 +215,7 @@ 
             'label' => 'relatedlist.users',
             'type' => 'n-n',
             'method' => 'getRelatedList',
-            'data' => ["actions" => ["select", "add"]],
+            'data' => [ "actions" => [ "select", "add" ] ],
             'sequence' => 1
         ]);
     }

database/migrations/2018_04_15_000036_create_user_settings_table.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function up()
     {
-        Schema::create($this->tablePrefix . 'user_settings', function (Blueprint $table) {
+        Schema::create($this->tablePrefix.'user_settings', function(Blueprint $table) {
             $table->unsignedInteger('user_id')->primary();
             $table->longText('data');
             $table->timestamps();
@@ -32,6 +32,6 @@ 
      */
     public function down()
     {
-        Schema::dropIfExists($this->tablePrefix . 'user_settings');
+        Schema::dropIfExists($this->tablePrefix.'user_settings');
     }
 }

app/Http/Controllers/Core/EditController.php

Spacing +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
         $this->preProcess($domain, $module, $request);
 
         // Retrieve record
-        $recordId = (int) request('id');
+        $recordId = (int)request('id');
         $modelClass = $module->model_class;
         $record = $modelClass::onlyTrashed()->findOrFail($recordId);
 
@@ -172,7 +172,7 @@ 
         }
 
         // Redirect to the trash list
-        $route = ucroute('uccello.list', $domain, $module, ['filter' => 'trash']);
+        $route = ucroute('uccello.list', $domain, $module, [ 'filter' => 'trash' ]);
         return redirect($route);
     }
 
@@ -306,15 +306,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);

app/Http/Controllers/Core/ListController.php

Spacing +11 added lines, -11 removed lines

@@ -48,17 +48,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');
                     });
@@ -67,7 +67,7 @@ 
             ->get();
 
         // Order
-        $filterOrder = (array) $selectedFilter->order;
+        $filterOrder = (array)$selectedFilter->order;
 
         // See descendants
         $seeDescendants = request()->session()->get('descendants');
@@ -150,7 +150,7 @@ 
             if ($relatedList && $relatedList->method) {
                 // Related list method
                 $method = $relatedList->method;
-                $recordIdsMethod = $method . 'RecordIds';
+                $recordIdsMethod = $method.'RecordIds';
 
                 // Get related records ids
                 $model = new $modelClass;
@@ -158,7 +158,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
@@ -169,7 +169,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);
@@ -213,7 +213,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));
         }
 
@@ -234,9 +234,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/Support/Scopes/AssignedUser.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
             $builder->whereIn('assigned_user_id', $user->getAllowedGroupUuids());
 
             // Records assigned to an user with roles subordonate to the roles of the user
-            $builder->orWhereIn('assigned_user_id', function ($query) use ($user) {
+            $builder->orWhereIn('assigned_user_id', function($query) use ($user) {
                 $entityTable = with(new Entity)->getTable();
                 $privilegesTable = env('UCCELLO_TABLE_PREFIX', 'uccello_').'privileges';
 
@@ -36,7 +36,7 @@ 
 
                 $query->select($entityTable.'.id')
                     ->from($entityTable)
-                    ->join($privilegesTable, function ($join) use($entityTable, $privilegesTable, $subordonateRolesIds) {
+                    ->join($privilegesTable, function($join) use($entityTable, $privilegesTable, $subordonateRolesIds) {
                         $join->on("$privilegesTable.user_id", '=', $entityTable.'.record_id')
                         ->whereIn("$privilegesTable.role_id", $subordonateRolesIds);
                     })
@@ -45,7 +45,7 @@ 
 
             // Records created by the user
             if (!empty($model->module)) {
-                $builder->orWhereIn($model->getTable().'.'.$model->getKeyName(), function ($query) use($model) {
+                $builder->orWhereIn($model->getTable().'.'.$model->getKeyName(), function($query) use($model) {
                     $query->select('record_id')
                     ->from(with(new Entity)->getTable())
                     ->where('module_id', $model->module->id ?? null)

app/Support/Traits/UccelloModule.php

Spacing +8 added lines, -8 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()

app/Models/Domain.php

Spacing +4 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
         parent::boot();
 
         // Linck to parent record
-        static::created(function ($model) {
+        static::created(function($model) {
             static::linkToParentRecord($model);
         });
 
@@ -75,7 +75,7 @@ 
         //     static::linkToParentRecord($model);
         // });
 
-        static::updated(function ($model) {
+        static::updated(function($model) {
             static::linkToParentRecord($model);
         });
     }
@@ -103,7 +103,7 @@ 
     public function isRoot()
     {
         // return (empty($this->{$this->getTreeColumn('parent')})) ? true : false;
-        return $this->{$this->getTreeColumn('path')} === $this->getKey() . '/'
+        return $this->{$this->getTreeColumn('path')} === $this->getKey().'/'
                 && $this->{$this->getTreeColumn('level')} === 0;
     }
 
@@ -233,7 +233,7 @@ 
      */
     protected function getNotAdminModulesAttribute() : array
     {
-        return Cache::rememberForever('not_admin_modules', function () {
+        return Cache::rememberForever('not_admin_modules', function() {
             $modules = [ ];
 
             foreach ($this->modules()->get() as $module) {

app/Models/Module.php

Spacing +2 added lines, -2 removed lines

@@ -174,8 +174,8 @@
             }
             // Several routes
             elseif (is_array($this->data->menu)) {
-                if (!empty($this->data->menu[0]->route)) {
-                    $defaultRoute = $this->data->menu[0]->route;
+                if (!empty($this->data->menu[ 0 ]->route)) {
+                    $defaultRoute = $this->data->menu[ 0 ]->route;
                 }
             }
             // No route wanted

app/Models/User.php

Spacing +27 added lines, -27 removed lines

@@ -151,7 +151,7 @@ 
 
         $i = 0;
         foreach ($words as $w) {
-            $initials .= $w[0];
+            $initials .= $w[ 0 ];
             $i++;
 
             if ($i === 3) { // Maximum: 3 letters
@@ -172,7 +172,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;
@@ -198,7 +198,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;
     }
 
@@ -276,7 +276,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();
         });
 
@@ -302,7 +302,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
@@ -356,7 +356,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;
 
@@ -508,8 +508,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();
             }
         );
@@ -521,8 +521,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);
             }
         );
@@ -532,16 +532,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);
@@ -550,7 +550,7 @@ 
         }
 
         foreach ($groups as $uuid => $group) {
-            $allowedUserUuids[] = $uuid;
+            $allowedUserUuids[ ] = $uuid;
         }
 
         return $allowedUserUuids;
@@ -559,19 +559,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;
                         }
                     }
                 }
@@ -583,10 +583,10 @@ 
 
     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();
@@ -615,15 +615,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
                 ];