fix tests for PHPStan 2.0

schlndh · Sep 20, 2024 · 53e9eaa · 53e9eaa
1 parent 723dfa3
commit 53e9eaa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/tests/PHPStan/Rules/MySQLi/data/MySQLiRuleInvalidDataTest.php b/tests/PHPStan/Rules/MySQLi/data/MySQLiRuleInvalidDataTest.php
@@ -139,7 +139,7 @@ public function testDynamicSql(): void
 		$stmt->execute();
 		$stmt->get_result();
 
-		$stmt = $this->hideValueFromPhpstan(true)
+		$stmt = $this->hideValueFromPhpstan('1')
 			? $db->prepare('SELECT 1')
 			: $db->prepare('SELECT 2, 3');
 		$stmt->execute();
@@ -148,14 +148,14 @@ public function testDynamicSql(): void
 		try {
 			$db->query(
 				'SELECT * FROM missing_table '
-					. ($this->hideValueFromPhpstan(true) ? 'WHERE 1' : ' WHERE 2'),
+					. ($this->hideValueFromPhpstan('1') ? 'WHERE 1' : ' WHERE 2'),
 			);
 			$this->fail('Exception expected');
 		} catch (mysqli_sql_exception $e) {
 			$this->assertSame(MariaDbErrorCodes::ER_NO_SUCH_TABLE, $e->getCode());
 		}
 
-		$condition = $this->hideValueFromPhpstan(true);
+		$condition = $this->hideValueFromPhpstan('1');
 		$stmt = $db->prepare($condition ? 'SELECT ?' : 'SELECT ?, ?');
 
 		try {
@@ -168,12 +168,7 @@ public function testDynamicSql(): void
 		$this->assertTrue(true);
 	}
 
-	/**
-	 * @template T
-	 * @param T $value
-	 * @return T
-	 */
-	private function hideValueFromPhpstan(mixed $value): mixed
+	private function hideValueFromPhpstan(string $value): string
 	{
 		return $value;
 	}

diff --git a/tests/PHPStan/Rules/MySQLi/data/MySQLiWrapperRuleInvalidDataTest.php b/tests/PHPStan/Rules/MySQLi/data/MySQLiWrapperRuleInvalidDataTest.php
@@ -85,12 +85,7 @@ public function testDynamicSql(): void
 		$this->assertTrue(true);
 	}
 
-	/**
-	 * @template T
-	 * @param T $value
-	 * @return T
-	 */
-	private function hideValueFromPhpstan(mixed $value): mixed
+	private function hideValueFromPhpstan(string $value): string
 	{
 		return $value;
 	}

diff --git a/tests/PHPStan/Type/MySQLi/data/MySQLiTypeInferenceDataTest.php b/tests/PHPStan/Type/MySQLi/data/MySQLiTypeInferenceDataTest.php
@@ -856,7 +856,7 @@ public function testFetchObject(): void
 
 		do {
 			$row = $result->fetch_object(
-				$this->hideValueFromPhpstan(true)
+				$this->hideValueFromPhpstan('1')
 					? CustomUniversalObjectCrate::class
 					: \stdClass::class,
 			);
@@ -931,7 +931,7 @@ public function testFetchColumn(): void
 		$result = $db->query('SELECT id, price FROM mysqli_test');
 
 		do {
-			$dynamicColumn = $this->hideValueFromPhpstan(0);
+			$dynamicColumn = (int) $this->hideValueFromPhpstan('0');
 			$value = $result->fetch_column($dynamicColumn);
 
 			if (function_exists('assertType')) {
@@ -966,7 +966,7 @@ public function testDynamicSql(): void
 
 		$rows = $db->query(
 			'SELECT * FROM mysqli_test'
-				. ($this->hideValueFromPhpstan(true) ? ' WHERE 1' : ' WHERE 2'),
+				. ($this->hideValueFromPhpstan('1') ? ' WHERE 1' : ' WHERE 2'),
 		)->fetch_all(MYSQLI_ASSOC);
 
 		foreach ($rows as $row) {
@@ -991,7 +991,7 @@ public function testDynamicSql(): void
 		}
 
 		$rows = $db->query(
-			$this->hideValueFromPhpstan(true) ? 'SELECT 1 id' : 'SELECT "aa" aa, 2 count',
+			$this->hideValueFromPhpstan('1') ? 'SELECT 1 id' : 'SELECT "aa" aa, 2 count',
 		)->fetch_all(MYSQLI_ASSOC);
 
 		foreach ($rows as $row) {
@@ -1086,12 +1086,7 @@ private function assertGettype(string|array $allowedTypes, mixed $value): void
 		$this->assertTrue(in_array($type, $allowedTypes, true), $message);
 	}
 
-	/**
-	 * @template T
-	 * @param T $value
-	 * @return T
-	 */
-	private function hideValueFromPhpstan(mixed $value): mixed
+	private function hideValueFromPhpstan(string $value): string
 	{
 		return $value;
 	}