Merge branch 'hotfix/231'

Close #231

CHANGELOG.md

@@ -26,6 +26,9 @@ All notable changes to this project will be documented in this file, in reverse
   curly braces in array and string offset access to square brackets
   in order to prevent issues under the upcoming PHP 7.4 release.
 
+- [#231](https://github.com/zendframework/zend-validator/pull/231) fixes validation of input hashes in `Zend\Validator\File\Hash` validator when provided as array.
+  Only string hashes are allowed. If different type is provided `Zend\Validator\Exception\InvalidArgumentException` is thrown.
+
 ## 2.12.0 - 2019-01-30
 
 ### Added

src/File/Hash.php

@@ -117,6 +117,12 @@ public function addHash($options)
         }
 
         foreach ($options as $value) {
+            if (! is_string($value)) {
+                throw new Exception\InvalidArgumentException(sprintf(
+                    'Hash must be a string, %s received',
+                    is_object($value) ? get_class($value) : gettype($value)
+                ));
+            }
             $this->options['hash'][$value] = $algorithm;
         }
 

test/File/HashTest.php

@@ -239,4 +239,18 @@ public function testConstructorCanAcceptAllOptionsAsDiscreteArguments()
         $options = $r->getValue($validator);
         $this->assertSame($algorithm, $options['algorithm']);
     }
+
+    /**
+     * @dataProvider invalidHashTypes
+     *
+     * @param mixed $hash
+     */
+    public function testInvalidHashProvidedInArrayFormat($hash)
+    {
+        $validator = new File\Hash('12345');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Hash must be a string');
+        $validator->addHash([$hash]);
+    }
 }