- Raised PHP min version to 7.0

- Various minor changes

Author: rkrx

.travis.yml

@@ -6,7 +6,6 @@ php:
   - 7.2
   - 7.1
   - 7.0
-  - 5.6
 
 services:
   - mysql

README.md

@@ -1,4 +1,4 @@
-mysql query builder (php 5.6+)
+mysql query builder (php 7.0+)
 ==============================
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/a57881f2-af75-48b7-9f5f-e821cdb75d0c/mini.png)](https://insight.sensiolabs.com/projects/a57881f2-af75-48b7-9f5f-e821cdb75d0c)

composer.json

@@ -7,14 +7,16 @@
 		"email": "[email protected]"
 	}],
 	"require": {
-		"php": ">= 5.6",
+		"php": ">= 7.0",
 		"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.*"
 	},
 	"autoload": {

src/Builder/DBExpr.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Kir\MySQL\Builder;
 
 class DBExpr {

src/Builder/Delete.php

@@ -41,7 +41,7 @@ public function from($alias, $table = null) {
 	 */
 	public function __toString() {
 		$query = "DELETE ";
-		$query .= join(', ', $this->aliases);
+		$query .= implode(', ', $this->aliases);
 		$query = trim($query) . " FROM\n";
 		$query = $this->buildTables($query);
 		$query = $this->buildJoins($query);

src/Builder/Expr/DBExprFilter.php

@@ -36,7 +36,7 @@ public function __construct($expression, array $data, $keyPath, $validator = nul
 			};
 		}
 		if($validationResultHandler === null) {
-			$validationResultHandler = function () {};
+			$validationResultHandler = static function () {};
 		}
 		$this->validator = $validator;
 		$this->validationResultHandler = $validationResultHandler;
@@ -56,7 +56,7 @@ public function isValid() {
 		$result = call_user_func($this->validator, $this->value);
 		call_user_func($this->validationResultHandler, $result, [
 			'value' => $this->value,
-			'key' => join('.', $this->keyPath),
+			'key' => implode('.', $this->keyPath),
 		]);
 		return $result;
 	}
@@ -107,8 +107,8 @@ private function recursiveGet($array, $path, $default) {
 		if (!$count) {
 			return $default;
 		}
-		for($idx = 0; $idx < $count; $idx++) {
-			$part = $path[$idx];
+		foreach($path as $idxValue) {
+			$part = $idxValue;
 			if(!array_key_exists($part, $array)) {
 				return $default;
 			}

src/Builder/Expr/OptionalDBFilterMap.php

@@ -8,7 +8,7 @@ class OptionalDBFilterMap {
 	/**
 	 * @param array $map
 	 */
-	public function __construct(array $map) {
+	final public function __construct(array $map) {
 		$this->map = $map;
 	}
 
@@ -20,6 +20,13 @@ public static function from(array $map) {
 		return new static($map);
 	}
 
+	/**
+	 * @return array
+	 */
+	protected function getMap(): array {
+		return $this->map;
+	}
+
 	/**
 	 * @param string $expression
 	 * @param string|string[] $keyPath

src/Builder/Expr/RequiredDBFilterMap.php

@@ -8,7 +8,7 @@ class RequiredDBFilterMap {
 	/**
 	 * @param array $map
 	 */
-	public function __construct(array $map) {
+	final public function __construct(array $map) {
 		$this->map = $map;
 	}
 
@@ -20,14 +20,21 @@ public static function from(array $map) {
 		return new static($map);
 	}
 
+	/**
+	 * @return array
+	 */
+	protected function getMap(): array {
+		return $this->map;
+	}
+
 	/**
 	 * @param string $expression
 	 * @param string|string[] $keyPath
 	 * @param callable|null $validator
 	 * @return DBExprFilter
 	 */
 	public function __invoke($expression, $keyPath, $validator = null) {
-		return new DBExprFilter($expression, $this->map, $keyPath, $validator, function ($result, array $data) {
+		return new DBExprFilter($expression, $this->map, $keyPath, $validator, static function ($result, array $data) {
 			if(!$result) {
 				throw new RequiredValueNotFoundException(sprintf("Required value %s not found", $data['key']));
 			}

src/Builder/Insert.php

@@ -11,13 +11,13 @@ class Insert extends InsertUpdateStatement {
 	/** @var array */
 	private $update = [];
 	/** @var string */
-	private $table = null;
+	private $table;
 	/** @var string */
-	private $keyField = null;
+	private $keyField;
 	/** @var bool */
 	private $ignore = false;
 	/** @var Select */
-	private $from = null;
+	private $from;
 
 	/**
 	 * @param string $table
@@ -107,7 +107,7 @@ public function updateExpr($str, ...$args) {
 		}
 		return $this;
 	}
-	
+
 	/**
 	 * @param string $expr
 	 * @param mixed ...$args
@@ -189,25 +189,23 @@ public function __toString() {
 
 		if($this->from !== null) {
 			$fields = $this->from->getFields();
-			$queryArr[] = sprintf("\t(%s)\n", join(', ', array_keys($fields)));
+			$queryArr[] = sprintf("\t(%s)\n", implode(', ', array_keys($fields)));
 			$queryArr[] = $this->from;
 		} else {
 			$fields = $this->fields;
 			$insertData = $this->buildFieldList($fields);
 			if (!count($insertData)) {
 				throw new RuntimeException('No field-data found');
 			}
-			$queryArr[] = sprintf("SET\n%s\n", join(",\n", $insertData));
+			$queryArr[] = sprintf("SET\n%s\n", implode(",\n", $insertData));
 		}
 
 		$updateData = $this->buildUpdate();
 		if($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
 
-		$query = join('', $queryArr);
-
-		return $query;
+		return implode('', $queryArr);
 	}
 
 	/**
@@ -246,7 +244,7 @@ private function addAllTo(array $data, array $mask = null, array $excludeFields
 		}
 		$data = $this->clearValues($data);
 		foreach ($data as $field => $value) {
-			call_user_func($fn, $field, $value);
+			$fn($field, $value);
 		}
 		return $this;
 	}
@@ -264,9 +262,9 @@ private function buildUpdate() {
 			}
 			$updateArr = $this->buildFieldList($this->update, $updateArr);
 
-			$queryArr[] = join(",\n", $updateArr);
+			$queryArr[] = implode(",\n", $updateArr);
 		}
-		return join('', $queryArr);
+		return implode('', $queryArr);
 	}
 
 	/**

src/Builder/InsertUpdateStatement.php

@@ -5,7 +5,7 @@
 
 abstract class InsertUpdateStatement extends Statement {
 	/** @var array */
-	private $mask = null;
+	private $mask;
 
 	/**
 	 * @return array|null