Merge pull request #5 from rolandoisidoro/fix-help-validation

Fix "Help text" and "Validation" on form elements
neilime · Jul 10, 2018 · 09daff8 · 09daff8
2 parents eb2e7a9 + b4835e1
commit 09daff8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/TwbsHelper/Form/View/Helper/FormElement.php b/src/TwbsHelper/Form/View/Helper/FormElement.php
@@ -132,7 +132,7 @@ public function render(ElementInterface $oElement)
             return sprintf(
                 static::$inputGroupFormat,
                 trim($sSpecialClass),
-                $sMarkup
+                $sMarkup . "%s"
             );
         }
 

diff --git a/src/TwbsHelper/Form/View/Helper/FormElementErrors.php b/src/TwbsHelper/Form/View/Helper/FormElementErrors.php
@@ -10,7 +10,17 @@
  */
 class FormElementErrors extends ZendFormElementErrorsViewHelper
 {
+    /**@+
+     * @var string Templates for the open/close/separators for message tags
+     */
+    protected $messageCloseString     = '</div>';
+    protected $messageOpenFormat      = '<div%s>';
+    protected $messageSeparatorString = '<br />';
+
+    /**
+     * @var array Default attributes for the open format tag
+     */
     protected $attributes = [
-        'class' => 'form-text'
+        'class' => 'invalid-feedback'
     ];
 }
diff --git a/src/TwbsHelper/Form/View/Helper/FormRow.php b/src/TwbsHelper/Form/View/Helper/FormRow.php
@@ -33,13 +33,13 @@ class FormRow extends ZendFormRowViewHelper
     /**
      * @var string
      */
-    protected static $helpBlockFormat = '<p class="help-block">%s</p>';
+    protected static $helpBlockFormat = '<small class="form-text text-muted">%s</small>';
 
     /**
      * The class that is added to element that have errors
      * @var string
      */
-    protected $inputErrorClass = '';
+    protected $inputErrorClass = 'is-invalid';
 
     /**
      * @var string
@@ -332,9 +332,13 @@ protected function renderElement(ElementInterface $oElement, $sLabelPosition = n
 
                 // Render errors
                 if ($this->renderErrors) {
-                    $sElementContent .= $this->getElementErrorsHelper()->render($oElement);
+                    $sErrorMessages = $this->getElementErrorsHelper()->render($oElement);
+                } else {
+                    $sErrorMessages = '';
                 }
 
+                $sElementContent = sprintf($sElementContent, $sErrorMessages);
+
                 return $sElementContent;
 
             case Form::LAYOUT_HORIZONTAL: