Backport from origin: label

Author: gabsource

README.md

@@ -220,6 +220,29 @@ BootForm::button('Activate', [ 'data-trigger' => 'foo' ]);
 BootForm::close();
 ```
 
+### Labels
+
+#### Hide Labels
+
+You may hide an element's label by setting the the value to `false`.
+
+```php
+// An input with no label.
+BootForm::text('username', false);
+```
+
+#### Labels with HTML
+
+To include HTML code inside a label:
+
+```php
+// A label with HTML code using array notation
+BootForm::text('username', ['html' => 'Username <span class="required">*</span>']);
+
+// A label with HTML code using HtmlString object
+BootForm::text('username', new Illuminate\Support\HtmlString('Username <span class="required">*</span>'));
+```
+
 ### Help Text
 
 You may pass a `help_text` option to any field to have [Bootstrap Help Text](https://getbootstrap.com/css/#forms-help-text) appended to the rendered form group.

src/BootstrapForm.php

@@ -6,6 +6,7 @@
 use Collective\Html\HtmlBuilder;
 use Illuminate\Contracts\Config\Repository as Config;
 use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 
 class BootstrapForm
@@ -60,6 +61,13 @@ class BootstrapForm
      */
     protected $rightColumnClass;
 
+    /**
+     * The errorbag that is used for validation (multiple forms)
+     *
+     * @var string
+     */
+    protected $errorBag = 'default';
+
     /**
      * Suffix to add to the label string when a field is required
      *
@@ -142,6 +150,10 @@ public function open(array $options = [])
             return $this->model($options);
         }
 
+        if (array_key_exists('errorbag', $options)) {
+            $this->setErrorBag($options['errorbag']);
+        }
+
         return $this->form->open($options);
     }
 
@@ -610,8 +622,17 @@ public function radios(
     public function label($name, $value = null, array $options = [])
     {
         $options = $this->getLabelOptions($options);
+        $escapeHtml = false;
+
+        if (is_array($value) and isset($value['html'])) {
+            $value = $value['html'];
+        } elseif ($value instanceof HtmlString) {
+            $value = $value->toHtml();
+        } else {
+            $escapeHtml = true;
+        }
 
-        return $this->form->label($name, $value, $options);
+        return $this->form->label($name, $value, $options, $escapeHtml);
     }
 
 
@@ -766,11 +787,15 @@ public function select($name, $label = null, $list = [], $selected = null, array
      */
     protected function getLabelTitle($label, $name, $options)
     {
+        if ($label === false) {
+            return null;
+        }
+
         if (is_null($label) && Lang::has("forms.{$name}")) {
             return Lang::get("forms.{$name}");
         }
 
-        $label = $label ?: Str::title($name);
+        $label  = $label ?: str_replace('_', ' ', Str::title($name));
 
         if (isset($options['required'])) {
             $label = sprintf('%s %s', $label, $this->getLabelRequiredMark());
@@ -1049,6 +1074,18 @@ public function setGroupRequiredClass($cssClass)
     }
 
 
+    /**
+     * Set the errorBag used for validation
+     *
+     * @param $errorBag
+     *
+     * @return void
+     */
+    protected function setErrorBag($errorBag)
+    {
+        $this->errorBag = $errorBag;
+    }
+
     /**
      * Flatten arrayed field names to work with the validator, including removing "[]",
      * and converting nested arrays like "foo[bar][baz]" to "foo.bar.baz".
@@ -1096,10 +1133,10 @@ protected function getFieldError($field, $format = '<span class="help-block">:me
             $allErrors = $this->config->get('bootstrap_form.show_all_errors');
 
             if ($allErrors) {
-                return implode('', $this->getErrors()->get($field, $format));
+                return implode('', $this->getErrors()->{$this->errorBag}->get($field, $format));
             }
 
-            return $this->getErrors()->first($field, $format);
+            return $this->getErrors()->{$this->errorBag}->first($field, $format);
         }
     }