Better type-hinting for methods that take sql statements

Author: rkrx

src/Database.php

@@ -1,10 +1,12 @@
 <?php
 namespace Kir\MySQL;
 
+use JetBrains\PhpStorm\Language;
 use Kir\MySQL\Builder\QueryStatement;
 use Kir\MySQL\Database\DatabaseStatement;
 use Kir\MySQL\Tools\AliasRegistry;
 use Kir\MySQL\Tools\VirtualTables;
+use Stringable;
 
 interface Database {
 	/**
@@ -21,20 +23,30 @@ public function getVirtualTables(): VirtualTables;
 	 * @param string $query
 	 * @return DatabaseStatement
 	 */
-	public function query(string $query);
+	public function query(
+		#[Language('MySQL')]
+		string $query
+	);
 
 	/**
 	 * @param string $query
 	 * @return QueryStatement
 	 */
-	public function prepare(string $query);
+	public function prepare(
+		#[Language('MySQL')]
+		string $query
+	);
 
 	/**
 	 * @param string $query
-	 * @param array<string, mixed> $params
+	 * @param array<string, null|scalar|Stringable|array<null|scalar>> $params
 	 * @return int
 	 */
-	public function exec(string $query, array $params = []): int;
+	public function exec(
+		#[Language('MySQL')]
+		string $query,
+		array $params = []
+	): int;
 
 	/**
 	 * @param string|null $name

src/Databases/MySQL.php

@@ -2,6 +2,7 @@
 namespace Kir\MySQL\Databases;
 
 use DateTimeZone;
+use JetBrains\PhpStorm\Language;
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\DBExpr;
 use Kir\MySQL\Builder\QueryStatement;
@@ -99,7 +100,10 @@ public function getVirtualTables(): VirtualTables {
 	 * @param string $query
 	 * @return QueryStatement
 	 */
-	public function query(string $query) {
+	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);
@@ -111,18 +115,25 @@ public function query(string $query) {
 	 * @param string $query
 	 * @return QueryStatement
 	 */
-	public function prepare(string $query) {
+	public function prepare(
+		#[Language('MySQL')]
+		string $query
+	) {
 		return $this->buildQueryStatement((string) $query, function ($query) {
 			return $this->pdo->prepare($query);
 		});
 	}
 
 	/**
 	 * @param string $query
-	 * @param array<string, mixed> $params
+	 * @param array<string, null|scalar|Stringable|array<null|scalar>> $params
 	 * @return int
 	 */
-	public function exec(string $query, array $params = []): int {
+	public function exec(
+		#[Language('MySQL')]
+		string $query,
+		array $params = []
+	): int {
 		return $this->getQueryLoggers()->logRegion($query, function() use ($query, $params) {
 			return $this->exceptionHandler(function () use ($query, $params) {
 				$stmt = $this->pdo->prepare($query);