z-song / laravel-admin

src/Form/Field/HasMany.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
     {
         return call_user_func_array(
             'array_merge',
-            array_map(function ($u, $v) use ($b, $c) {
+            array_map(function($u, $v) use ($b, $c) {
                 return ["{$b}{$c}{$u}" => $v];
             }, array_keys($a), array_values($a))
         );
@@ -47,7 +47,7 @@ 
 if (!function_exists('Encore\Admin\Form\Field\array_key_clean')) {
     function array_key_clean(array $a)
     {
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
+        $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
             return [str_replace(':', '', $k) => $v];
         }, array_keys($a), array_values($a))) : $a;
 
@@ -151,7 +151,7 @@ 
         $rel = $this->relationName;
         $rules = $attributes = $messages = $newInputs = [];
         // remove all inputs & keys marked as removed
-        $availInput = array_filter(array_map(function ($v) {
+        $availInput = array_filter(array_map(function($v) {
             return $v[NestedForm::REMOVE_FLAG_NAME] ? null : $v;
         }, $input[$rel]));
         $keys = array_keys($availInput);
@@ -178,15 +178,15 @@ 
                 }
             }
 
-            $newColumn = call_user_func_array('array_merge', array_map(function ($u) use ($columns, $rel) {
-                return array_map(function ($k, $v) use ($u, $rel) {
+            $newColumn = call_user_func_array('array_merge', array_map(function($u) use ($columns, $rel) {
+                return array_map(function($k, $v) use ($u, $rel) {
                     //Fix ResetInput Function! A Headache Implementation!
                     return $k ? "{$rel}.{$u}.{$v}:{$k}" : "{$rel}.{$u}.{$v}";
                 }, array_keys($columns), array_values($columns));
             }, $keys));
 
             if ($field instanceof Field\Embeds) {
-                $newRules = array_map(function ($v) use ($availInput, $field) {
+                $newRules = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationRules([$field->column() => $availInput[$k][$c]]);
@@ -195,7 +195,7 @@ 
                 }, $newColumn);
                 $rules = array_clean_merge($rules, array_filter($newRules));
 
-                $newAttributes = array_map(function ($v) use ($availInput, $field) {
+                $newAttributes = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationAttributes([$field->column() => $availInput[$k][$c]]);
@@ -204,7 +204,7 @@ 
                 }, $newColumn);
                 $attributes = array_clean_merge($attributes, array_filter($newAttributes));
 
-                $newInput = array_map(function ($v) use ($availInput, $field) {
+                $newInput = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationInput([$field->column() => $availInput[$k][$c]]);
@@ -213,7 +213,7 @@ 
                 }, $newColumn);
                 $newInputs = array_clean_merge($newInputs, array_filter($newInput, 'strlen', ARRAY_FILTER_USE_KEY));
 
-                $newMessages = array_map(function ($v) use ($availInput, $field) {
+                $newMessages = array_map(function($v) use ($availInput, $field) {
                     list($r, $k, $c) = explode('.', $v);
                     $v = "{$r}.{$k}";
                     $embed = $field->getValidationMessages([$field->column() => $availInput[$k][$c]]);
@@ -223,7 +223,7 @@ 
                 $messages = array_clean_merge($messages, array_filter($newMessages));
             } else {
                 $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
-                $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
+                $newRules = array_map(function($v) use ($fieldRules, $availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
@@ -235,7 +235,7 @@ 
                 }, $newColumn);
                 $rules = array_clean_merge($rules, $newRules);
 
-                $newInput = array_map(function ($v) use ($availInput) {
+                $newInput = array_map(function($v) use ($availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
@@ -251,12 +251,12 @@ 
                 }, $newColumn);
                 $newInputs = array_clean_merge($newInputs, $newInput);
 
-                $newAttributes = array_map(function ($v) use ($field, $availInput) {
+                $newAttributes = array_map(function($v) use ($field, $availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
                             $w = $field->label();
                             //Fix ResetInput Function! A Headache Implementation!
                             $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
@@ -275,12 +275,12 @@ 
             }
 
             if ($field->validationMessages) {
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
+                $newMessages = array_map(function($v) use ($field, $availInput) {
                     list($r, $k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                        return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
+                        return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
                             return array_key_attach_str($field->validationMessages, "{$v}:{$u}");
                         }, array_keys($availInput[$k][$col])));
                     }
@@ -688,7 +688,7 @@ 
         }
 
         /* Build row elements */
-        $template = array_reduce($fields, function ($all, $field) {
+        $template = array_reduce($fields, function($all, $field) {
             $all .= "<td>{$field}</td>";
 
             return $all;

src/Form/Field/Embeds.php

Spacing +13 added lines, -13 removed lines

@@ -11,7 +11,7 @@ 
     {
         return call_user_func_array(
             'array_merge',
-            array_map(function ($u, $v) use ($b, $c) {
+            array_map(function($u, $v) use ($b, $c) {
                 return ["{$b}{$c}{$u}" => $v];
             }, array_keys($a), array_values($a))
         );
@@ -43,7 +43,7 @@ 
 if (!function_exists('array_key_clean')) {
     function array_key_clean(array $a)
     {
-        $a = count($a) ? call_user_func_array('array_merge', array_map(function ($k, $v) {
+        $a = count($a) ? call_user_func_array('array_merge', array_map(function($k, $v) {
             return [str_replace(':', '', $k) => $v];
         }, array_keys($a), array_values($a))) : $a;
 
@@ -156,13 +156,13 @@ 
              *      'extra.end_atend'     => "$label[end_at]"
              * ]
              */
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
             $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules;
-            $newRules = array_map(function ($v) use ($fieldRules, $availInput) {
+            $newRules = array_map(function($v) use ($fieldRules, $availInput) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
@@ -243,17 +243,17 @@ 
              *      'extra.end_atend'     => "$label[end_at]"
              * ]
              */
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
-            $newAttributes = array_map(function ($v) use ($field, $availInput) {
+            $newAttributes = array_map(function($v) use ($field, $availInput) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
                 if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
-                    return call_user_func_array('array_merge', array_map(function ($u) use ($v, $field) {
+                    return call_user_func_array('array_merge', array_map(function($u) use ($v, $field) {
                         $w = $field->label();
                         //Fix ResetInput Function! A Headache Implementation!
                         $w .= is_array($field->column()) ? '['.explode(':', explode('.', $v)[2])[0].']' : '';
@@ -332,12 +332,12 @@ 
              *     'extra.end_atend' => $value
              * ]
              */
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
-            $newInput = array_map(function ($v) use ($availInput) {
+            $newInput = array_map(function($v) use ($availInput) {
                 list($k, $c) = explode('.', $v);
                 //Fix ResetInput Function! A Headache Implementation!
                 $col = explode(':', $c)[0];
@@ -395,20 +395,20 @@ 
                 $availInput[$column] = $availInput[$column] ?: null;
             }
 
-            $newColumn = array_map(function ($k, $v) use ($rel) {
+            $newColumn = array_map(function($k, $v) use ($rel) {
                 //Fix ResetInput Function! A Headache Implementation!
                 return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}";
             }, array_keys($columns), array_values($columns));
 
             if ($field->validationMessages) {
-                $newMessages = array_map(function ($v) use ($field, $availInput) {
+                $newMessages = array_map(function($v) use ($field, $availInput) {
                     list($k, $c) = explode('.', $v);
                     //Fix ResetInput Function! A Headache Implementation!
                     $col = explode(':', $c)[0];
                     if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) {
                         return call_user_func_array(
                             'array_merge',
-                            array_map(function ($u) use (
+                            array_map(function($u) use (
                                 $v,
                                 $field
                             ) {
@@ -495,7 +495,7 @@ 
         //Fix the Bug of Embeds Fields Cannot be used within HasMany
         if ($this->elementName) {
             list($rel, $key, $col) = explode('.', $this->errorKey);
-            $form->fields()->each(function (Field $field) use ($rel, $key, $col) {
+            $form->fields()->each(function(Field $field) use ($rel, $key, $col) {
                 $column = $field->column();
                 $elementName = $elementClass = $errorKey = [];
                 if (is_array($column)) {

src/Form/Field/Select.php

Indentation +7 added lines, -7 removed lines

@@ -203,7 +203,7 @@ 
     {
         $fieldsStr = implode('.', $fields);
         $urlsStr = implode('^', $sourceUrls);
-         $script = <<<EOT
+            $script = <<<EOT
 var fields = '$fieldsStr'.split('.');
 var urls = '$urlsStr'.split('^');
 
@@ -251,7 +251,7 @@ 
      *
      * @return $this
      */
-     public function model($model, $idField = 'id', $textField = 'name')
+        public function model($model, $idField = 'id', $textField = 'name')
     {
         if (
             !class_exists($model)
@@ -341,11 +341,11 @@ 
      *
      * @re tu rn $this
      */
-      public function ajax($url, $idField = 'id', $textField = 'text')
-     {
+        public function ajax($url, $idField = 'id', $textField = 'text')
+        {
         $configs = $this->configs([
-             'allowClear'         => true,
-             'placeholder'        => $this->label,
+                'allowClear'         => true,
+                'placeholder'        => $this->label,
             'minimumInputLength' => 1,
         ]);
 
@@ -408,7 +408,7 @@ 
 
     /**
      * {@inheritdoc}
-      */
+     */
     public function render()
     {
         Admin::js('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/i18n/' . app()->getLocale() . '.js');

Spacing +10 added lines, -10 removed lines

@@ -61,7 +61,7 @@ 
         if (is_callable($options)) {
             $this->options = $options;
         } else {
-            $this->options = (array)$options;
+            $this->options = (array) $options;
         }
 
         return $this;
@@ -118,22 +118,22 @@ 
         return $this;
     }
 
-    private function buildJsJson(array $options,array $functions = ['escapeMarkup','templateResult','templateSelection'])
+    private function buildJsJson(array $options, array $functions = ['escapeMarkup', 'templateResult', 'templateSelection'])
     {
         return implode(
             ",\n",
-            array_map(function ($u, $v) use ($functions) {
+            array_map(function($u, $v) use ($functions) {
                 if (is_string($v)) {
                     return  in_array($u, $functions) ? "{$u}: {$v}" : "{$u}: '{$v}'";
                 }
-                return "{$u}: " . json_encode($v);
+                return "{$u}: ".json_encode($v);
             }, array_keys($options), $options)
         );
     }
 
     private function configs($default = [], $quoted = false)
     {
-        $configs =  array_merge(
+        $configs = array_merge(
             [
             'allowClear'  => true,
             'language' => app()->getLocale(),
@@ -144,7 +144,7 @@ 
             'escapeMarkup' => 'function (markup) {return markup;}',
         ], $default, $this->config);
         $configs = $this->buildJsJson($configs);
-        return $quoted ? '{' . $configs . '}' : $configs;
+        return $quoted ? '{'.$configs.'}' : $configs;
     }
 
     /**
@@ -260,7 +260,7 @@ 
             throw new \InvalidArgumentException("[$model] must be a valid model class");
         }
 
-        $this->options = function ($value) use ($model, $idField, $textField) {
+        $this->options = function($value) use ($model, $idField, $textField) {
             if (empty($value)) {
                 return [];
             }
@@ -295,7 +295,7 @@ 
     protected function loadRemoteOptions($url, $parameters = [], $options = [])
     {
         $ajaxOptions = [
-            'url' => $url . '?' . http_build_query($parameters),
+            'url' => $url.'?'.http_build_query($parameters),
         ];
 
         $configs = $this->configs([
@@ -411,7 +411,7 @@ 
       */
     public function render()
     {
-        Admin::js('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/i18n/' . app()->getLocale() . '.js');
+        Admin::js('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/i18n/'.app()->getLocale().'.js');
         $configs = $this->configs([
             'allowClear'  => true,
             'placeholder' => [
@@ -441,7 +441,7 @@ 
     'groups'  => $this->groups,
 ]);
 
-$this->attribute('data-value', implode(',', (array)$this->value()));
+$this->attribute('data-value', implode(',', (array) $this->value()));
 
 return parent::render();
 }