Merge branch 'develop'

Promote develop to master, becoming the next stable release.

composer.json

@@ -12,11 +12,17 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.23",
         "zendframework/zend-filter": "self.version",
         "zendframework/zend-validator": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },
+    "require-dev": {
+        "zendframework/zend-servicemanager": "self.version",
+        "fabpot/php-cs-fixer": "1.7.*",
+        "satooshi/php-coveralls": "dev-master",
+        "phpunit/PHPUnit": "~4.0"
+    },
     "suggest": {
         "zendframework/zend-servicemanager": "To support plugin manager support"
     },
@@ -31,10 +37,5 @@
         "psr-4": {
             "ZendTest\\InputFilter\\": "test/"
         }
-    },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/PHPUnit": "~4.0"
     }
 }

src/ArrayInput.php

@@ -56,8 +56,8 @@ public function isValid($context = null)
         foreach ($values as $value) {
             $result = $validator->isValid($value, $context);
             if (!$result) {
-                if ($fallbackValue = $this->getFallbackValue()) {
-                    $this->setValue($fallbackValue);
+                if ($this->hasFallback()) {
+                    $this->setValue($this->getFallbackValue());
                     $result = true;
                 }
                 break;

src/BaseInputFilter.php

@@ -245,7 +245,7 @@ protected function validateInputs(array $inputs, array $data = array())
                 && $input->isRequired()
                 && $input->allowEmpty()
             ) {
-                if(!($input instanceOf EmptyContextInterface && $input->continueIfEmpty())) {
+                if (!($input instanceOf EmptyContextInterface && $input->continueIfEmpty())) {
                     $this->validInputs[$name] = $input;
                     continue;
                 }
@@ -581,6 +581,15 @@ protected function populate()
                 // No value; clear value in this input
                 if ($input instanceof InputFilterInterface) {
                     $input->setData(array());
+                    if ($input instanceof CollectionInputFilter) {
+                        $input->clearValues();
+                        $input->clearRawValues();
+                    }
+                    continue;
+                }
+
+                if ($input instanceof ArrayInput) {
+                    $input->setValue(array());
                     continue;
                 }
 

src/CollectionInputFilter.php

@@ -170,6 +170,12 @@ public function isValid()
             $valid = false;
         }
 
+        if (empty($this->collectionData)) {
+            $this->clearValues();
+            $this->clearRawValues();
+            return $valid;
+        }
+
         $inputs = $this->validationGroup ?: array_keys($this->inputs);
         foreach ($this->collectionData as $key => $data) {
             if (!is_array($data)) {
@@ -267,6 +273,26 @@ public function getRawValues()
         return $this->collectionRawValues;
     }
 
+    /**
+     * Clear collectionValues
+     *
+     * @access public
+     */
+    public function clearValues()
+    {
+        return $this->collectionValues = array();
+    }
+
+    /**
+     * Clear collectionRawValues
+     *
+     * @access public
+     */
+    public function clearRawValues()
+    {
+        return $this->collectionRawValues = array();
+    }
+
     /**
      * {@inheritdoc}
      */

src/Factory.php

@@ -303,6 +303,9 @@ public function createInputFilter($inputFilterSpecification)
             if (isset($inputFilterSpecification['count'])) {
                 $inputFilter->setCount($inputFilterSpecification['count']);
             }
+            if (isset($inputFilterSpecification['required'])) {
+                $inputFilter->setIsRequired($inputFilterSpecification['required']);
+            }
             return $inputFilter;
         }
 

src/Input.php

@@ -70,6 +70,11 @@ class Input implements InputInterface, EmptyContextInterface
      */
     protected $fallbackValue;
 
+    /**
+     * @var bool
+     */
+    protected $hasFallback = false;
+
     public function __construct($name = null)
     {
         $this->name = $name;
@@ -173,6 +178,7 @@ public function setValue($value)
     public function setFallbackValue($value)
     {
         $this->fallbackValue = $value;
+        $this->hasFallback = true;
         return $this;
     }
 
@@ -271,6 +277,20 @@ public function getFallbackValue()
         return $this->fallbackValue;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasFallback()
+    {
+        return $this->hasFallback;
+    }
+
+    public function clearFallbackValue()
+    {
+        $this->hasFallback = false;
+        $this->fallbackValue = null;
+    }
+
     /**
      * @param  InputInterface $input
      * @return Input
@@ -308,8 +328,8 @@ public function isValid($context = null)
         $validator = $this->getValidatorChain();
         $value     = $this->getValue();
         $result    = $validator->isValid($value, $context);
-        if (!$result && $fallbackValue = $this->getFallbackValue()) {
-            $this->setValue($fallbackValue);
+        if (!$result && $this->hasFallback()) {
+            $this->setValue($this->getFallbackValue());
             $result = true;
         }
 
@@ -325,7 +345,7 @@ public function getMessages()
             return (array) $this->errorMessage;
         }
 
-        if ($this->getFallbackValue()) {
+        if ($this->hasFallback()) {
             return array();
         }
 

test/ArrayInputTest.php

@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -186,4 +186,37 @@ public function testDoNotInjectNotEmptyValidatorIfAnywhereInChain()
         $this->assertEquals(2, count($validators));
         $this->assertEquals($notEmptyMock, $validators[1]['instance']);
     }
+
+    public function dataFallbackValue()
+    {
+        return array(
+            array(
+                'fallbackValue' => array()
+            ),
+            array(
+                'fallbackValue' => array(''),
+            ),
+            array(
+                'fallbackValue' => array(null),
+            ),
+            array(
+                'fallbackValue' => array('some value'),
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataFallbackValue
+     */
+    public function testFallbackValue($fallbackValue)
+    {
+        $this->input->setFallbackValue($fallbackValue);
+        $validator = new Validator\Date();
+        $this->input->getValidatorChain()->attach($validator);
+        $this->input->setValue(array('123')); // not a date
+
+        $this->assertTrue($this->input->isValid());
+        $this->assertEmpty($this->input->getMessages());
+        $this->assertSame($fallbackValue, $this->input->getValue());
+    }
 }

test/BaseInputFilterTest.php

@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -865,6 +865,7 @@ public function testAddingExistingInputWillMergeIntoExisting()
 
     /**
      * @group 5270
+     * @requires extension intl
      */
     public function testIsValidWhenValuesSetOnFilters()
     {
@@ -895,4 +896,20 @@ public function testIsValidWhenValuesSetOnFilters()
         $this->assertTrue($filter->get('foo')->isValid(), 'Filtered value is not valid');
         $this->assertTrue($filter->isValid(), 'Input filter did return value from filter');
     }
+
+    /**
+     * @group 5638
+     */
+    public function testPopulateSupportsArrayInputEvenIfDataMissing()
+    {
+        $arrayInput = $this->getMock('Zend\InputFilter\ArrayInput');
+        $arrayInput
+            ->expects($this->once())
+            ->method('setValue')
+            ->with(array());
+
+        $filter = new InputFilter();
+        $filter->add($arrayInput, 'arrayInput');
+        $filter->setData(array('foo' => 'bar'));
+    }
 }