Made some php 8.0 specific changes

rkrx · rkrx · commit dca8b55f172c · 2024-04-16T17:54:44.000+02:00
diff --git a/src/Builder/Expr/DBExprFilter.php b/src/Builder/Expr/DBExprFilter.php
@@ -31,9 +31,7 @@ public function __construct(string $expression, array $data, $keyPath, $validato
 		$this->value = RecursiveStructureAccess::recursiveGet($data, $this->keyPath, null);
 		$this->hasValue = is_scalar($this->value) ? trim((string) $this->value) !== '' : !empty($this->value);
 		if($validator === null) {
-			$validator = function() {
-				return true;
-			};
+			$validator = static fn() => true;
 		}
 		$this->validator = $validator;
 		if($validationResultHandler === null) {
diff --git a/src/Builder/Internal/ConditionBuilder.php b/src/Builder/Internal/ConditionBuilder.php
@@ -59,9 +59,7 @@ private static function formatKey(string $key): string {
 			return $key;
 		}
 		$keyParts = explode('.', $key);
-		$fn = static function (string $part) {
-			return "`{$part}`";
-		};
+		$fn = static fn(string $part) => "`{$part}`";
 		$enclosedKeyParts = array_map($fn, $keyParts);
 		return implode('.', $enclosedKeyParts);
 	}
diff --git a/src/Builder/QueryStatement.php b/src/Builder/QueryStatement.php
@@ -101,37 +101,29 @@ public function fetchAll($fetchStyle = PDO::FETCH_ASSOC, $fetchArgument = null,
 	 * @return mixed
 	 */
 	public function fetch($fetchStyle = PDO::FETCH_ASSOC, $cursorOrientation = PDO::FETCH_ORI_NEXT, $cursorOffset = 0) {
-		return $this->exceptionHandler(function() use ($fetchStyle, $cursorOrientation, $cursorOffset) {
-			return $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset);
-		});
+		return $this->exceptionHandler(fn() => $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset));
 	}
 
 	/**
 	 * @param int $columnNo
 	 * @return mixed
 	 */
 	public function fetchColumn($columnNo = 0) {
-		return $this->exceptionHandler(function() use ($columnNo) {
-			return $this->statement->fetchColumn($columnNo);
-		});
+		return $this->exceptionHandler(fn() => $this->statement->fetchColumn($columnNo));
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function closeCursor(): bool {
-		return $this->exceptionHandler(function() {
-			return $this->statement->closeCursor();
-		});
+		return $this->exceptionHandler(fn() => $this->statement->closeCursor());
 	}
 
 	/**
 	 * @return int
 	 */
 	public function columnCount(): int {
-		return $this->exceptionHandler(function() {
-			return $this->statement->columnCount();
-		});
+		return $this->exceptionHandler(fn() => $this->statement->columnCount());
 	}
 
 	/**
diff --git a/src/Builder/RunnableDelete.php b/src/Builder/RunnableDelete.php
@@ -26,13 +26,7 @@ public function run(array $params = []) {
 	public function prepare(): DDLRunnable {
 		return $this->createPreparable(
 			$this->db()->prepare($this),
-			/**
-			 * @param scalar $v
-			 * @return int
-			 */
-			function ($v) {
-				return (int) $v;
-			}
+			fn($v) => (int) $v
 		);
 	}
 }
diff --git a/src/Builder/RunnableInsert.php b/src/Builder/RunnableInsert.php
@@ -42,8 +42,9 @@ public function run(array $params = []): int {
 	 * @return DDLRunnable<int>
 	 */
 	public function prepare(): DDLRunnable {
-		return $this->createPreparable($this->db()->prepare($this), function() {
-			return (int) $this->db()->getLastInsertId();
-		});
+		return $this->createPreparable(
+			$this->db()->prepare($this),
+			fn() => (int) $this->db()->getLastInsertId()
+		);
 	}
 }
diff --git a/src/Builder/RunnableUpdate.php b/src/Builder/RunnableUpdate.php
@@ -26,13 +26,7 @@ public function run(array $params = []): int {
 	public function prepare(): DDLRunnable {
 		return $this->createPreparable(
 			$this->db()->prepare($this),
-			/**
-			 * @param bool|int|float|string $v
-			 * @return int
-			 */
-			function ($v) {
-				return (int) $v;
-			}
+			fn($v) => (int) $v
 		);
 	}
 }
diff --git a/src/Builder/Traits/HavingBuilder.php b/src/Builder/Traits/HavingBuilder.php
@@ -20,7 +20,7 @@ trait HavingBuilder {
 	 * @return $this
 	 */
 	public function having($expression, ...$args) {
-		$fn = function ($expression, $args) { $this->having[] = [$expression, $args]; };
+		$fn = fn($expression, $args) => $this->having[] = [$expression, $args];
 		ConditionAddHelper::addCondition($fn, $expression, $args);
 		return $this;
 	}
diff --git a/src/Builder/Traits/TableNameBuilder.php b/src/Builder/Traits/TableNameBuilder.php
@@ -17,7 +17,7 @@ protected function buildTableName(?string $alias, $name): string {
 		if(is_object($name) && !($name instanceof VirtualTable) && method_exists($name, '__toString')) {
 			$name = (string) $name;
 			$lines = explode("\n", $name);
-			$lines = array_map(static function (string $line) { return "\t{$line}"; }, $lines);
+			$lines = array_map(static fn(string $line) => "\t{$line}", $lines);
 			$name = implode("\n", $lines);
 			$name = '(' . trim(rtrim(trim($name), ';')) . ')';
 		}
diff --git a/src/Builder/Traits/WhereBuilder.php b/src/Builder/Traits/WhereBuilder.php
@@ -20,7 +20,7 @@ trait WhereBuilder {
 	 * @return $this
 	 */
 	public function where($expression, ...$args) {
-		$fn = function ($expression, $args) { $this->where[] = [$expression, $args]; };
+		$fn = fn($expression, $args) => $this->where[] = [$expression, $args];
 		ConditionAddHelper::addCondition($fn, $expression, $args);
 		return $this;
 	}
diff --git a/src/Databases/MySQL.php b/src/Databases/MySQL.php
@@ -104,11 +104,11 @@ public function query(
 		#[Language('MySQL')]
 		string $query
 	) {
-		return $this->getQueryLoggers()->logRegion($query, function() use ($query) {
-			return $this->buildQueryStatement($query, function ($query) {
-				return $this->pdo->query($query);
-			});
-		});
+		return $this->getQueryLoggers()->logRegion($query, fn() =>
+			$this->buildQueryStatement($query, fn($query) =>
+				$this->pdo->query($query)
+			)
+		);
 	}
 
 	/**
@@ -119,9 +119,9 @@ public function prepare(
 		#[Language('MySQL')]
 		string $query
 	) {
-		return $this->buildQueryStatement((string) $query, function ($query) {
-			return $this->pdo->prepare($query);
-		});
+		return $this->buildQueryStatement((string) $query, fn($query) =>
+			$this->pdo->prepare($query)
+		);
 	}
 
 	/**
@@ -134,17 +134,17 @@ public function exec(
 		string $query,
 		array $params = []
 	): int {
-		return $this->getQueryLoggers()->logRegion($query, function() use ($query, $params) {
-			return $this->exceptionHandler(function () use ($query, $params) {
+		return $this->getQueryLoggers()->logRegion($query, fn() =>
+			$this->exceptionHandler(function () use ($query, $params) {
 				$stmt = $this->pdo->prepare($query);
 				$timer = microtime(true);
 				$stmt->execute($params);
 				$this->queryLoggers->log($query, microtime(true) - $timer);
 				$result = $stmt->rowCount();
 				$stmt->closeCursor();
 				return $result;
-			});
-		});
+			})
+		);
 	}
 
 	/**
@@ -165,23 +165,23 @@ public function getTableFields(string $table): array {
 			return $this->tableFields[$fqTable];
 		}
 		$query = "DESCRIBE {$fqTable}";
-		return $this->getQueryLoggers()->logRegion($query, function() use ($query, $fqTable) {
-			return $this->exceptionHandler(function () use ($query, $fqTable) {
+		return $this->getQueryLoggers()->logRegion($query, fn() =>
+			$this->exceptionHandler(function () use ($query, $fqTable) {
 				$stmt = $this->pdo->query($query);
 				try {
 					if($stmt === false) {
 						throw new RuntimeException('Invalid return type');
 					}
 					$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-					$this->tableFields[$fqTable] = array_map(static function ($row) { return $row['Field']; }, $rows ?: []);
+					$this->tableFields[$fqTable] = array_map(static fn($row) => $row['Field'], $rows ?: []);
 					return $this->tableFields[$fqTable];
 				} finally {
 					try {
 						$stmt->closeCursor();
 					} catch (Throwable $e) {}
 				}
-			});
-		});
+			})
+		);
 	}
 
 	/**
diff --git a/src/Databases/MySQL/MySQLRunnableSelect.php b/src/Databases/MySQL/MySQLRunnableSelect.php
@@ -85,18 +85,19 @@ public function fetchRows($callback = null): array {
 	 * @inheritDoc
 	 */
 	public function fetchRowsLazy($callback = null) {
-		$callback = $callback ?? (static function ($row) { return $row; });
+		$callback ??= static fn($row) => $row;
 		yield from $this->fetchLazy($callback, PDO::FETCH_ASSOC);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function fetchRow($callback = null): array {
-		$callback = $callback ?? (static function ($row) { return $row; });
-		return $this->fetch($callback, PDO::FETCH_ASSOC, null, static function ($row) {
-			return ['valid' => is_array($row), 'default' => []];
-		});
+		$callback ??= static fn($row) => $row;
+		return $this->fetch($callback, PDO::FETCH_ASSOC, null, static fn($row) => [
+			'valid' => is_array($row),
+			'default' => []
+		]);
 	}
 
 	/**
@@ -107,7 +108,7 @@ public function fetchObjects(string $className = 'stdClass', $callback = null):
 			$data = $statement->fetchAll(PDO::FETCH_CLASS, $className);
 			if($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
-				$data = array_map(static function ($row) use ($columnDefinitions) { return FieldValueConverter::convertValues($row, $columnDefinitions); }, $data);
+				$data = array_map(static fn($row) => FieldValueConverter::convertValues($row, $columnDefinitions), $data);
 			}
 			if($callback !== null) {
 				return call_user_func(static function ($resultData = []) use ($data, $callback) {
@@ -130,18 +131,19 @@ public function fetchObjects(string $className = 'stdClass', $callback = null):
 	 * @inheritDoc
 	 */
 	public function fetchObjectsLazy($className = null, $callback = null) {
-		$callback = $callback ?? (static function ($row) { return $row; });
+		$callback ??= static fn($row) => $row;
 		yield from $this->fetchLazy($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function fetchObject($className = null, $callback = null) {
-		$callback = $callback ?? (static function ($row) { return $row; });
-		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, static function ($row) {
-			return ['valid' => is_object($row), 'default' => null];
-		});
+		$callback ??= static fn($row) => $row;
+		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, static fn($row) => [
+			'valid' => is_object($row),
+			'default' => null
+		]);
 	}
 
 	/**
@@ -263,7 +265,7 @@ private function fetchAll($callback = null, int $mode = 0, $arg0 = null) {
 			$data = $statement->fetchAll();
 			if($this->preserveTypes) {
 				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
-				$data = array_map(static function ($row) use ($columnDefinitions) { return FieldValueConverter::convertValues($row, $columnDefinitions); }, $data);
+				$data = array_map(static fn($row) => FieldValueConverter::convertValues($row, $columnDefinitions), $data);
 			}
 			if($callback !== null) {
 				return call_user_func(static function ($resultData = []) use ($data, $callback) {
diff --git a/src/Databases/MySQL/MySQLSelect.php b/src/Databases/MySQL/MySQLSelect.php
@@ -61,7 +61,7 @@ public function field($expression, $alias = null) {
 			$expression = rtrim($expression, ';');
 			$expression = trim($expression);
 			$lines = explode("\n", $expression);
-			$lines = array_map(static function($line) { return "\t\t{$line}"; }, $lines);
+			$lines = array_map(static fn($line) => "\t\t{$line}", $lines);
 			$expression = implode("\n", $lines);
 			$expression = sprintf("(\n%s\n\t)", $expression);
 		}

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,7 @@ private static function formatKey(string $key): string {`
`59`	`59`	`return $key;`
`60`	`60`	`}`
`61`	`61`	`$keyParts = explode('.', $key);`
`62`		`- $fn = static function (string $part) {`
`63`		- return "`{$part}`";
`64`		`- };`
	`62`	+ $fn = static fn(string $part) => "`{$part}`";
`65`	`63`	`$enclosedKeyParts = array_map($fn, $keyParts);`
`66`	`64`	`return implode('.', $enclosedKeyParts);`
`67`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,9 @@ public function run(array $params = []): int {`
`42`	`42`	`* @return DDLRunnable<int>`
`43`	`43`	`*/`
`44`	`44`	`public function prepare(): DDLRunnable {`
`45`		`- return $this->createPreparable($this->db()->prepare($this), function() {`
`46`		`- return (int) $this->db()->getLastInsertId();`
`47`		`- });`
	`45`	`+ return $this->createPreparable(`
	`46`	`+ $this->db()->prepare($this),`
	`47`	`+ fn() => (int) $this->db()->getLastInsertId()`
	`48`	`+ );`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ trait HavingBuilder {`
`20`	`20`	`* @return $this`
`21`	`21`	`*/`
`22`	`22`	`public function having($expression, ...$args) {`
`23`		`- $fn = function ($expression, $args) { $this->having[] = [$expression, $args]; };`
	`23`	`+ $fn = fn($expression, $args) => $this->having[] = [$expression, $args];`
`24`	`24`	`ConditionAddHelper::addCondition($fn, $expression, $args);`
`25`	`25`	`return $this;`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected function buildTableName(?string $alias, $name): string {`
`17`	`17`	`if(is_object($name) && !($name instanceof VirtualTable) && method_exists($name, '__toString')) {`
`18`	`18`	`$name = (string) $name;`
`19`	`19`	`$lines = explode("\n", $name);`
`20`		`- $lines = array_map(static function (string $line) { return "\t{$line}"; }, $lines);`
	`20`	`+ $lines = array_map(static fn(string $line) => "\t{$line}", $lines);`
`21`	`21`	`$name = implode("\n", $lines);`
`22`	`22`	`$name = '(' . trim(rtrim(trim($name), ';')) . ')';`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ trait WhereBuilder {`
`20`	`20`	`* @return $this`
`21`	`21`	`*/`
`22`	`22`	`public function where($expression, ...$args) {`
`23`		`- $fn = function ($expression, $args) { $this->where[] = [$expression, $args]; };`
	`23`	`+ $fn = fn($expression, $args) => $this->where[] = [$expression, $args];`
`24`	`24`	`ConditionAddHelper::addCondition($fn, $expression, $args);`
`25`	`25`	`return $this;`
`26`	`26`	`}`