Skip to content

Commit 779abd8

Browse files
ADmadADmad
authored
Merge pull request #414 from FriendsOfCake/task/error-message
Remove uneeded class on error message container
2 parents ae96c70 + 51e8ff3 commit 779abd8

22 files changed

+111
-111
lines changed

‎src/View/Helper/FormHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class FormHelper extends CoreFormHelper
135135
*/
136136
protected array $_templates = [
137137
'error' =>
138-
'<div id="{{id}}" class="ms-0 invalid-feedback">{{content}}</div>',
138+
'<div id="{{id}}" class="invalid-feedback">{{content}}</div>',
139139
'errorTooltip' =>
140140
'<div id="{{id}}" class="invalid-tooltip">{{content}}</div>',
141141
'label' =>

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxControlTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public function testDefaultAlignCheckboxControlWithError()
305305
['label' => ['class' => 'form-check-label', 'for' => 'users']],
306306
'Users',
307307
'/label',
308-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
308+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
309309
'error message',
310310
'/div',
311311
'/div',
@@ -344,7 +344,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelp()
344344
['label' => ['class' => 'form-check-label', 'for' => 'users']],
345345
'Users',
346346
'/label',
347-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
347+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
348348
'error message',
349349
'/div',
350350
['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -391,7 +391,7 @@ public function testDefaultAlignCheckboxControlWithErrorAndHelpAndOptions()
391391
['label' => ['class' => 'form-check-label', 'for' => 'users']],
392392
'Users',
393393
'/label',
394-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
394+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
395395
'error message',
396396
'/div',
397397
['div' => [
@@ -480,7 +480,7 @@ public function testDefaultAlignCheckboxControlContainerOptionsWithError()
480480
['label' => ['class' => 'form-check-label', 'for' => 'users']],
481481
'Users',
482482
'/label',
483-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
483+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
484484
'error message',
485485
'/div',
486486
'/div',
@@ -587,7 +587,7 @@ public function testDefaultAlignCheckboxControlNestedInputWithError()
587587
]],
588588
'Users',
589589
'/label',
590-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
590+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
591591
'error message',
592592
'/div',
593593
'/div',
@@ -871,7 +871,7 @@ public function testDefaultAlignCheckboxControlInlineWithError()
871871
['label' => ['class' => 'form-check-label', 'for' => 'users']],
872872
'Users',
873873
'/label',
874-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
874+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
875875
'error message',
876876
'/div',
877877
'/div',
@@ -955,7 +955,7 @@ public function testDefaultAlignCheckboxControlInlineContainerOptionsWithError()
955955
['label' => ['class' => 'form-check-label', 'for' => 'users']],
956956
'Users',
957957
'/label',
958-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
958+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
959959
'error message',
960960
'/div',
961961
'/div',

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/ColorControlTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public function testDefaultAlignColorControlWithError()
263263
'aria-describedby' => 'color-error',
264264
'value' => '#ffffff',
265265
],
266-
['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
266+
['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
267267
'error message',
268268
'/div',
269269
'/div',
@@ -297,7 +297,7 @@ public function testDefaultAlignColorControlWithErrorAndHelp()
297297
'aria-describedby' => 'color-error color-help',
298298
'value' => '#ffffff',
299299
],
300-
['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
300+
['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
301301
'error message',
302302
'/div',
303303
['div' => ['id' => 'color-help', 'class' => 'form-text']],
@@ -339,7 +339,7 @@ public function testDefaultAlignColorControlWithErrorAndHelpOptions()
339339
'aria-describedby' => 'color-error custom-help',
340340
'value' => '#ffffff',
341341
],
342-
['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
342+
['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
343343
'error message',
344344
'/div',
345345
['div' => [
@@ -420,7 +420,7 @@ public function testDefaultAlignColorControlContainerOptionsWithError()
420420
'aria-describedby' => 'color-error',
421421
'value' => '#ffffff',
422422
],
423-
['div' => ['id' => 'color-error', 'class' => 'ms-0 invalid-feedback']],
423+
['div' => ['id' => 'color-error', 'class' => 'invalid-feedback']],
424424
'error message',
425425
'/div',
426426
'/div',

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/DateTimeControlTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public function testDefaultAlignDateTimeControlWithError()
304304
'aria-describedby' => 'created-error',
305305
'value' => $now->format('Y-m-d H:i:s'),
306306
],
307-
['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
307+
['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
308308
'error message',
309309
'/div',
310310
'/div',
@@ -343,7 +343,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelp()
343343
'aria-describedby' => 'created-error created-help',
344344
'value' => $now->format('Y-m-d H:i:s'),
345345
],
346-
['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
346+
['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
347347
'error message',
348348
'/div',
349349
['div' => ['id' => 'created-help', 'class' => 'form-text']],
@@ -390,7 +390,7 @@ public function testDefaultAlignDateTimeControlWithErrorAndHelpOptions()
390390
'aria-describedby' => 'created-error custom-help',
391391
'value' => $now->format('Y-m-d H:i:s'),
392392
],
393-
['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
393+
['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
394394
'error message',
395395
'/div',
396396
['div' => [
@@ -476,7 +476,7 @@ public function testDefaultAlignDateTimeControlContainerOptionsWithError()
476476
'aria-describedby' => 'created-error',
477477
'value' => $now->format('Y-m-d H:i:s'),
478478
],
479-
['div' => ['id' => 'created-error', 'class' => 'ms-0 invalid-feedback']],
479+
['div' => ['id' => 'created-error', 'class' => 'invalid-feedback']],
480480
'error message',
481481
'/div',
482482
'/div',

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public function testDefaultAlignFileControlWithError()
249249
'aria-invalid' => 'true',
250250
'aria-describedby' => 'file-error',
251251
]],
252-
['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
252+
['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
253253
'error message',
254254
'/div',
255255
'/div',
@@ -281,7 +281,7 @@ public function testDefaultAlignFileControlWithErrorAndHelp()
281281
'aria-invalid' => 'true',
282282
'aria-describedby' => 'file-error file-help',
283283
]],
284-
['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
284+
['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
285285
'error message',
286286
'/div',
287287
['div' => ['id' => 'file-help', 'class' => 'form-text']],
@@ -321,7 +321,7 @@ public function testDefaultAlignFileControlWithErrorAndHelpOptions()
321321
'aria-invalid' => 'true',
322322
'aria-describedby' => 'file-error custom-help',
323323
]],
324-
['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
324+
['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
325325
'error message',
326326
'/div',
327327
['div' => [
@@ -396,7 +396,7 @@ public function testDefaultAlignFileControlContainerOptionsWithError()
396396
'aria-invalid' => 'true',
397397
'aria-describedby' => 'file-error',
398398
]],
399-
['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
399+
['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
400400
'error message',
401401
'/div',
402402
'/div',
@@ -491,7 +491,7 @@ public function testDefaultAlignFileControlInputGroupWithError()
491491
'append',
492492
'/span',
493493
'/div',
494-
['div' => ['id' => 'file-error', 'class' => 'ms-0 invalid-feedback']],
494+
['div' => ['id' => 'file-error', 'class' => 'invalid-feedback']],
495495
'error message',
496496
'/div',
497497
'/div',

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/MultipleCheckboxControlTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ public function testDefaultAlignMultipleCheckboxControlWithError()
468468
'option 2',
469469
'/label',
470470
'/div',
471-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
471+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
472472
'error message',
473473
'/div',
474474
'/div',
@@ -535,7 +535,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelp()
535535
'option 2',
536536
'/label',
537537
'/div',
538-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
538+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
539539
'error message',
540540
'/div',
541541
['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -610,7 +610,7 @@ public function testDefaultAlignMultipleCheckboxControlWithErrorAndHelpOptions()
610610
'option 2',
611611
'/label',
612612
'/div',
613-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
613+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
614614
'error message',
615615
'/div',
616616
['div' => [
@@ -685,7 +685,7 @@ public function testDefaultAlignMultipleCheckboxControlCustomAriaDescribedByWith
685685
'option 2',
686686
'/label',
687687
'/div',
688-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
688+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
689689
'error message',
690690
'/div',
691691
['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -819,7 +819,7 @@ public function testDefaultAlignMultipleCheckboxControlContainerOptionsWithError
819819
'option 2',
820820
'/label',
821821
'/div',
822-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
822+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
823823
'error message',
824824
'/div',
825825
'/div',
@@ -938,7 +938,7 @@ public function testDefaultAlignMultipleCheckboxControlNestedInputWithError()
938938
'option 2',
939939
'/label',
940940
'/div',
941-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
941+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
942942
'error message',
943943
'/div',
944944
'/div',
@@ -1386,7 +1386,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineWithError()
13861386
'option 2',
13871387
'/label',
13881388
'/div',
1389-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
1389+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
13901390
'error message',
13911391
'/div',
13921392
'/div',
@@ -1519,7 +1519,7 @@ public function testDefaultAlignMultipleCheckboxControlInlineContainerOptionsWit
15191519
'option 2',
15201520
'/label',
15211521
'/div',
1522-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
1522+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
15231523
'error message',
15241524
'/div',
15251525
'/div',
@@ -1867,7 +1867,7 @@ public function testDefaultAlignMultipleCheckboxControlOptionGroupsWithError()
18671867
'/label',
18681868
'/div',
18691869
'/fieldset',
1870-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
1870+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
18711871
'error message',
18721872
'/div',
18731873
'/div',

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioControlTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public function testDefaultAlignRadioControlWithError()
457457
'option 2',
458458
'/label',
459459
'/div',
460-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
460+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
461461
'error message',
462462
'/div',
463463
'/div',
@@ -524,7 +524,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelp()
524524
'option 2',
525525
'/label',
526526
'/div',
527-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
527+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
528528
'error message',
529529
'/div',
530530
['div' => ['id' => 'users-help', 'class' => 'form-text']],
@@ -599,7 +599,7 @@ public function testDefaultAlignRadioControlWithErrorAndHelpOptions()
599599
'option 2',
600600
'/label',
601601
'/div',
602-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
602+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
603603
'error message',
604604
'/div',
605605
['div' => [
@@ -739,7 +739,7 @@ public function testDefaultAlignRadioControlContainerOptionsWithError()
739739
'option 2',
740740
'/label',
741741
'/div',
742-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
742+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
743743
'error message',
744744
'/div',
745745
'/div',
@@ -1232,7 +1232,7 @@ public function testDefaultAlignRadioControlInlineWithError()
12321232
'option 2',
12331233
'/label',
12341234
'/div',
1235-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
1235+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
12361236
'error message',
12371237
'/div',
12381238
'/div',
@@ -1367,7 +1367,7 @@ public function testDefaultAlignRadioControlInlineContainerOptionsWithError()
13671367
'option 2',
13681368
'/label',
13691369
'/div',
1370-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
1370+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
13711371
'error message',
13721372
'/div',
13731373
'/div',
@@ -1490,7 +1490,7 @@ public function testDefaultAlignRadioControlInlineNestedInputWithError()
14901490
'option 2',
14911491
'/label',
14921492
'/div',
1493-
['div' => ['id' => 'users-error', 'class' => 'ms-0 invalid-feedback']],
1493+
['div' => ['id' => 'users-error', 'class' => 'invalid-feedback']],
14941494
'error message',
14951495
'/div',
14961496
'/div',

‎tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public function testDefaultAlignRangeControlWithError()
299299
'aria-invalid' => 'true',
300300
'aria-describedby' => 'height-error',
301301
],
302-
['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
302+
['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
303303
'error message',
304304
'/div',
305305
'/div',
@@ -337,7 +337,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelp()
337337
'aria-invalid' => 'true',
338338
'aria-describedby' => 'height-error height-help',
339339
],
340-
['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
340+
['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
341341
'error message',
342342
'/div',
343343
['div' => ['id' => 'height-help', 'class' => 'form-text']],
@@ -383,7 +383,7 @@ public function testDefaultAlignRangeControlWithErrorAndHelpOptions()
383383
'aria-invalid' => 'true',
384384
'aria-describedby' => 'height-error custom-help',
385385
],
386-
['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
386+
['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
387387
'error message',
388388
'/div',
389389
['div' => [
@@ -470,7 +470,7 @@ public function testDefaultAlignRangeControlContainerOptionsWithError()
470470
'aria-invalid' => 'true',
471471
'aria-describedby' => 'height-error',
472472
],
473-
['div' => ['id' => 'height-error', 'class' => 'ms-0 invalid-feedback']],
473+
['div' => ['id' => 'height-error', 'class' => 'invalid-feedback']],
474474
'error message',
475475
'/div',
476476
'/div',

0 commit comments

Comments
 (0)