z-song / laravel-admin

src/helpers.php

Doc Comments +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
      * @param array $replace
      * @param string $locale
      *
-     * @return \Illuminate\Contracts\Translation\Translator|string|array|null
+     * @return string|null
      */
     function admin_trans($key = null, $replace = [], $locale = null)
     {
@@ -188,7 +188,7 @@ 
      * Delete from array by value.
      *
      * @param array $array
-     * @param mixed $value
+     * @param string $value
      */
     function array_delete(&$array, $value)
     {

Spacing +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
      */
     function admin_path($path = '')
     {
-        return ucfirst(config('admin.directory')) . ($path ? DIRECTORY_SEPARATOR . $path : $path);
+        return ucfirst(config('admin.directory')).($path ? DIRECTORY_SEPARATOR . $path : $path);
     }
 }
 
@@ -50,16 +50,16 @@ 
      */
     function admin_base_path($path = '', $basePathFlag = true)
     {
-        $prefix = '/' . trim(config('admin.route.prefix'), '/');
+        $prefix = '/'.trim(config('admin.route.prefix'), '/');
         $prefix = ($prefix == '/') ? '' : $prefix;
 
-        $path = '/' . trim($path, '/');
+        $path = '/'.trim($path, '/');
         $path = ($path == '/') ? '' : $path;
 
-        $basePath = '/' . trim(config('admin.base_path'), '/');
+        $basePath = '/'.trim(config('admin.base_path'), '/');
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        $requestPath = ($basePathFlag !== false ? $basePath : '') . $prefix . $path;
+        $requestPath = ($basePathFlag !== false ? $basePath : '').$prefix.$path;
 
         return ($requestPath == '/') ? '' : $requestPath;
     }
@@ -150,10 +150,10 @@ 
      */
     function admin_asset($path)
     {
-        $basePath = '/' . trim(config('admin.base_path'), '/');
+        $basePath = '/'.trim(config('admin.base_path'), '/');
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        $path = $basePath . '/'. trim($path, '/');
+        $path = $basePath.'/'.trim($path, '/');
 
         return (config('admin.https') || config('admin.secure')) ? secure_asset($path) : asset($path);
     }
@@ -261,15 +261,15 @@ 
     function file_size($bytes)
     {
         if ($bytes >= 1073741824) {
-            $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+            $bytes = number_format($bytes / 1073741824, 2).' GB';
         } elseif ($bytes >= 1048576) {
-            $bytes = number_format($bytes / 1048576, 2) . ' MB';
+            $bytes = number_format($bytes / 1048576, 2).' MB';
         } elseif ($bytes >= 1024) {
-            $bytes = number_format($bytes / 1024, 2) . ' KB';
+            $bytes = number_format($bytes / 1024, 2).' KB';
         } elseif ($bytes > 1) {
-            $bytes = $bytes . ' bytes';
+            $bytes = $bytes.' bytes';
         } elseif ($bytes == 1) {
-            $bytes = $bytes . ' byte';
+            $bytes = $bytes.' byte';
         } else {
             $bytes = '0 bytes';
         }

src/Grid.php

Spacing +6 added lines, -6 removed lines

@@ -363,7 +363,7 @@ 
         $column = new Column($column, $label);
         $column->setGrid($this);
 
-        return tap($column, function ($value) {
+        return tap($column, function($value) {
             $this->columns->push($value);
         });
     }
@@ -427,7 +427,7 @@ 
         $column = new Column($column, $label);
         $column->setGrid($this);
 
-        return tap($column, function ($value) {
+        return tap($column, function($value) {
             $this->columns->prepend($value);
         });
     }
@@ -607,7 +607,7 @@ 
 
         $data = $collection->toArray();
 
-        $this->columns->map(function (Column $column) use (&$data) {
+        $this->columns->map(function(Column $column) use (&$data) {
             $data = $column->fill($data);
 
             $this->columnNames[] = $column->getName();
@@ -627,7 +627,7 @@ 
      */
     protected function buildRows(array $data)
     {
-        $this->rows = collect($data)->map(function ($model, $number) {
+        $this->rows = collect($data)->map(function($model, $number) {
             return new Row($number, $model);
         });
 
@@ -795,10 +795,10 @@ 
             return $this->resourcePath;
         }
 
-        $basePath = '/' . trim(config('admin.base_path'), '/') ;
+        $basePath = '/'.trim(config('admin.base_path'), '/');
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        return $basePath . app('request')->getPathInfo();
+        return $basePath.app('request')->getPathInfo();
     }
 
     /**

src/Grid/Filter.php

Spacing +11 added lines, -11 removed lines

@@ -284,7 +284,7 @@ 
      */
     protected function removeFilterByID($id)
     {
-        $this->filters = array_filter($this->filters, function (AbstractFilter $filter) use ($id) {
+        $this->filters = array_filter($this->filters, function(AbstractFilter $filter) use ($id) {
             return $filter->getId() != $id;
         });
     }
@@ -298,7 +298,7 @@ 
     {
         $inputs = Arr::dot(Input::all());
 
-        $inputs = array_filter($inputs, function ($input) {
+        $inputs = array_filter($inputs, function($input) {
             return $input !== '' && !is_null($input);
         });
 
@@ -326,7 +326,7 @@ 
             }
         }
 
-        return tap(array_filter($conditions), function ($conditions) {
+        return tap(array_filter($conditions), function($conditions) {
             if (!empty($conditions)) {
                 $this->expand();
             }
@@ -344,9 +344,9 @@ 
             return $inputs;
         }
 
-        $inputs = collect($inputs)->filter(function ($input, $key) {
+        $inputs = collect($inputs)->filter(function($input, $key) {
             return Str::startsWith($key, "{$this->name}_");
-        })->mapWithKeys(function ($val, $key) {
+        })->mapWithKeys(function($val, $key) {
             $key = str_replace("{$this->name}_", '', $key);
 
             return [$key => $val];
@@ -416,7 +416,7 @@ 
      */
     public function scope($key, $label = '')
     {
-        return tap(new Scope($key, $label), function (Scope $scope) {
+        return tap(new Scope($key, $label), function(Scope $scope) {
             return $this->scopes->push($scope);
         });
     }
@@ -440,7 +440,7 @@ 
     {
         $key = request(Scope::QUERY_NAME);
 
-        return $this->scopes->first(function ($scope) use ($key) {
+        return $this->scopes->first(function($scope) use ($key) {
             return $scope->key == $key;
         });
     }
@@ -565,9 +565,9 @@ 
 
         $columns->push($pageKey);
 
-        $groupNames = collect($this->filters)->filter(function ($filter) {
+        $groupNames = collect($this->filters)->filter(function($filter) {
             return $filter instanceof Group;
-        })->map(function (AbstractFilter $filter) {
+        })->map(function(AbstractFilter $filter) {
             return "{$filter->getId()}_group";
         });
 
@@ -608,10 +608,10 @@ 
 
         $question = $request->getBaseUrl().$request->getPathInfo() == '/' ? '/?' : '?';
 
-        $basePath =  '/' . trim(config('admin.base_path'), '/');
+        $basePath = '/'.trim(config('admin.base_path'), '/');
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        return $basePath . (count($request->query()) > 0
+        return $basePath.(count($request->query()) > 0
             ? $request->getPathInfo().$question.http_build_query($query)
             : $request->getPathInfo());
     }

src/Middleware/Authenticate.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
         ]);
 
         return collect($excepts)
-            ->map(function ($expect) {
+            ->map(function($expect) {
                 return admin_base_path($expect, false);
-            })->contains(function ($except) use ($request) {
+            })->contains(function($except) use ($request) {
                 if ($except !== '/') {
                     $except = trim($except, '/');
                 }

src/Middleware/Pjax.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
      */
     public static function respond(Response $response)
     {
-        $next = function () use ($response) {
+        $next = function() use ($response) {
             return $response;
         };
 
@@ -139,7 +139,7 @@ 
      */
     protected function decodeUtf8HtmlEntities($html)
     {
-        return preg_replace_callback('/(&#[0-9]+;)/', function ($html) {
+        return preg_replace_callback('/(&#[0-9]+;)/', function($html) {
             return mb_convert_encoding($html[1], 'UTF-8', 'HTML-ENTITIES');
         }, $html);
     }
@@ -152,12 +152,12 @@ 
      */
     protected function setUriHeader(Response $response, Request $request)
     {
-        $basePath = '/' . trim(config('admin.base_path'), '/');
+        $basePath = '/'.trim(config('admin.base_path'), '/');
         $basePath = ($basePath == '/') ? '' : $basePath;
 
         $response->header(
             'X-PJAX-URL',
-            $basePath . $request->getRequestUri()
+            $basePath.$request->getRequestUri()
         );
     }
 }

src/Tree.php

Spacing +3 added lines, -3 removed lines

@@ -88,10 +88,10 @@ 
     {
         $this->model = $model;
 
-        $basePath = '/' . trim(config('admin.base_path'), '/');
+        $basePath = '/'.trim(config('admin.base_path'), '/');
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        $this->path = $basePath . app('request')->getPathInfo();
+        $this->path = $basePath.app('request')->getPathInfo();
         $this->elementId .= uniqid();
 
         $this->setupTools();
@@ -119,7 +119,7 @@ 
     protected function initBranchCallback()
     {
         if (is_null($this->branchCallback)) {
-            $this->branchCallback = function ($branch) {
+            $this->branchCallback = function($branch) {
                 $key = $branch[$this->model->getKeyName()];
                 $title = $branch[$this->model->getTitleColumn()];
 

src/Show.php

Spacing +7 added lines, -7 removed lines

@@ -223,7 +223,7 @@ 
 
         $this->overwriteExistingField($name);
 
-        return tap($field, function ($field) {
+        return tap($field, function($field) {
             $this->fields->push($field);
         });
     }
@@ -245,7 +245,7 @@ 
 
         $this->overwriteExistingRelation($name);
 
-        return tap($relation, function ($relation) {
+        return tap($relation, function($relation) {
             $this->relations->push($relation);
         });
     }
@@ -262,7 +262,7 @@ 
         }
 
         $this->fields = $this->fields->filter(
-            function (Field $field) use ($name) {
+            function(Field $field) use ($name) {
                 return $field->getName() != $name;
             }
         );
@@ -280,7 +280,7 @@ 
         }
 
         $this->relations = $this->relations->filter(
-            function (Relation $relation) use ($name) {
+            function(Relation $relation) use ($name) {
                 return $relation->getName() != $name;
             }
         );
@@ -316,10 +316,10 @@ 
     public function getResourcePath()
     {
         if (empty($this->resource)) {
-            $basePath = trim(config('admin.base_path'), '/') . '/';
+            $basePath = trim(config('admin.base_path'), '/').'/';
             $basePath = ($basePath == '/') ? '' : $basePath;
 
-            $path = $basePath . request()->path();
+            $path = $basePath.request()->path();
 
             $segments = explode('/', $path);
             array_pop($segments);
@@ -340,7 +340,7 @@ 
      */
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
     {
-        collect($this->fields)->each(function ($field) use ($fieldWidth, $labelWidth) {
+        collect($this->fields)->each(function($field) use ($fieldWidth, $labelWidth) {
             $field->each->setWidth($fieldWidth, $labelWidth);
         });
 

src/Controllers/AuthController.php

Spacing +8 added lines, -8 removed lines

@@ -81,10 +81,10 @@ 
 
         $request->session()->invalidate();
 
-        $basePath = trim(config('admin.base_path'), '/') . '/';
+        $basePath = trim(config('admin.base_path'), '/').'/';
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        return redirect($basePath . config('admin.route.prefix'));
+        return redirect($basePath.config('admin.route.prefix'));
     }
 
     /**
@@ -98,7 +98,7 @@ 
     {
         $form = $this->settingForm();
         $form->tools(
-            function (Form\Tools $tools) {
+            function(Form\Tools $tools) {
                 $tools->disableList();
             }
         );
@@ -134,7 +134,7 @@ 
         $form->image('avatar', trans('admin.avatar'));
         $form->password('password', trans('admin.password'))->rules('confirmed|required');
         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
-            ->default(function ($form) {
+            ->default(function($form) {
                 return $form->model()->password;
             });
 
@@ -142,13 +142,13 @@ 
 
         $form->ignore(['password_confirmation']);
 
-        $form->saving(function (Form $form) {
+        $form->saving(function(Form $form) {
             if ($form->password && $form->model()->password != $form->password) {
                 $form->password = bcrypt($form->password);
             }
         });
 
-        $form->saved(function () {
+        $form->saved(function() {
             admin_toastr(trans('admin.update_succeeded'));
 
             return redirect(admin_base_path('auth/setting'));
@@ -178,10 +178,10 @@ 
             return $this->redirectTo();
         }
 
-        $basePath = trim(config('admin.base_path'), '/') . '/';
+        $basePath = trim(config('admin.base_path'), '/').'/';
         $basePath = ($basePath == '/') ? '' : $basePath;
 
-        return property_exists($this, 'redirectTo') ? $this->redirectTo : ($basePath . config('admin.route.prefix'));
+        return property_exists($this, 'redirectTo') ? $this->redirectTo : ($basePath.config('admin.route.prefix'));
     }
 
     /**

src/Form.php

Spacing +10 added lines, -10 removed lines

@@ -305,7 +305,7 @@ 
                 return $ret;
             }
 
-            collect(explode(',', $id))->filter()->each(function ($id) {
+            collect(explode(',', $id))->filter()->each(function($id) {
                 $builder = $this->model()->newQuery();
 
                 if ($this->isSoftDeletes) {
@@ -358,9 +358,9 @@ 
 
         $data = $model->toArray();
 
-        $this->builder->fields()->filter(function ($field) {
+        $this->builder->fields()->filter(function($field) {
             return $field instanceof Field\File;
-        })->each(function (Field\File $file) use ($data) {
+        })->each(function(Field\File $file) use ($data) {
             $file->setOriginal($data);
 
             $file->destroy();
@@ -385,7 +385,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $inserts = $this->prepareInsert($this->updates);
 
             foreach ($inserts as $column => $value) {
@@ -536,7 +536,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $updates = $this->prepareUpdate($this->updates);
 
             foreach ($updates as $column => $value) {
@@ -1016,7 +1016,7 @@ 
     protected function getFieldByColumn($column)
     {
         return $this->builder->fields()->first(
-            function (Field $field) use ($column) {
+            function(Field $field) use ($column) {
                 if (is_array($field->column())) {
                     return in_array($column, $field->column());
                 }
@@ -1037,7 +1037,7 @@ 
 
         $values = $this->model->toArray();
 
-        $this->builder->fields()->each(function (Field $field) use ($values) {
+        $this->builder->fields()->each(function(Field $field) use ($values) {
             $field->setOriginal($values);
         });
     }
@@ -1067,7 +1067,7 @@ 
 
         $data = $this->model->toArray();
 
-        $this->builder->fields()->each(function (Field $field) use ($data) {
+        $this->builder->fields()->each(function(Field $field) use ($data) {
             if (!in_array($field->column(), $this->ignored)) {
                 $field->fill($data);
             }
@@ -1211,7 +1211,7 @@ 
      */
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
     {
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
             /* @var Field $field  */
             $field->setWidth($fieldWidth, $labelWidth);
         });
@@ -1396,7 +1396,7 @@ 
             array_unshift($segments, $basePath);
         }
 
-        return '/' . implode('/', $segments);
+        return '/'.implode('/', $segments);
     }
 
     /**