Removed duplicate logic from NotEmpty constructor, made array_search strict

Author: AndrolGenhald

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

@@ -100,19 +100,8 @@ public function __construct($options = null)
         }
 
         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 (($type = $this->calculateTypeValue($options)) != 0) {
+                $options['type'] = $type;
             }
         }
 
@@ -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

@@ -40,6 +40,18 @@ public function testConstructorWithTypeArray()
             'boolean'
         ]);
         $this->assertEquals(NotEmpty::BOOLEAN, $validator->getType());
+
+        $validator = new NotEmpty([
+            NotEmpty::PHP,
+            NotEmpty::BOOLEAN
+        ]);
+        $this->assertEquals(NotEmpty::PHP, $validator->getType());
+
+        $validator = new NotEmpty([
+            NotEmpty::BOOLEAN,
+            NotEmpty::BOOLEAN
+        ]);
+        $this->assertEquals(NotEmpty::BOOLEAN, $validator->getType());
     }
 
     /**