Merge branch 'hotfix/29' into develop

Forward port #29

Author: weierophinney

src/ArrayInput.php

@@ -31,6 +31,16 @@ public function setValue($value)
         return parent::setValue($value);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function resetValue()
+    {
+        $this->value = [];
+        $this->hasValue = false;
+        return $this;
+    }
+
     /**
      * @return array
      */

src/Input.php

@@ -67,6 +67,13 @@ class Input implements
      */
     protected $value;
 
+    /**
+     * Flag for distinguish when $value contains the value previously set or the default one.
+     *
+     * @var bool
+     */
+    protected $hasValue = false;
+
     /**
      * @var mixed
      */
@@ -163,12 +170,36 @@ public function setValidatorChain(ValidatorChain $validatorChain)
     }
 
     /**
+     * Set the input value.
+     *
+     * If you want to remove/unset the current value use {@link Input::resetValue()}.
+     *
+     * @see Input::getValue() For retrieve the input value.
+     * @see Input::hasValue() For to know if input value was set.
+     * @see Input::resetValue() For reset the input value to the default state.
+     *
      * @param  mixed $value
      * @return Input
      */
     public function setValue($value)
     {
         $this->value = $value;
+        $this->hasValue = true;
+        return $this;
+    }
+
+    /**
+     * Reset input value to the default state.
+     *
+     * @see Input::hasValue() For to know if input value was set.
+     * @see Input::setValue() For set a new value.
+     *
+     * @return Input
+     */
+    public function resetValue()
+    {
+        $this->value = null;
+        $this->hasValue = false;
         return $this;
     }
 
@@ -270,6 +301,22 @@ public function getValue()
         return $filter->filter($this->value);
     }
 
+    /**
+     * Flag for inform if input value was set.
+     *
+     * This flag used for distinguish when {@link Input::getValue()} will return the value previously set or the default.
+     *
+     * @see Input::getValue() For retrieve the input value.
+     * @see Input::setValue() For set a new value.
+     * @see Input::resetValue() For reset the input value to the default state.
+     *
+     * @return bool
+     */
+    public function hasValue()
+    {
+        return $this->hasValue;
+    }
+
     /**
      * @return mixed
      */

test/InputTest.php

@@ -854,4 +854,33 @@ public function testWhenNotRequiredAndNotAllowEmptyAndContinueIfEmptyValidatorsA
         $input->setValue($value);
         $this->{$assertion}($input->isValid());
     }
+
+    /**
+     * @dataProvider emptyValuesProvider
+     */
+    public function testSetValuePutInputInTheDesiredState($value)
+    {
+        $input = $this->input;
+        $this->assertFalse($input->hasValue(), 'Input should not have value by default');
+
+        $input->setValue($value);
+        $this->assertTrue($input->hasValue(), "hasValue() didn't return true when value was set");
+    }
+
+    /**
+     * @dataProvider emptyValuesProvider
+     */
+    public function testResetValueReturnsInputValueToDefaultValue($value)
+    {
+        $input = $this->input;
+        $originalInput = clone $input;
+        $this->assertFalse($input->hasValue(), 'Input should not have value by default');
+
+        $input->setValue($value);
+        $this->assertTrue($input->hasValue(), "hasValue() didn't return true when value was set");
+
+        $return = $input->resetValue();
+        $this->assertSame($input, $return, 'resetValue() must return itself');
+        $this->assertEquals($originalInput, $input, 'Input was not reset to the default value state');
+    }
 }