Merge 5119680 into 4c68f2c

zendframework · Jul 8, 2019 · c893e49 · c893e49
2 parents 4c68f2c + 5119680
commit c893e49
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/Sql/Expression.php b/src/Sql/Expression.php
@@ -56,7 +56,7 @@ public function __construct($expression = '', $parameters = null, array $types =
             }
         }
 
-        if ($parameters) {
+        if ($parameters !== null) {
             $this->setParameters($parameters);
         }
     }

diff --git a/test/unit/Sql/ExpressionTest.php b/test/unit/Sql/ExpressionTest.php
@@ -10,6 +10,7 @@
 namespace ZendTest\Db\Sql;
 
 use PHPUnit\Framework\TestCase;
+use Zend\Db\Sql\Exception\InvalidArgumentException;
 use Zend\Db\Sql\Expression;
 
 /**
@@ -179,4 +180,34 @@ public function testNumberOfReplacemensConsidersWhenSameVariableIsUsedManyTimes(
         $expression = new Expression('uf.user_id = :user_id OR uf.friend_id = :user_id', ['user_id' => 1]);
         $expression->getExpressionData();
     }
+
+
+    /**
+     * @param mixed $falsyParameter
+     * @dataProvider falsyExpressionParametersProvider
+     */
+    public function testConstructorWithFalsyValidParameters($falsyParameter)
+    {
+        $expression = new Expression('?', $falsyParameter);
+        self::assertSame($falsyParameter, $expression->getParameters());
+    }
+
+    public function testConstructorWithInvalidParameter()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expression parameters must be a scalar or array.');
+        new Expression('?', (object)[]);
+    }
+
+    public function falsyExpressionParametersProvider()
+    {
+        return [
+            [''],
+            ['0'],
+            [0],
+            [0.0],
+            [false],
+            [[]],
+        ];
+    }
 }