Merge pull request #231 from adamoki/patch-1

Correcting validation error
zendframework · Oct 12, 2019 · 7d0cf83 · 7d0cf83
2 parents 1eab945 + 5f28b5a
commit 7d0cf83
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/File/Hash.php b/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;
         }
 

diff --git a/test/File/HashTest.php b/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]);
+    }
 }