support phpstan 1.4.x (#121)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

composer.json

@@ -5,7 +5,7 @@
 	"require": {
 		"php": "^8.0",
 		"ext-mysqli": "*",
-		"phpstan/phpstan": "1.3.*"
+		"phpstan/phpstan": "^1.2"
 	},
 	"require-dev": {
 		"ext-pdo": "*",
@@ -17,6 +17,9 @@
 		"phpunit/phpunit": "^9",
 		"symplify/phpstan-extensions": "^10.0"
 	},
+	"conflicts": {
+		"phpstan/phpstan": "1.4.0"
+	},
 	"autoload": {
 		"psr-4": {
 			"staabm\\PHPStanDba\\": "src/"
@@ -32,9 +35,10 @@
 		"csfix": [
 			"php-cs-fixer fix"
 		],
-		"phpstan-dba-baseline": [
-			"phpunit",
-			"phpstan analyse -c phpstan.neon.dist"
+		"test": [
+			"@phpunit",
+			"@phpstan",
+			"@csfix"
 		],
 		"phpstan": [
 			"phpstan analyse -c phpstan.neon.dist"

src/QueryReflection/MysqliQueryReflector.php

@@ -61,9 +61,18 @@ public function __construct(mysqli $mysqli)
 
         $constants = get_defined_constants(true);
         foreach ($constants['mysqli'] as $c => $n) {
+            if (!\is_int($n)) {
+                throw new ShouldNotHappenException();
+            }
             if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) {
+                if (!\is_string($m[1])) {
+                    throw new ShouldNotHappenException();
+                }
                 $this->nativeTypes[$n] = $m[1];
             } elseif (preg_match('/MYSQLI_(.*)_FLAG$/', $c, $m)) {
+                if (!\is_string($m[1])) {
+                    throw new ShouldNotHappenException();
+                }
                 if (!\array_key_exists($n, $this->nativeFlags)) {
                     $this->nativeFlags[$n] = $m[1];
                 }

tests/data/pdo-prepare.php

@@ -10,6 +10,7 @@ class Foo
     public function prepareSelected(PDO $pdo)
     {
         $stmt = $pdo->prepare('SELECT email, adaid FROM ada');
+        assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);
         $stmt->execute();
         assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);