Merge remote-tracking branch 'github/2.0' into github

src/Form/Builder.php

@@ -631,7 +631,7 @@ class Builder
             $this->addHiddenField((new Hidden('_method'))->value('PUT'));
         }
 
-        $this->addHiddenField((new Hidden('_token'))->value(csrf_token()));
+        $this->addHiddenField((new Hidden('_token'))->value((string) csrf_token()));
 
         $this->addRedirectUrlField();
 

src/Form/Field.php

@@ -537,7 +537,7 @@ class Field implements Renderable
      *
      * @param null $value
      *
-     * @return mixed
+     * @return mixed|$this
      */
     public function value($value = null)
     {
@@ -821,7 +821,7 @@ class Field implements Renderable
     public function placeholder($placeholder = null)
     {
         if ($placeholder === null) {
-            return $this->placeholder ?: trans('admin.input').' '.$this->label;
+            return $this->placeholder ?: $this->defaultPlaceholder();
         }
 
         $this->placeholder = $placeholder;
@@ -829,6 +829,14 @@ class Field implements Renderable
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    protected function defaultPlaceholder()
+    {
+        return trans('admin.input').' '.$this->label;
+    }
+
     /**
      * @param mixed $value
      *

src/Form/Field/SelectTable.php

@@ -145,6 +145,14 @@ class SelectTable extends Field
         $this->options = $values;
     }
 
+    /**
+     * @return string
+     */
+    protected function defaultPlaceholder()
+    {
+        return trans('admin.choose').' '.$this->label;
+    }
+
     protected function setUpTable()
     {
         $this->dialog

src/Grid/Column/Condition.php

@@ -70,6 +70,11 @@ class Condition
         }
     }
 
+    public function end()
+    {
+        return $this->column;
+    }
+
     protected function callCallbacks(array $callbacks)
     {
         if (! $callbacks) {