Bump staabm/phpstan-dba from 0.3 to 0.3.1 (#788)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Markus Staab <[email protected]>

Author: dependabot[bot]

composer.json

@@ -11,7 +11,7 @@
         "spaze/phpstan-disallowed-calls": "4.0.1",
         "sqlftw/sqlftw": "0.1.16",
         "staabm/phpstan-baseline-analysis": "0.13.1",
-        "staabm/phpstan-dba": "0.3",
+        "staabm/phpstan-dba": "0.3.1",
         "staabm/phpstan-todo-by": "0.2",
         "symplify/phpstan-rules": "14.0.2",
         "tomasvotruba/cognitive-complexity": "1.0",

composer.lock

@@ -1663,17 +1663,17 @@
         },
         {
             "name": "staabm/phpstan-dba",
-            "version": "0.3",
-            "version_normalized": "0.3.0.0",
+            "version": "0.3.1",
+            "version_normalized": "0.3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/staabm/phpstan-dba.git",
-                "reference": "b32c279fcb7e9fa0c30a3aedc1f4b4913dac14f1"
+                "reference": "6dac52ebaa925ea05b3e178ed3bb4dbf87be29f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/b32c279fcb7e9fa0c30a3aedc1f4b4913dac14f1",
-                "reference": "b32c279fcb7e9fa0c30a3aedc1f4b4913dac14f1",
+                "url": "https://api.github.com/repos/staabm/phpstan-dba/zipball/6dac52ebaa925ea05b3e178ed3bb4dbf87be29f2",
+                "reference": "6dac52ebaa925ea05b3e178ed3bb4dbf87be29f2",
                 "shasum": ""
             },
             "require": {
@@ -1699,7 +1699,7 @@
                 "symplify/easy-coding-standard": "^12.3",
                 "vlucas/phpdotenv": "^5.4"
             },
-            "time": "2024-11-17T08:36:10+00:00",
+            "time": "2024-11-26T21:46:03+00:00",
             "type": "phpstan-extension",
             "extra": {
                 "phpstan": {
@@ -1731,7 +1731,7 @@
             ],
             "support": {
                 "issues": "https://github.com/staabm/phpstan-dba/issues",
-                "source": "https://github.com/staabm/phpstan-dba/tree/0.3"
+                "source": "https://github.com/staabm/phpstan-dba/tree/0.3.1"
             },
             "funding": [
                 {

vendor/composer/installed.json

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '93518c4c6084a1f9d57a657c7ec6c245fc363f7a',
+        'reference' => 'b7b1d7a5e2bd226335c852d34fbc9c099d45acce',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '93518c4c6084a1f9d57a657c7ec6c245fc363f7a',
+            'reference' => 'b7b1d7a5e2bd226335c852d34fbc9c099d45acce',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -248,9 +248,9 @@
             'dev_requirement' => false,
         ),
         'staabm/phpstan-dba' => array(
-            'pretty_version' => '0.3',
-            'version' => '0.3.0.0',
-            'reference' => 'b32c279fcb7e9fa0c30a3aedc1f4b4913dac14f1',
+            'pretty_version' => '0.3.1',
+            'version' => '0.3.1.0',
+            'reference' => '6dac52ebaa925ea05b3e178ed3bb4dbf87be29f2',
             'type' => 'phpstan-extension',
             'install_path' => __DIR__ . '/../staabm/phpstan-dba',
             'aliases' => array(),

vendor/composer/installed.php

@@ -5,6 +5,7 @@
 namespace staabm\PHPStanDba\DoctrineReflection;
 
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
@@ -43,6 +44,7 @@ public function reduceResultType(MethodReflection $methodReflection, Type $resul
 
         $usedMethod = strtolower($methodReflection->getName());
 
+        $returnsList = false;
         switch ($usedMethod) {
             case 'fetchallkeyvalue':
             case 'iteratekeyvalue':
@@ -52,16 +54,25 @@ public function reduceResultType(MethodReflection $methodReflection, Type $resul
                 $fetchType = QueryReflector::FETCH_TYPE_ONE;
                 break;
             case 'fetchfirstcolumn':
+                $returnsList = true;
+                $fetchType = QueryReflector::FETCH_TYPE_FIRST_COL;
+                break;
             case 'iteratecolumn':
                 $fetchType = QueryReflector::FETCH_TYPE_FIRST_COL;
                 break;
             case 'fetchnumeric':
             case 'fetchallnumeric':
+                $returnsList = true;
+                $fetchType = QueryReflector::FETCH_TYPE_NUMERIC;
+                break;
             case 'iteratenumeric':
                 $fetchType = QueryReflector::FETCH_TYPE_NUMERIC;
                 break;
-            case 'fetchassociative':
             case 'fetchallassociative':
+                $returnsList = true;
+                $fetchType = QueryReflector::FETCH_TYPE_ASSOC;
+                break;
+            case 'fetchassociative':
             case 'iterateassociative':
                 $fetchType = QueryReflector::FETCH_TYPE_ASSOC;
                 break;
@@ -99,7 +110,14 @@ public function reduceResultType(MethodReflection $methodReflection, Type $resul
                         return new GenericObjectType(Traversable::class, [new IntegerType(), $valueTypes[$i]]);
                     }
 
-                    return new ArrayType(IntegerRangeType::fromInterval(0, null), $valueTypes[$i]);
+                    $arrayType = new ArrayType(IntegerRangeType::fromInterval(0, null), $valueTypes[$i]);
+                    if ($returnsList) {
+                        return TypeCombinator::intersect(
+                            $arrayType,
+                            new AccessoryArrayListType()
+                        );
+                    }
+                    return $arrayType;
                 }
 
                 if (QueryReflector::FETCH_TYPE_NUMERIC === $fetchType && $keyType->isInteger()->yes()) {
@@ -116,7 +134,21 @@ public function reduceResultType(MethodReflection $methodReflection, Type $resul
             }
 
             if (\in_array($usedMethod, ['fetchallnumeric', 'fetchallassociative'], true)) {
-                return new ArrayType(IntegerRangeType::fromInterval(0, null), $resultType);
+                $arrayType = new ArrayType(IntegerRangeType::fromInterval(0, null), $resultType);
+                if ($returnsList) {
+                    return TypeCombinator::intersect(
+                        $arrayType,
+                        new AccessoryArrayListType()
+                    );
+                }
+                return $arrayType;
+            }
+
+            if ($returnsList) {
+                $resultType = TypeCombinator::intersect(
+                    $resultType,
+                    new AccessoryArrayListType()
+                );
             }
 
             // false is returned if no rows are found.