uccellolabs / uccello

app/Providers/RouteServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
         parent::boot();
 
         // Bind domain
-        Route::bind('domain', function ($value) {
+        Route::bind('domain', function($value) {
             if (preg_match('`^[0-9]+$`', $value)) { // By id
                 $domain = Domain::findOrFail($value);
             } else { // By slug
@@ -30,7 +30,7 @@ 
         });
 
         // Bind module
-        Route::bind('module', function ($value) {
+        Route::bind('module', function($value) {
             if (preg_match('`^[0-9]+$`', $value)) { // By id
                 $module = Module::findOrFail($value);
             } else { // By name

app/Helpers/Uccello.php

Spacing +25 added lines, -25 removed lines

@@ -233,26 +233,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;
         }
     }
 
@@ -270,26 +270,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;
         }
     }
 
@@ -307,26 +307,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;
         }
     }
 
@@ -344,26 +344,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;
         }
     }
 
@@ -405,7 +405,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 = [ ];
 

app/Http/Controllers/Core/Controller.php

Spacing +5 added lines, -5 removed lines

@@ -75,7 +75,7 @@ 
      * @param Module $module
      * @param boolean $forBlade
      */
-    protected function preProcess(?Domain &$domain, Module $module, Request $request, $forBlade=true)
+    protected function preProcess(?Domain &$domain, Module $module, Request $request, $forBlade = true)
     {
         // If we don't use multi domains, find the first one
         if (!uccello()->useMultiDomains()) {
@@ -157,7 +157,7 @@ 
     {
         $keyName = $getAdminModules ? 'modules_all' : 'modules_not_admin';
 
-        return Cache::rememberForever($keyName, function () use($getAdminModules) {
+        return Cache::rememberForever($keyName, function() use($getAdminModules) {
             $modules = [ ];
 
             $allModules = Module::all();
@@ -215,11 +215,11 @@ 
      */
     protected function getDomainsTreeHtml()
     {
-        return Cache::remember('users', 600, function () { // 10 minutes
+        return Cache::remember('users', 600, function() { // 10 minutes
             $domainsTreeHtml = '<ul class="tree tree-level-0">';
 
             $rootDomains = app('uccello')->getRootDomains();
-            foreach($rootDomains as $root) {
+            foreach ($rootDomains as $root) {
 
                 $descendants = $root->findDescendants()->get();
 
@@ -227,7 +227,7 @@ 
 
                 $html = $tree->render(
                     'ul',
-                    function ($node) {
+                    function($node) {
                         if (auth()->user()->hasRoleOnDomain($node)) {
                             $currentClass = '';
                             // if ($node->id === $this->domain->id) {

Braces +1 added lines, -2 removed lines

@@ -234,8 +234,7 @@
                             //     $currentClass = 'class="green-text"';
                             // }
                             return '<li><a href="'.ucroute('uccello.home', $node).'" '.$currentClass.'>'.$node->name.'</a>{sub-tree}</li>';
-                        }
-                        elseif (auth()->user()->hasRoleOnDescendantDomain($node)) {
+                        } elseif (auth()->user()->hasRoleOnDescendantDomain($node)) {
                             return '<li>'.$node->name.'{sub-tree}</li>';
                         } else {
                             return '';

tests/Feature/Settings/ModuleManagerTest.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
     protected function getSettingsModule()
     {
-       return Module::where('name', 'settings')->first();
+        return Module::where('name', 'settings')->first();
     }
 
     public function testModuleActivationCanBeChanged()

app/Models/User.php

Spacing +6 added lines, -6 removed lines

@@ -139,7 +139,7 @@ 
 
         $i = 0;
         foreach ($words as $w) {
-            $initials .= $w[0];
+            $initials .= $w[ 0 ];
             $i++;
 
             if ($i === 3) { // Maximum: 3 letters
@@ -160,7 +160,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;
@@ -177,7 +177,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();
 
             foreach ($this->privileges->where('domain_id', $domain->id) as $privilege) {
@@ -216,7 +216,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();
         });
 
@@ -242,7 +242,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
@@ -296,7 +296,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;
 

app/Http/Controllers/User/AccountController.php

Spacing +7 added lines, -7 removed lines

@@ -52,9 +52,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()) {
@@ -93,11 +93,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);
             }
 
@@ -128,7 +128,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) {

app/Widgets/RelatedlistWidget.php

Spacing +5 added lines, -5 removed lines

@@ -20,19 +20,19 @@
     public function run()
     {
         // Get module
-        $module = ucmodule($this->config['module']);
+        $module = ucmodule($this->config[ 'module' ]);
 
         // Get record
         $modelClass = $module->model_class;
-        $record = $modelClass::find($this->config['record_id']);
+        $record = $modelClass::find($this->config[ 'record_id' ]);
 
         return view('uccello::widgets.relatedlist', [
             'config' => $this->config,
-            'domain' => ucdomain($this->config['domain']),
+            'domain' => ucdomain($this->config[ 'domain' ]),
             'module' => $module,
-            'data' => (object) $this->config['data'],
+            'data' => (object)$this->config[ 'data' ],
             'record' => $record,
-            'label' => $this->config['data']->label ?? $this->config['labelForTranslation'],
+            'label' => $this->config[ 'data' ]->label ?? $this->config[ 'labelForTranslation' ],
         ]);
     }
 }