- Updated php-version constraint from 7.0 to 7.1

- Fixed compatibility issues with php 8.0
- Upgraded phpunit base version to 6.0

Author: rkrx

.gitignore

@@ -8,5 +8,6 @@
 !/.travis.yml
 !/.scrutinizer.yml
 !/composer.json
+!/composer-nodev.json
 !/README.md
 !/tests.xml

.travis.yml

@@ -1,18 +1,29 @@
 language: php
 
 php:
+  - nightly
   - 7.4
   - 7.3
   - 7.2
   - 7.1
-  - 7.0
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: nightly
 
 services:
   - mysql
 
-before_script:
-  - composer self-update
-  - composer update
+install:
+  - |
+      # Install PHPUnit v9 on PHP 8
+      if dpkg --compare-versions "${TRAVIS_PHP_VERSION}" ge 8.0; then
+          travis_retry composer require --no-interaction --prefer-dist --dev --ignore-platform-reqs "phpunit/phpunit" 9.*
+      # Enable test on PHP 7.1+
+      else
+          travis_retry composer install --no-interaction --prefer-dist
+      fi
 
 script:
   - composer run-script phpunit

composer.json

@@ -8,17 +8,15 @@
 		"email": "[email protected]"
 	}],
 	"require": {
-		"php": ">= 7.0",
+		"php": ">= 7.1",
 		"ext-pdo": "*",
 		"ext-spl": "*",
 		"ext-ctype": "*",
 		"psr/log": "~1"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~5.0",
-		"phake/phake": "1.0.5",
-		"phpstan/phpstan": "*@stable",
-		"rkr/fakepdo": "0.1.*"
+		"phpunit/phpunit": "~6",
+		"phpstan/phpstan": "*@stable"
 	},
 	"autoload": {
 		"psr-4": {
@@ -36,7 +34,7 @@
 	},
 	"config": {
 		"platform": {
-			"php": "7.0.32"
+			"php": "7.1.10"
 		}
 	}
 }

src/Builder/Traits/ConditionDefinition.php

@@ -0,0 +1,39 @@
+<?php
+namespace Kir\MySQL\Builder\Traits;
+
+use Closure;
+use Kir\MySQL\Builder\Expr\OptionalExpression;
+
+trait ConditionDefinition {
+	/**
+	 * @param Closure $addFn
+	 * @param string|array|object|OptionalExpression $expression
+	 * @param mixed[] $args
+	 * @return $this
+	 */
+	protected function addCondition(Closure $addFn, $expression, ...$args) {
+		if($expression instanceof OptionalExpression) {
+			if($expression->isValid()) {
+				$addFn($expression->getExpression(), $expression->getValue());
+			}
+		} elseif(is_object($expression)) {
+			$this->addAsArray($addFn, (array) $expression, $args);
+		} elseif(is_array($expression)) {
+			$this->addAsArray($addFn, $expression, $args);
+		} else {
+			$addFn($expression, $args);
+		}
+		return $this;
+	}
+
+	/**
+	 * @param Closure $addFn
+	 * @param array $expression
+	 * @param array $args
+	 */
+	private function addAsArray(Closure $addFn, array $expression, array $args) {
+		if(count($expression) > 0) {
+			$addFn($expression, $args);
+		}
+	}
+}

src/Builder/Traits/HavingBuilder.php

@@ -6,31 +6,19 @@
 
 trait HavingBuilder {
 	use AbstractDB;
+	use ConditionDefinition;
 
-	/** @var array */
+	/** @var array[] */
 	private $having = [];
 
 	/**
-	 * @param string|array|OptionalExpression $expression
-	 * @param array<int, mixed> $args
+	 * @param string|array|object|OptionalExpression $expression
+	 * @param mixed[] $args
 	 * @return $this
 	 */
 	public function having($expression, ...$args) {
-		if($expression instanceof OptionalExpression) {
-			if($expression->isValid()) {
-				$this->having[] = [$expression->getExpression(), $expression->getValue()];
-			}
-		} elseif(is_array($expression) || is_object($expression)) {
-			if(is_object($expression)) {
-				$expression = (array) $expression;
-			}
-			if(count($expression) > 0) {
-				$this->having[] = [$expression, array_slice(func_get_args(), 1)];
-			}
-		} else {
-			$this->having[] = [$expression, array_slice(func_get_args(), 1)];
-		}
-		return $this;
+		$fn = function (...$args) { $this->having[] = $args; };
+		return $this->addCondition($fn, $expression, ...$args);
 	}
 
 	/**

src/Builder/Traits/WhereBuilder.php

@@ -1,14 +1,14 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
-use Kir\MySQL\Builder\DBExpr;
 use Kir\MySQL\Builder\Expr\OptionalExpression;
 use Kir\MySQL\Builder\Internal\ConditionBuilder;
 
 trait WhereBuilder {
 	use AbstractDB;
+	use ConditionDefinition;
 
-	/** @var array<int, mixed> */
+	/** @var array[] */
 	private $where = [];
 
 	/**
@@ -17,21 +17,8 @@ trait WhereBuilder {
 	 * @return $this
 	 */
 	public function where($expression, ...$args) {
-		if($expression instanceof OptionalExpression) {
-			if($expression->isValid()) {
-				$this->where[] = [$expression->getExpression(), $expression->getValue()];
-			}
-		} elseif(is_array($expression) || is_object($expression)) {
-			if(is_object($expression)) {
-				$expression = (array) $expression;
-			}
-			if(count($expression) > 0) {
-				$this->where[] = [$expression, $args];
-			}
-		} else {
-			$this->where[] = [$expression, $args];
-		}
-		return $this;
+		$fn = function (...$args) { $this->where[] = $args; };
+		return $this->addCondition($fn, $expression, ...$args);
 	}
 
 	/**

tests/Builder/DeleteTest.php

@@ -1,19 +1,19 @@
 <?php
 namespace Kir\MySQL\Builder;
 
-use Kir\MySQL\Builder\DeleteTest\TestDelete;
+use Kir\MySQL\Common\DBTestCase;
 
-class DeleteTest extends \PHPUnit_Framework_TestCase {
+class DeleteTest extends DBTestCase {
 	public function testAlias() {
-		$query = TestDelete::create()
+		$query = $this->delete()
 		->from('t', 'travis#test1')
 		->where('t.a = 1')
 		->asString();
 		self::assertEquals("DELETE t FROM\n\ttravis_test.test1 t\nWHERE\n\t(t.a = 1)\n", $query);
 	}
 
 	public function testMultipleTables() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('t1', 'travis#test1')
 		->from('t2', 'travis#test2')
 		->where('t1.a = 1')
@@ -22,15 +22,15 @@ public function testMultipleTables() {
 	}
 
 	public function testJoins() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('t1', 'travis#test1')
 		->joinInner('t2', 'travis#test2', 't1.id = t2.id')
 		->asString();
 		self::assertEquals("DELETE t1 FROM\n\ttravis_test.test1 t1\nINNER JOIN\n\ttravis_test.test2 t2 ON t1.id = t2.id\n", $sql);
 	}
 
 	public function testWhere() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('travis#test1')
 		->where('field1=?', 1)
 		->where('field2 != field1')
@@ -39,39 +39,39 @@ public function testWhere() {
 	}
 
 	public function testWhereViaArray() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('travis#test1')
 		->where(['field1' => 1, 'field2' => 'aaa'])
 		->asString();
 		self::assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $sql);
 	}
 
 	public function testDBExpr() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('travis#test1')
 		->where('field1=?', new DBExpr('NOW()'))
 		->asString();
 		self::assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(field1=NOW())\n", $sql);
 	}
 
 	public function testOrderBy() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('travis#test1')
 		->orderBy('field1', 'DESC')
 		->asString();
 		self::assertEquals("DELETE FROM\n\ttravis_test.test1\nORDER BY\n\tfield1 DESC\n", $sql);
 	}
 
 	public function testLimit() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('travis#test1')
 		->limit(10)
 		->asString();
 		self::assertEquals("DELETE FROM\n\ttravis_test.test1\nLIMIT\n\t10\n", $sql);
 	}
 
 	public function testOffset() {
-		$sql = TestDelete::create()
+		$sql = $this->delete()
 		->from('travis#test1')
 		->offset(10)
 		->asString();