- Fixed PHPDoc for WHERE and HAVING to clarify the possibility to pass arrays as the first parameter

Author: rkrx

src/Builder/Traits/HavingBuilder.php

@@ -11,7 +11,7 @@ trait HavingBuilder {
 	private $having = array();
 
 	/**
-	 * @param string $expression
+	 * @param string|array $expression
 	 * @param mixed ...$param
 	 * @return $this
 	 */

src/Builder/Traits/WhereBuilder.php

@@ -11,7 +11,7 @@ trait WhereBuilder {
 	private $where = array();
 
 	/**
-	 * @param string $expression
+	 * @param string|array $expression
 	 * @param mixed ...$param
 	 * @return $this
 	 */

tests/Builder/SelectTest.php

@@ -78,7 +78,9 @@ public function testWhere() {
 		->where('a < ?', 1000)
 		->asString();
 		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n", $str);
+	}
 
+	public function testWhereAsArray() {
 		$str = TestSelect::create()
 		->field('a')
 		->from('t', 'test')
@@ -331,11 +333,12 @@ public function testRequiredExpression() {
 
 	public function testSortSpecification() {
 		$query = TestSelect::create()
-		->field('t.field')
+		->field('t.field1')
+		->field('t.field2')
 		->from('t', 'test')
-		->orderBy(new DBExprOrderBySpec(['field1', 'field2'], [['field2', 'ASC'], ['field1', 'DESC'], ['field3' => 'ASC']]))
+		->orderBy(new DBExprOrderBySpec(['field1', 'field2' => 'REVERSE(t.field2)'], [['field2', 'ASC'], ['field1', 'DESC'], ['field3' => 'ASC']]))
 		->asString();
 
-		$this->assertEquals("SELECT\n\tt.field\nFROM\n\ttest t\nORDER BY\n\tfield2 ASC,\n\tfield1 DESC\n", $query);
+		$this->assertEquals("SELECT\n\tt.field1,\n\tt.field2\nFROM\n\ttest t\nORDER BY\n\tREVERSE(t.field2) ASC,\n\tfield1 DESC\n", $query);
 	}
 }