- Allow MySQL::quoteExpression to take less arguments than necessary. If more arguments are required than available, the last given argument is used to fill the remaining placeholders.

Author: rkrx

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 7.2
   - 7.1
   - 7.0
   - 5.6

composer.json

@@ -13,7 +13,7 @@
 		"psr/log": "~1"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~4.0",
+		"phpunit/phpunit": "~5.0",
 		"phake/phake": "1.0.5",
 		"rkr/fakepdo": "0.1.*"
 	},

src/Databases/MySQL.php

@@ -151,13 +151,16 @@ public function getTableFields($table) {
 	 * @return string
 	 */
 	public function quoteExpression($expression, array $arguments = array()) {
-		$func = function () use ($arguments) {
-			static $idx = -1;
-			$idx++;
-			$index = $idx;
+		$index = -1;
+		$func = function () use ($arguments, &$index) {
+			$index++;
 			if(array_key_exists($index, $arguments)) {
 				$argument = $arguments[$index];
 				$value = $this->quote($argument);
+			} elseif(count($arguments) > 0) {
+				$args = $arguments;
+				$value = array_pop($args);
+				$value = $this->quote($value);
 			} else {
 				$value = 'NULL';
 			}

tests/Builder/SelectTest.php

@@ -123,6 +123,16 @@ public function testDBExpr() {
 		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n", $str);
 	}
 
+	public function testDBExprFilter() {
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->where(new DBExprFilter('a=? AND b=?', ['x' => ['y' => 1]], 'x.y'))
+		->having(new DBExprFilter('a=? AND b=?', ['x' => ['y' => 1]], 'x.y'))
+		->asString();
+		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a='1' AND b='1')\nHAVING\n\t(a='1' AND b='1')\n", $str);
+	}
+
 	public function testOrder() {
 		$str = TestSelect::create()
 		->field('a')