Fixes #4926

zendframework · Feb 15, 2014 · 4e6f7a5 · kkamkou · Feb 16, 2014 · samsonasik
1 parent fdaa70a
commit 4e6f7a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/library/Zend/Db/Sql/Insert.php b/library/Zend/Db/Sql/Insert.php
@@ -91,7 +91,7 @@ public function columns(array $columns)
      */
     public function values(array $values, $flag = self::VALUES_SET)
     {
-        if ($values == null) {
+        if (!is_array($values)) {
             throw new Exception\InvalidArgumentException('values() expects an array of values');
         }
 

diff --git a/tests/ZendTest/Db/Sql/InsertTest.php b/tests/ZendTest/Db/Sql/InsertTest.php
@@ -72,6 +72,15 @@ public function testValues()
         $this->assertEquals(array('bax'), $this->readAttribute($this->insert, 'values'));
     }
 
+    /**
+     * @covers Zend\Db\Sql\Insert::values
+     * @group ZF2-4926
+     */
+    public function testEmptyArrayValues()
+    {
+        $this->insert->values(array());
+        $this->assertEquals(array(), $this->readAttribute($this->insert, 'columns'));
+    }
 
     /**
      * @covers Zend\Db\Sql\Insert::prepareStatement