Merge pull request #12869 from QoboLtd/query-expression-callable-type…

…hint Add callable typehint to QueryExpression methods and_ & or_
cakephp · Jan 4, 2019 · c8e6f52 · c8e6f52
2 parents eae2679 + b4dc9c9
commit c8e6f52
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
@@ -449,7 +449,7 @@ public function between($field, $from, $to, $type = null)
      * Returns a new QueryExpression object containing all the conditions passed
      * and set up the conjunction to be "AND"
      *
-     * @param string|array|\Cake\Database\ExpressionInterface $conditions to be joined with AND
+     * @param callable|string|array|\Cake\Database\ExpressionInterface $conditions to be joined with AND
      * @param array $types associative array of fields pointing to the type of the
      * values that are being passed. Used for correctly binding values to statements.
      * @return \Cake\Database\Expression\QueryExpression
@@ -467,7 +467,7 @@ public function and_($conditions, $types = [])
      * Returns a new QueryExpression object containing all the conditions passed
      * and set up the conjunction to be "OR"
      *
-     * @param string|array|\Cake\Database\ExpressionInterface $conditions to be joined with OR
+     * @param callable|string|array|\Cake\Database\ExpressionInterface $conditions to be joined with OR
      * @param array $types associative array of fields pointing to the type of the
      * values that are being passed. Used for correctly binding values to statements.
      * @return \Cake\Database\Expression\QueryExpression