Merge pull request #414 from FriendsOfCake/task/error-message

Remove uneeded class on error message container
FriendsOfCake · Nov 30, 2024 · 779abd8 · 779abd8
2 parents ae96c70 + 51e8ff3
commit 779abd8
Show file tree

Hide file tree

Showing 22 changed files with 111 additions and 111 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -135,7 +135,7 @@ class FormHelper extends CoreFormHelper
      */
     protected array $_templates = [
         'error' =>
-            '<div id="{{id}}" class="ms-0 invalid-feedback">{{content}}</div>',
+            '<div id="{{id}}" class="invalid-feedback">{{content}}</div>',
         'errorTooltip' =>
             '<div id="{{id}}" class="invalid-tooltip">{{content}}</div>',
         'label' =>

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php
@@ -305,7 +305,7 @@ public function testDefaultAlignCheckboxControlWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -344,7 +344,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelp()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -391,7 +391,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelpAndOptions()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -480,7 +480,7 @@ public function testDefaultAlignCheckboxControlContainerOptionsWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -587,7 +587,7 @@ public function testDefaultAlignCheckboxControlNestedInputWithError()
                     ]],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -871,7 +871,7 @@ public function testDefaultAlignCheckboxControlInlineWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -955,7 +955,7 @@ public function testDefaultAlignCheckboxControlInlineContainerOptionsWithError()
                 ['label' => ['class' => 'form-check-label', 'for' => 'users']],
                     'Users',
                 '/label',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php
@@ -263,7 +263,7 @@ public function testDefaultAlignColorControlWithError()
                     'aria-describedby' => 'color-error',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -297,7 +297,7 @@ public function testDefaultAlignColorControlWithErrorAndHelp()
                     'aria-describedby' => 'color-error color-help',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'color-help', 'class' => 'form-text']],
@@ -339,7 +339,7 @@ public function testDefaultAlignColorControlWithErrorAndHelpOptions()
                     'aria-describedby' => 'color-error custom-help',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -420,7 +420,7 @@ public function testDefaultAlignColorControlContainerOptionsWithError()
                     'aria-describedby' => 'color-error',
                     'value' => '#ffffff',
                 ],
-                ['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php
@@ -304,7 +304,7 @@ public function testDefaultAlignDateTimeControlWithError()
                     'aria-describedby' => 'created-error',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -343,7 +343,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelp()
                     'aria-describedby' => 'created-error created-help',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'created-help', 'class' => 'form-text']],
@@ -390,7 +390,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelpOptions()
                     'aria-describedby' => 'created-error custom-help',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -476,7 +476,7 @@ public function testDefaultAlignDateTimeControlContainerOptionsWithError()
                     'aria-describedby' => 'created-error',
                     'value' => $now->format('Y-m-d H:i:s'),
                 ],
-                ['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php
@@ -249,7 +249,7 @@ public function testDefaultAlignFileControlWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -281,7 +281,7 @@ public function testDefaultAlignFileControlWithErrorAndHelp()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error file-help',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'file-help', 'class' => 'form-text']],
@@ -321,7 +321,7 @@ public function testDefaultAlignFileControlWithErrorAndHelpOptions()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error custom-help',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -396,7 +396,7 @@ public function testDefaultAlignFileControlContainerOptionsWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'file-error',
                 ]],
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -491,7 +491,7 @@ public function testDefaultAlignFileControlInputGroupWithError()
                         'append',
                     '/span',
                 '/div',
-                ['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php
@@ -468,7 +468,7 @@ public function testDefaultAlignMultipleCheckboxControlWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -535,7 +535,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelp()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -610,7 +610,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelpOptions()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -685,7 +685,7 @@ public function testDefaultAlignMultipleCheckboxControlCustomAriaDescribedByWith
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -819,7 +819,7 @@ public function testDefaultAlignMultipleCheckboxControlContainerOptionsWithError
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -938,7 +938,7 @@ public function testDefaultAlignMultipleCheckboxControlNestedInputWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1386,7 +1386,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1519,7 +1519,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineContainerOptionsWit
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1867,7 +1867,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError()
                         '/label',
                     '/div',
                  '/fieldset',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php
@@ -457,7 +457,7 @@ public function testDefaultAlignRadioControlWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -524,7 +524,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelp()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -599,7 +599,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelpOptions()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -739,7 +739,7 @@ public function testDefaultAlignRadioControlContainerOptionsWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1232,7 +1232,7 @@ public function testDefaultAlignRadioControlInlineWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1367,7 +1367,7 @@ public function testDefaultAlignRadioControlInlineContainerOptionsWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -1490,7 +1490,7 @@ public function testDefaultAlignRadioControlInlineNestedInputWithError()
                         'option 2',
                     '/label',
                 '/div',
-                ['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',

diff --git a/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php b/tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php
@@ -299,7 +299,7 @@ public function testDefaultAlignRangeControlWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',
@@ -337,7 +337,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelp()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error height-help',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => ['id' => 'height-help', 'class' => 'form-text']],
@@ -383,7 +383,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelpOptions()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error custom-help',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
                 ['div' => [
@@ -470,7 +470,7 @@ public function testDefaultAlignRangeControlContainerOptionsWithError()
                     'aria-invalid' => 'true',
                     'aria-describedby' => 'height-error',
                 ],
-                ['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
+                ['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
                     'error message',
                 '/div',
             '/div',