jqh 6 년 전
부모
커밋
dec06d86f0

+ 2 - 2
src/Form.php

@@ -904,7 +904,7 @@ class Form implements Renderable
 
             $value = $this->getDataByColumn($updates, $columns);
 
-            $value = $field->prepareInputValue($value);
+            $value = $field->prepare($value);
 
             if (is_array($columns)) {
                 foreach ($columns as $name => $column) {
@@ -953,7 +953,7 @@ class Form implements Renderable
                 continue;
             }
 
-            $inserts[$column] = $field->prepareInputValue($value);
+            $inserts[$column] = $field->prepare($value);
         }
 
         $prepared = [];

+ 2 - 2
src/Form/EmbeddedForm.php

@@ -178,8 +178,8 @@ class EmbeddedForm
             return in_array($key, (array) $field->column());
         });
 
-        if (method_exists($field, 'prepareInputValue')) {
-            return $field->prepareInputValue($record);
+        if (method_exists($field, 'prepare')) {
+            return $field->prepare($record);
         }
 
         return $record;

+ 2 - 2
src/Form/Field.php

@@ -745,7 +745,7 @@ class Field implements Renderable
      * @param mixed $value
      * @return mixed
      */
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         return $value;
     }
@@ -767,7 +767,7 @@ class Field implements Renderable
      * @param mixed $value
      * @return mixed
      */
-    final public function prepareInputValue($value)
+    final public function prepare($value)
     {
         $value = $this->prepareToSave($value);
 

+ 1 - 1
src/Form/Field/BootstrapFile.php

@@ -100,7 +100,7 @@ class BootstrapFile extends Field
      *
      * @return mixed|string
      */
-    public function prepareToSave($file)
+    protected function prepareToSave($file)
     {
         if (request()->has(static::FILE_DELETE_FLAG)) {
             return $this->destroy();

+ 1 - 1
src/Form/Field/BootstrapImage.php

@@ -67,7 +67,7 @@ class BootstrapImage extends BootstrapFile
      *
      * @return string
      */
-    public function prepareToSave($image)
+    protected function prepareToSave($image)
     {
         if (request()->has(static::FILE_DELETE_FLAG)) {
             return $this->destroy();

+ 1 - 1
src/Form/Field/BootstrapMultipleFile.php

@@ -109,7 +109,7 @@ class BootstrapMultipleFile extends Field
      *
      * @return mixed|string
      */
-    public function prepareToSave($files)
+    protected function prepareToSave($files)
     {
         if (request()->has(static::FILE_DELETE_FLAG)) {
             return $this->destroy(request(static::FILE_DELETE_FLAG));

+ 1 - 1
src/Form/Field/Currency.php

@@ -52,7 +52,7 @@ class Currency extends Text
     /**
      * {@inheritdoc}
      */
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         return (float) $value;
     }

+ 1 - 1
src/Form/Field/Date.php

@@ -15,7 +15,7 @@ class Date extends Text
         return $this;
     }
 
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         if ($value === '') {
             $value = null;

+ 1 - 1
src/Form/Field/DateRange.php

@@ -29,7 +29,7 @@ class DateRange extends Field
         $this->options(['format' => $this->format]);
     }
 
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         if ($value === '') {
             $value = null;

+ 1 - 1
src/Form/Field/Embeds.php

@@ -42,7 +42,7 @@ class Embeds extends Field
      *
      * @return array
      */
-    public function prepareToSave($input)
+    protected function prepareToSave($input)
     {
         $form = $this->buildEmbeddedForm();
 

+ 1 - 1
src/Form/Field/File.php

@@ -101,7 +101,7 @@ class File extends Field
      *
      * @return mixed|string
      */
-    public function prepareToSave($file)
+    protected function prepareToSave($file)
     {
         if (request()->has(static::FILE_DELETE_FLAG)) {
             return $this->destroy();

+ 1 - 1
src/Form/Field/HasMany.php

@@ -306,7 +306,7 @@ class HasMany extends Field
      *
      * @return array
      */
-    public function prepareToSave($input)
+    protected function prepareToSave($input)
     {
         $form = $this->buildNestedForm($this->column, $this->builder);
 

+ 1 - 1
src/Form/Field/KeyValue.php

@@ -94,7 +94,7 @@ class KeyValue extends Field
 JS;
     }
 
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         unset($value[static::DEFAULT_FLAG_NAME]);
 

+ 1 - 1
src/Form/Field/ListField.php

@@ -145,7 +145,7 @@ JS;
     /**
      * {@inheritdoc}
      */
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         unset($value['values'][static::DEFAULT_FLAG_NAME]);
 

+ 1 - 1
src/Form/Field/MultipleFile.php

@@ -34,7 +34,7 @@ class MultipleFile extends File
      * @param string|array $file
      * @return array
      */
-    public function prepareToSave($file)
+    protected function prepareToSave($file)
     {
         if ($path = request(static::FILE_DELETE_FLAG)) {
             $this->deleteFile($path);

+ 1 - 1
src/Form/Field/MultipleImage.php

@@ -33,7 +33,7 @@ class MultipleImage extends Image
      * @param string|array $file
      * @return array
      */
-    public function prepareToSave($file)
+    protected function prepareToSave($file)
     {
         if ($path = request(static::FILE_DELETE_FLAG)) {
             $this->deleteFile($path);

+ 1 - 1
src/Form/Field/MultipleSelect.php

@@ -12,7 +12,7 @@ class MultipleSelect extends Select
         return Helper::array(Arr::get($data, $this->column));
     }
 
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         return Helper::array($value, true);
     }

+ 1 - 1
src/Form/Field/Number.php

@@ -29,7 +29,7 @@ JS;
         return parent::render();
     }
 
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         return (int)$value;
     }

+ 1 - 1
src/Form/Field/SelectResource.php

@@ -146,7 +146,7 @@ class SelectResource extends Field
         }
     }
 
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         if ($this->maxItem == 1) {
             if ($value === null || $value === '') {

+ 1 - 1
src/Form/Field/SwitchField.php

@@ -84,7 +84,7 @@ class SwitchField extends Field
      * @param mixed $value
      * @return int
      */
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         return $value ? 1 : 0;
     }

+ 1 - 1
src/Form/Field/Table.php

@@ -58,7 +58,7 @@ class Table extends HasMany
         return $forms;
     }
 
-    public function prepareToSave($input)
+    protected function prepareToSave($input)
     {
         $form = $this->buildNestedForm($this->column, $this->builder);
         $prepare = $form->prepare($input);

+ 1 - 1
src/Form/Field/Tags.php

@@ -100,7 +100,7 @@ class Tags extends Field
     /**
      * {@inheritdoc}
      */
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         $value = array_filter($value, 'strlen');
 

+ 1 - 1
src/Form/Field/Tree.php

@@ -213,7 +213,7 @@ class Tree extends Field
      * @param string|array $value
      * @return array
      */
-    public function prepareToSave($value)
+    protected function prepareToSave($value)
     {
         return Helper::array($value, true);
     }

+ 2 - 2
src/Form/NestedForm.php

@@ -243,8 +243,8 @@ class NestedForm
                 continue;
             }
 
-            if (method_exists($field, 'prepareInputValue')) {
-                $value = $field->prepareInputValue($value);
+            if (method_exists($field, 'prepare')) {
+                $value = $field->prepare($value);
             }
 
             if (($field instanceof \Dcat\Admin\Form\Field\Hidden) || $value != $field->original()) {