Merge pull request #29 from HillTravis/patch-1

Allow null $parameters in Predicate::expression()
zendframework · Sep 22, 2015 · a2337a4 · a2337a4
2 parents c2b54ad + 51863b7
commit a2337a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Sql/Predicate/Predicate.php b/src/Sql/Predicate/Predicate.php
@@ -242,7 +242,7 @@ public function notLike($identifier, $notLike)
      * @param $parameters
      * @return $this
      */
-    public function expression($expression, $parameters)
+    public function expression($expression, $parameters = null)
     {
         $this->addPredicate(
             new Expression($expression, $parameters),

diff --git a/test/Sql/Predicate/PredicateTest.php b/test/Sql/Predicate/PredicateTest.php
@@ -228,6 +228,19 @@ public function testExpression()
             $predicate->getExpressionData()
         );
     }
+
+    /**
+     * @testdox Unit test: Test expression() allows null $parameters
+     */
+    public function testExpressionNullParameters()
+    {
+        $predicate = new Predicate;
+
+        $predicate->expression('foo = bar');
+        $predicates = $predicate->getPredicates();
+        $expression = $predicates[0][1];
+        $this->assertEquals([null], $expression->getParameters());
+    }
 
     /**
      * @testdox Unit test: Test literal() is chainable, returns proper values, and is backwards compatible with 2.0.*