From 4728586365f58b4d98000942efa135c5dc0b31d8 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 8 Mar 2017 13:15:00 +0100 Subject: [PATCH 1/4] Make error class of div in FormHelper::input configurable --- .../Test/Case/View/Helper/FormHelperTest.php | 66 +++++++++++++++++++ lib/Cake/View/Helper/FormHelper.php | 3 +- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index 7c9f70cc8..bea3fbe3c 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -10734,4 +10734,70 @@ class FormHelperTest extends CakeTestCase { $this->assertAttributeEquals($here, '_lastAction', $this->Form, "_lastAction shouldn't be empty."); } +/** + * Tests the 'errorClass' option when error is returned. + * + * @return void + */ + public function testInputErrorClass() { + $result = $this->Form->input('Contact.field', array( + 'type' => 'text', + 'div' => array('errorClass' => 'has-error'), + 'error' => true + )); + $expected = array( + 'div' => array('class' => 'input text has-error'), + 'label' => array('for' => 'ContactField'), + 'Field', + '/label', + 'input' => array( + 'type' => 'text', 'name' => 'data[Contact][field]', + 'id' => 'ContactField', 'class' => 'form-error' + ), + array('div' => array('class' => 'error')), + 'Badness!', + '/div' + ); + $this->assertTags($result, $expected); + + $result = $this->Form->input('Contact.second', array( + 'type' => 'text', + 'error' => array('attributes' => array('class' => 'error')) + )); + $expected = array( + 'div' => array('class' => 'input text error'), + 'label' => array('for' => 'ContactSecond'), + 'Field', + '/label', + 'input' => array( + 'type' => 'text', 'name' => 'data[Contact][second]', + 'id' => 'ContactSecond', 'class' => 'form-error' + ), + array('div' => array('class' => 'error')), + 'Badness!', + '/div' + ); + $this->assertTags($result, $expected); + + $result = $this->Form->input('Contact.third', array( + 'type' => 'text', + 'div' => array('errorClass' => 'has-error'), + 'error' => array('attributes' => array('class' => 'form-control-feedback')) + )); + $expected = array( + 'div' => array('class' => 'input text has-error'), + 'label' => array('for' => 'ContactThird'), + 'Field', + '/label', + 'input' => array( + 'type' => 'text', 'name' => 'data[Contact][third]', + 'id' => 'ContactThird', 'class' => 'form-error' + ), + array('div' => array('class' => 'form-control-feedback')), + 'Badness!', + '/div' + ); + $this->assertTags($result, $expected); + } + } diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index 0d6dd7dd5..6e5a56482 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -1068,7 +1068,7 @@ class FormHelper extends AppHelper { if ($type !== 'hidden' && $error !== false) { $errMsg = $this->error($fieldName, $error); if ($errMsg) { - $divOptions = $this->addClass($divOptions, 'error'); + $divOptions = $this->addClass($divOptions, Hash::get($divOptions, 'errorClass', 'error')); if ($errorMessage) { $out['error'] = $errMsg; } @@ -1089,6 +1089,7 @@ class FormHelper extends AppHelper { if (!empty($divOptions['tag'])) { $tag = $divOptions['tag']; unset($divOptions['tag']); + unset($divOptions['errorClass']); $output = $this->Html->tag($tag, $output, $divOptions); } return $output; From 708e960968020f5df73ffb6ade7047c0e1eb4ad9 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 8 Mar 2017 13:43:40 +0100 Subject: [PATCH 2/4] Fixed tests --- .../Test/Case/View/Helper/FormHelperTest.php | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index bea3fbe3c..33410f68b 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -10740,10 +10740,12 @@ class FormHelperTest extends CakeTestCase { * @return void */ public function testInputErrorClass() { + $Contact = ClassRegistry::getObject('Contact'); + $Contact->validationErrors['field'] = array('Badness!'); + $result = $this->Form->input('Contact.field', array( 'type' => 'text', - 'div' => array('errorClass' => 'has-error'), - 'error' => true + 'div' => array('errorClass' => 'has-error') )); $expected = array( 'div' => array('class' => 'input text has-error'), @@ -10754,44 +10756,44 @@ class FormHelperTest extends CakeTestCase { 'type' => 'text', 'name' => 'data[Contact][field]', 'id' => 'ContactField', 'class' => 'form-error' ), + array('div' => array('class' => 'error-message')), + 'Badness!', + '/div' + ); + $this->assertTags($result, $expected); + + $result = $this->Form->input('Contact.field', array( + 'type' => 'text', + 'error' => array('attributes' => array('class' => 'error')) + )); + $expected = array( + 'div' => array('class' => 'input text error'), + 'label' => array('for' => 'ContactField'), + 'Field', + '/label', + 'input' => array( + 'type' => 'text', 'name' => 'data[Contact][field]', + 'id' => 'ContactField', 'class' => 'form-error' + ), array('div' => array('class' => 'error')), 'Badness!', '/div' ); $this->assertTags($result, $expected); - $result = $this->Form->input('Contact.second', array( - 'type' => 'text', - 'error' => array('attributes' => array('class' => 'error')) - )); - $expected = array( - 'div' => array('class' => 'input text error'), - 'label' => array('for' => 'ContactSecond'), - 'Field', - '/label', - 'input' => array( - 'type' => 'text', 'name' => 'data[Contact][second]', - 'id' => 'ContactSecond', 'class' => 'form-error' - ), - array('div' => array('class' => 'error')), - 'Badness!', - '/div' - ); - $this->assertTags($result, $expected); - - $result = $this->Form->input('Contact.third', array( + $result = $this->Form->input('Contact.field', array( 'type' => 'text', 'div' => array('errorClass' => 'has-error'), 'error' => array('attributes' => array('class' => 'form-control-feedback')) )); $expected = array( 'div' => array('class' => 'input text has-error'), - 'label' => array('for' => 'ContactThird'), + 'label' => array('for' => 'ContactField'), 'Field', '/label', 'input' => array( - 'type' => 'text', 'name' => 'data[Contact][third]', - 'id' => 'ContactThird', 'class' => 'form-error' + 'type' => 'text', 'name' => 'data[Contact][field]', + 'id' => 'ContactField', 'class' => 'form-error' ), array('div' => array('class' => 'form-control-feedback')), 'Badness!', From c8aefeb4951029ade45dff02fcda950dee326ad5 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 8 Mar 2017 14:16:08 +0100 Subject: [PATCH 3/4] Cs fixes --- lib/Cake/Test/Case/View/Helper/FormHelperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index 33410f68b..2fe621ff8 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -10781,7 +10781,7 @@ class FormHelperTest extends CakeTestCase { ); $this->assertTags($result, $expected); - $result = $this->Form->input('Contact.field', array( + $result = $this->Form->input('Contact.field', array( 'type' => 'text', 'div' => array('errorClass' => 'has-error'), 'error' => array('attributes' => array('class' => 'form-control-feedback')) From 25d597910f7f868e2c483ac13e1007990c793847 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 8 Mar 2017 23:19:37 +0100 Subject: [PATCH 4/4] Code cleanup --- lib/Cake/View/Helper/FormHelper.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index 6e5a56482..810d5a358 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -1088,8 +1088,7 @@ class FormHelper extends AppHelper { if (!empty($divOptions['tag'])) { $tag = $divOptions['tag']; - unset($divOptions['tag']); - unset($divOptions['errorClass']); + unset($divOptions['tag'], $divOptions['errorClass']); $output = $this->Html->tag($tag, $output, $divOptions); } return $output;