Merge branch 'hotfix/88'

Close #88
Fixes #87

Author: Xerkus

CHANGELOG.md

@@ -43,6 +43,8 @@ All notable changes to this project will be documented in this file, in reverse
   required, and may lead to runtime failures.
 - [#66](https://github.com/zendframework/zend-validator/pull/66) fixed
   EmailAddress validator applying IDNA conversion to local part 
+- [#88](https://github.com/zendframework/zend-validator/pull/88) fixed NotEmpty
+  validator incorrectly applying types bitmaps
 
 
 ## 2.8.2 - 2017-01-29

doc/book/validators/not-empty.md

@@ -67,7 +67,7 @@ use Zend\Validator\NotEmpty;
 $validator = new NotEmpty(NotEmpty::INTEGER);
 
 // Returns false on 0 or '0'
-$validator = new NotEmpty( NotEmpty::INTEGER + NotEmpty::ZERO);
+$validator = new NotEmpty( NotEmpty::INTEGER | NotEmpty::ZERO);
 
 // Returns false on 0 or '0'
 $validator = new NotEmpty([ NotEmpty::INTEGER, NotEmpty::ZERO ]);

src/NotEmpty.php

@@ -83,8 +83,6 @@ class NotEmpty extends AbstractValidator
      */
     public function __construct($options = null)
     {
-        $this->setType($this->defaultType);
-
         if ($options instanceof Traversable) {
             $options = ArrayUtils::iteratorToArray($options);
         }
@@ -99,20 +97,11 @@ public function __construct($options = null)
             $options = $temp;
         }
 
-        if (is_array($options)) {
-            if (! array_key_exists('type', $options)) {
-                $detected = 0;
-                $found    = false;
-                foreach ($options as $option) {
-                    if (in_array($option, $this->constants, true)) {
-                        $found = true;
-                        $detected += array_search($option, $this->constants);
-                    }
-                }
-
-                if ($found) {
-                    $options['type'] = $detected;
-                }
+        if (!isset($options['type'])) {
+            if (($type = $this->calculateTypeValue($options)) != 0) {
+                $options['type'] = $type;
+            } else {
+                $options['type'] = $this->defaultType;
             }
         }
 
@@ -148,14 +137,14 @@ protected function calculateTypeValue($type)
             foreach ($type as $value) {
                 if (is_int($value)) {
                     $detected |= $value;
-                } elseif (in_array($value, $this->constants)) {
-                    $detected |= array_search($value, $this->constants);
+                } elseif (in_array($value, $this->constants, true)) {
+                    $detected |= array_search($value, $this->constants, true);
                 }
             }
 
             $type = $detected;
-        } elseif (is_string($type) && in_array($type, $this->constants)) {
-            $type = array_search($type, $this->constants);
+        } elseif (is_string($type) && in_array($type, $this->constants, true)) {
+            $type = array_search($type, $this->constants, true);
         }
 
         return $type;

test/NotEmptyTest.php

@@ -27,6 +27,31 @@ public function setUp()
         $this->validator = new NotEmpty();
     }
 
+    /**
+     * Ensures that the validator follows expected behavior
+     *
+     * @param array $types Array of type strings or constants
+     * @param integer $expected Expected value of calculated type
+     *
+     * @return void
+     * @dataProvider constructorWithTypeArrayProvider
+     */
+    public function testConstructorWithTypeArray($types, $expected)
+    {
+        $validator = new NotEmpty($types);
+        $this->assertEquals($expected, $validator->getType());
+    }
+
+    public function constructorWithTypeArrayProvider()
+    {
+        return [
+            [['php', 'boolean'], NotEmpty::PHP],
+            [['boolean', 'boolean'], NotEmpty::BOOLEAN],
+            [[NotEmpty::PHP, NotEmpty::BOOLEAN], NotEmpty::PHP],
+            [[NotEmpty::BOOLEAN, NotEmpty::BOOLEAN], NotEmpty::BOOLEAN],
+        ];
+    }
+
     /**
      * Ensures that the validator follows expected behavior
      *
@@ -729,14 +754,30 @@ public function duplicateStringSettingProvider()
      *
      * @dataProvider singleStringNotationProvider
      */
-    public function testSingleStringNotation($value, $valid)
+    public function testSingleStringConstructorNotation($value, $valid)
     {
         $this->validator = new NotEmpty(
             'boolean'
         );
         $this->checkValidationValue($value, $valid);
     }
 
+    /**
+     * Ensures that the validator follows expected behavior
+     *
+     * @param mixed $value Value to test
+     * @param boolean $valid Expected validity of value
+     *
+     * @return void
+     *
+     * @dataProvider singleStringNotationProvider
+     */
+    public function testSingleStringSetTypeNotation($value, $valid)
+    {
+        $this->validator->setType('boolean');
+        $this->checkValidationValue($value, $valid);
+    }
+
     /**
      * Provides values and their expected validity for boolean empty
      *