diff --git a/src/BootstrapFormBuilder.php b/src/BootstrapFormBuilder.php index 7d1f6f0..71f1635 100644 --- a/src/BootstrapFormBuilder.php +++ b/src/BootstrapFormBuilder.php @@ -18,7 +18,7 @@ class BootstrapFormBuilder extends CollectiveFormBuilder * @param string $name * @param mixed $label * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function openGroup($name, $label = null, $options = array()) { @@ -32,13 +32,13 @@ public function openGroup($name, $label = null, $options = array()) $label = $label ? $this->label($name, $label) : ''; - return 'html->attributes($options).'>'.$label; + return $this->toHtmlString('html->attributes($options).'>'.$label); } /** * Close out the opened form group * - * @return string + * @return \Illuminate\Support\HtmlString */ public function closeGroup() { @@ -46,7 +46,7 @@ public function closeGroup() $errors = $this->getFormattedErrors($name); - return $errors.''; + return $this->toHtmlString($errors.''); } /** @@ -56,7 +56,7 @@ public function closeGroup() * @param string $name * @param string $value * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function input($type, $name, $value = null, $options = array()) { @@ -73,7 +73,7 @@ public function input($type, $name, $value = null, $options = array()) * @param string $selected * @param array $selectAttributes * @param array $optionsAttributes - * @return string + * @return \Illuminate\Support\HtmlString */ public function select( $name, @@ -94,7 +94,7 @@ public function select( * @param string $name * @param string $value * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function plainInput($type, $name, $value = null, $options = array()) { @@ -109,7 +109,7 @@ public function plainInput($type, $name, $value = null, $options = array()) * @param string $selected * @param array $selectAttributes * @param array $optionsAttributes - * @return string + * @return \Illuminate\Support\HtmlString */ public function plainSelect($name, $list = array(), $selected = null, array $selectAttributes = [], array $optionsAttributes = []) { @@ -124,7 +124,7 @@ public function plainSelect($name, $list = array(), $selected = null, array $sel * @param mixed $value * @param bool $checked * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ protected function checkable($type, $name, $value, $checked, $options) { @@ -141,7 +141,7 @@ protected function checkable($type, $name, $value, $checked, $options) * @param mixed $label * @param bool $checked * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function checkbox($name, $value = 1, $label = null, $checked = null, $options = array()) { @@ -160,7 +160,7 @@ public function checkbox($name, $value = 1, $label = null, $checked = null, $opt * @param mixed $label * @param bool $checked * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function radio($name, $value = null, $label = null, $checked = null, $options = array()) { @@ -179,7 +179,7 @@ public function radio($name, $value = null, $label = null, $checked = null, $opt * @param mixed $label * @param bool $checked * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function inlineCheckbox($name, $value = 1, $label = null, $checked = null, $options = array()) { @@ -198,7 +198,7 @@ public function inlineCheckbox($name, $value = 1, $label = null, $checked = null * @param mixed $label * @param bool $checked * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function inlineRadio($name, $value = null, $label = null, $checked = null, $options = array()) { @@ -215,7 +215,7 @@ public function inlineRadio($name, $value = null, $label = null, $checked = null * @param string $name * @param string $value * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function textarea($name, $value = null, $options = array()) { @@ -232,7 +232,7 @@ public function textarea($name, $value = null, $options = array()) * @param string $name * @param string $value * @param array $options - * @return string + * @return \Illuminate\Support\HtmlString */ public function plainTextarea($name, $value = null, $options = array()) { @@ -321,11 +321,11 @@ private function getFormattedErrors($name) * @param mixed $label * @param string $type * @param string $checkAble - * @return string + * @return \Illuminate\Support\HtmlString */ private function wrapCheckable($label, $type, $checkAble) { - return '
'; + return $this->toHtmlString('
'); } /** @@ -334,11 +334,11 @@ private function wrapCheckable($label, $type, $checkAble) * @param mixed $label * @param string $type * @param string $checkAble - * @return string + * @return \Illuminate\Support\HtmlString */ private function wrapInlineCheckable($label, $type, $checkAble) { - return '
'.$checkAble.' '.$label.'
'; + return $this->toHtmlString('
'.$checkAble.' '.$label.'
'); } }