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/Helpers/Uccello.php

Spacing +27 added lines, -27 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 = [ ];
 
@@ -439,7 +439,7 @@ 
             $field = $module->fields->where('name', $fieldName)->first();
 
             // If the field does not exist or is not listable, continue
-            if (!$field  || !$field->isListable() || in_array($fieldName, $fieldsAdded)) {
+            if (!$field || !$field->isListable() || in_array($fieldName, $fieldsAdded)) {
                 continue;
             }
 
@@ -490,7 +490,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/Http/Controllers/User/AccountController.php

Spacing +8 added lines, -8 removed lines

@@ -53,9 +53,9 @@ 
         });
 
         $validator = Validator::make(request()->all(), [
-            'username' => $rules['username'],
-            'name' => $rules['name'],
-            'email' => $rules['email'],
+            'username' => $rules[ 'username' ],
+            'name' => $rules[ 'name' ],
+            'email' => $rules[ 'email' ],
         ]);
 
         if ($validator->fails()) {
@@ -94,11 +94,11 @@ 
         if (request('avatar')) {
             $image = str_replace('data:image/png;base64,', '', request('avatar'));
             $image = str_replace(' ', '+', $image);
-            $imageName = 'user-' . $user->id . '.png';
+            $imageName = 'user-'.$user->id.'.png';
             $path = storage_path('app/public/avatar/');
-            $filepath = $path . $imageName;
+            $filepath = $path.$imageName;
 
-            if(!\File::isDirectory($path)){
+            if (!\File::isDirectory($path)) {
                 \File::makeDirectory($path, 0777, true, true);
             }
 
@@ -129,7 +129,7 @@ 
 
         $field = Field::where('module_id', ucmodule('user')->id)->where('name', 'password')->first();
         $password_rules = isset($field->data->rules) ? explode('|', $field->data->rules) : '';
-        $password_rules[] = 'confirmed';
+        $password_rules[ ] = 'confirmed';
 
         $validator = Validator::make(request()->all(), [
             'current_password' => function($attribute, $value, $fail) use ($user) {
@@ -172,7 +172,7 @@ 
 
         $data = $userSettings->data ?? new \stdClass;
 
-        foreach ((array) request('settings') as $key => $value) {
+        foreach ((array)request('settings') as $key => $value) {
             if ($value === 'true') {
                 $value = true;
             } elseif ($value === 'false') {

app/Http/Controllers/Core/DomainsTreeController.php

Spacing +6 added lines, -6 removed lines

@@ -19,14 +19,14 @@ 
             $domain = Domain::firstOrFail();
         }
 
-        return Cache::rememberForever('domains_root_user_'.auth()->id(), function () use($domain) {
+        return Cache::rememberForever('domains_root_user_'.auth()->id(), function() use($domain) {
             $rootDomains = app('uccello')->getRootDomains();
 
-            $domains = [];
+            $domains = [ ];
             foreach ($rootDomains as $_domain) {
                 $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain);
                 if ($formattedDomain) {
-                    $domains[] = $formattedDomain;
+                    $domains[ ] = $formattedDomain;
                 }
             }
 
@@ -48,13 +48,13 @@ 
 
         $parentDomain = Domain::find(request('id'));
 
-        return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function () use($domain, $parentDomain) {
-            $domains = [];
+        return Cache::rememberForever('domains_'.$parentDomain->id.'_children_user_'.auth()->id(), function() use($domain, $parentDomain) {
+            $domains = [ ];
             if ($parentDomain) {
                 foreach ($parentDomain->children()->orderBy('name')->get() as $_domain) {
                     $formattedDomain = $this->getFormattedDomainToAdd($domain, $_domain);
                     if ($formattedDomain) {
-                        $domains[] = $formattedDomain;
+                        $domains[ ] = $formattedDomain;
                     }
                 }
             }

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/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(),
                 ]);
@@ -40,7 +40,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) {
@@ -52,7 +52,7 @@ 
 
     public function initializeUccelloModule()
     {
-        $this->appends = array_merge($this->appends, ['recordLabel','uuid']);
+        $this->appends = array_merge($this->appends, [ 'recordLabel', 'uuid' ]);
     }
 
     protected static function isFilteredByUser()
@@ -84,15 +84,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 +10 added lines, -10 removed lines

@@ -48,13 +48,13 @@ 
         // 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());
                     });
@@ -63,7 +63,7 @@ 
             ->get();
 
         // Order
-        $filterOrderBy = (array) $selectedFilter->order;
+        $filterOrderBy = (array)$selectedFilter->order;
 
         // See descendants
         $seeDescendants = request()->session()->get('descendants');
@@ -132,7 +132,7 @@ 
             if ($relatedList && $relatedList->method) {
                 // Related list method
                 $method = $relatedList->method;
-                $recordIdsMethod = $method . 'RecordIds';
+                $recordIdsMethod = $method.'RecordIds';
 
                 // Get related records ids
                 $model = new $modelClass;
@@ -140,7 +140,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
@@ -151,7 +151,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);
@@ -195,7 +195,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));
         }
 
@@ -216,9 +216,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([