Merge pull request #12280 from sergeyklay/clearing_form_elements

Test clearing form
phalcon · Oct 2, 2016 · 3e5eeba · 3e5eeba
2 parents a8f9010 + eb7e345
commit 3e5eeba
Show file tree

Hide file tree

Showing 3 changed files with 263 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Fixed `Phalcon\Db\Dialect\Mysql::describeReferences()` and `Phalcon\Db\Dialect\Postgresql::describeReferences()` to return proper sql
 - Fixed `Phalcon\Db\Column::hasDefault` to return `false` for autoincrement columns [phalcon/phalcon-devtools#853](https://github.com/phalcon/phalcon-devtools/issues/853)
 - Fixed `Phalcon\Db\Dialect\Postgresql::createTable`, `Phalcon\Db\Dialect\Postgresql::addColumn`, `Phalcon\Db\Dialect\Postgresql::modifyColumn` to correct escape default values [#12267](https://github.com/phalcon/cphalcon/issues/12267), [phalcon/phalcon-devtools#859](https://github.com/phalcon/phalcon-devtools/issues/859)
+- Fixed `Phalcon\Forms\Form::bind` to clean form elements [#11978](https://github.com/phalcon/cphalcon/issues/11978), [#12165](https://github.com/phalcon/cphalcon/issues/12165), [#12099](https://github.com/phalcon/cphalcon/issues/12099), [#10044](https://github.com/phalcon/cphalcon/issues/10044)
 
 # [3.0.1](https://github.com/phalcon/cphalcon/releases/tag/v3.0.1) (2016-08-24)
 - Fixed `Phalcon\Cache\Backend\Redis::flush` in order to flush cache correctly

diff --git a/phalcon/forms/form.zep b/phalcon/forms/form.zep
@@ -662,9 +662,28 @@ class Form extends Injectable implements \Countable, \Iterator
 	 */
 	public function clear(var fields = null) -> <Form>
 	{
-		var elements, element;
+		var elements, element, data, field;
+
+		let data = this->_data;
+		if is_null(fields) {
+			let data = [];
+		} else {
+			if typeof fields == "array" {
+				for field in fields {
+					if isset data[field] {
+						unset data[field];
+					}
+				}
+			} else {
+				if isset data[field] {
+					unset data[field];
+				}
+			}
+		}
+
+		let this->_data = data,
+			elements = this->_elements;
 
-		let elements = this->_elements;
 		if typeof elements == "array" {
 			for element in elements {
 				if typeof fields != "array" {

diff --git a/tests/integration/Forms/FormCest.php b/tests/integration/Forms/FormCest.php
@@ -0,0 +1,241 @@
+<?php
+
+namespace Phalcon\Test\Integration\Forms;
+
+use Phalcon\Tag;
+use IntegrationTester;
+use Phalcon\Forms\Form;
+use Phalcon\Validation\Message;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\Email;
+use Phalcon\Forms\Element\Password;
+use Phalcon\Validation\Message\Group;
+use Phalcon\Test\Models\Select as MvcModel;
+use Phalcon\Validation\Validator\PresenceOf;
+use Phalcon\Validation\Validator\StringLength;
+
+/**
+ * \Phalcon\Test\Integration\Forms\FormCest
+ * Tests the \Phalcon\Forms\Form component
+ *
+ * @copyright (c) 2011-2016 Phalcon Team
+ * @link      http://www.phalconphp.com
+ * @author    Andres Gutierrez <[email protected]>
+ * @author    Serghei Iakovlev <[email protected]>
+ * @package   Phalcon\Test\Integration\Forms
+ *
+ * The contents of this file are subject to the New BSD License that is
+ * bundled with this package in the file docs/LICENSE.txt
+ *
+ * If you did not receive a copy of the license and are unable to obtain it
+ * through the world-wide-web, please send an email to [email protected]
+ * so that we can send you a copy immediately.
+ */
+class FormCest
+{
+    /**
+     * Executed before each test
+     *
+     * @param IntegrationTester $I
+     */
+    public function _before(IntegrationTester $I)
+    {
+        Tag::resetInput();
+        Tag::setDocType(Tag::HTML5);
+    }
+
+    /**
+     * Tests clearing the Form Elements
+     *
+     * @issue  12165
+     * @issue  12099
+     * @author Serghei Iakovlev <[email protected]>
+     * @since  2016-10-01
+     * @param  IntegrationTester $I
+     */
+    public function clearFormElements(IntegrationTester $I)
+    {
+        $pass = new Password('passwd');
+        $eml = new Email('email');
+
+        $text = new Text('name');
+        $text->setDefault('Serghei Iakovlev');
+
+        $form = new Form;
+        $form
+            ->add($eml)
+            ->add($text)
+            ->add($pass);
+
+        $I->assertNull($form->get('passwd')->getValue());
+        $I->assertEquals('Serghei Iakovlev', $form->get('name')->getValue());
+
+        $I->assertEquals('<input type="password" id="passwd" name="passwd">', $form->render('passwd'));
+        $I->assertEquals('<input type="email" id="email" name="email">', $form->render('email'));
+        $I->assertEquals('<input type="text" id="name" name="name" value="Serghei Iakovlev">', $form->render('name'));
+
+        $_POST = [
+            'passwd' => 'secret',
+            'name' => 'Andres Gutierrez',
+        ];
+
+        $I->assertEquals('secret', $form->get('passwd')->getValue());
+        $I->assertEquals($pass->getValue(), $form->get('passwd')->getValue());
+        $I->assertEquals('Andres Gutierrez', $form->get('name')->getValue());
+
+        $I->assertEquals('<input type="password" id="passwd" name="passwd" value="secret">', $form->render('passwd'));
+        $I->assertEquals('<input type="text" id="name" name="name" value="Andres Gutierrez">', $form->render('name'));
+
+        Tag::setDefault('email', '[email protected]');
+
+        $I->assertEquals('<input type="email" id="email" name="email" value="[email protected]">', $form->render('email'));
+        $I->assertEquals('[email protected]', $form->get('email')->getValue());
+
+        $pass->clear();
+
+        $I->assertEquals('<input type="password" id="passwd" name="passwd">', $form->render('passwd'));
+        $I->assertNull($pass->getValue());
+        $I->assertEquals($pass->getValue(), $form->get('passwd')->getValue());
+
+        $form->clear();
+
+        $I->assertEquals('Serghei Iakovlev', $form->get('name')->getValue());
+        $I->assertNull($form->get('email')->getValue());
+        $I->assertEquals('<input type="text" id="name" name="name" value="Serghei Iakovlev">', $form->render('name'));
+        $I->assertEquals('<input type="email" id="email" name="email">', $form->render('email'));
+
+        $I->assertEquals(['passwd' => 'secret', 'name' => 'Andres Gutierrez'], $_POST);
+    }
+
+    /**
+     * Tests clearing the Form Elements and using Form::isValid
+     *
+     * @issue  11978
+     * @author Serghei Iakovlev <[email protected]>
+     * @since  2016-10-01
+     * @param  IntegrationTester $I
+     */
+    public function clearFormElementsAndUsingValidation(IntegrationTester $I)
+    {
+        $password = new Password('password', ['placeholder' => 'Insert your Password']);
+
+        $password->addValidators(
+            [
+                new PresenceOf(['message' => 'The field is required', 'cancelOnFail' => true]),
+                new StringLength(['min' => 7, 'messageMinimum' => 'The text is too short']),
+            ]
+        );
+
+        $form = new Form;
+        $form->add($password);
+
+        $I->assertNull($form->get('password')->getValue());
+
+        $input = '<input type="password" id="password" name="password" placeholder="Insert your Password">';
+        $I->assertEquals($input, $form->render('password'));
+
+        $_POST = ['password' => 'secret'];
+
+        $I->assertEquals('secret', $form->get('password')->getValue());
+
+        $input = '<input type="password" id="password" name="password" value="secret" placeholder="Insert your Password">';
+        $I->assertEquals($input, $form->render('password'));
+
+        $I->assertFalse($form->isValid($_POST));
+
+        $actual = $form->getMessages();
+        $expected = Group::__set_state([
+            '_position' => 0,
+            '_messages' => [
+                Message::__set_state([
+                    '_type' => 'TooShort',
+                    '_message' => 'The text is too short',
+                    '_field' => 'password',
+                    '_code' => '0',
+                ])
+            ],
+        ]);
+
+        $I->assertEquals($actual, $expected);
+
+        $form->clear(['password']);
+
+        $I->assertNull($form->get('password')->getValue());
+
+        $input = '<input type="password" id="password" name="password" placeholder="Insert your Password">';
+        $I->assertEquals($input, $form->render('password'));
+
+        $I->assertEquals(['password' => 'secret'], $_POST);
+    }
+
+    /**
+     * Tests clearing the Form Elements by using Form::bind
+     *
+     * @issue  11978
+     * @author Serghei Iakovlev <[email protected]>
+     * @since  2016-10-01
+     * @param  IntegrationTester $I
+     */
+    public function clearFormElementsByUsingFormBind(IntegrationTester $I)
+    {
+        $name = new Text('sel_name');
+        $text = new Text('sel_text');
+
+        $form = new Form;
+        $form
+            ->add($name)
+            ->add($text);
+
+        $entity = new MvcModel;
+
+        $I->assertNull(Tag::getValue('sel_name'));
+        $I->assertNull($form->getValue('sel_name'));
+        $I->assertNull($form->get('sel_name')->getValue());
+        $I->assertNull($name->getValue());
+
+        Tag::setDefault('sel_name', 'Please specify name');
+        $_POST = ['sel_name' => 'Some Name', 'sel_text' => 'Some Text'];
+
+        $form->bind($_POST, $entity);
+
+        $I->assertEquals('Some Name', $entity->getName());
+        $I->assertEquals('Some Text', $entity->getText());
+
+        $I->assertEquals('Some Name', $form->getValue('sel_name'));
+        $I->assertEquals('Some Name', $form->get('sel_name')->getValue());
+        $I->assertEquals('Some Name', $name->getValue());
+
+        $I->assertEquals('Some Text', $form->getValue('sel_text'));
+        $I->assertEquals('Some Text', $form->get('sel_text')->getValue());
+        $I->assertEquals('Some Text', $text->getValue());
+
+        $form->clear(['sel_name']);
+
+        $I->assertNull(Tag::getValue('sel_name'));
+        $I->assertNull($form->getValue('sel_name'));
+        $I->assertNull($form->get('sel_name')->getValue());
+        $I->assertNull($name->getValue());
+
+        $I->assertEquals('Some Text', $form->getValue('sel_text'));
+        $I->assertEquals('Some Text', $form->get('sel_text')->getValue());
+        $I->assertEquals('Some Text', $text->getValue());
+
+        $form->clear(['non_existent', 'another_filed']);
+
+        $I->assertEquals('Some Text', $form->getValue('sel_text'));
+        $I->assertEquals('Some Text', $form->get('sel_text')->getValue());
+        $I->assertEquals('Some Text', $text->getValue());
+
+        $form->clear();
+
+        $I->assertNull(Tag::getValue('sel_text'));
+        $I->assertNull($form->getValue('sel_text'));
+        $I->assertNull($form->get('sel_text')->getValue());
+        $I->assertNull($text->getValue());
+
+        $I->assertEquals('Some Name', $entity->getName());
+        $I->assertEquals('Some Text', $entity->getText());
+
+        $I->assertEquals(['sel_name' => 'Some Name', 'sel_text' => 'Some Text'], $_POST);
+    }
+}