refactor: separated tests for fetch-types

Author: clxmstaab

tests/DbaInferenceTest.php

@@ -16,6 +16,10 @@ public function dataFileAsserts(): iterable
         require_once __DIR__.'/data/pdo-prepare.php';
         yield from $this->gatherAssertTypes(__DIR__.'/data/pdo-prepare.php');
 
+        // make sure class constants can be resolved
+        require_once __DIR__.'/data/pdo-fetch-types.php';
+        yield from $this->gatherAssertTypes(__DIR__.'/data/pdo-fetch-types.php');
+
         yield from $this->gatherAssertTypes(__DIR__.'/data/mysqli.php');
 
         // make sure class definitions within the test files are known to reflection

tests/data/pdo-fetch-types.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace PdoFetchTypeTest;
+
+use PDO;
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	public function supportedFetchTypes(PDO $pdo)
+	{
+		$stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_NUM);
+		assertType('PDOStatement<array{string, int<0, 4294967295>}>', $stmt);
+
+		$stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_ASSOC);
+		assertType('PDOStatement<array{email: string, adaid: int<0, 4294967295>}>', $stmt);
+
+		$stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_BOTH);
+		assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);
+	}
+
+	public function unsupportedFetchTypes(PDO $pdo)
+	{
+		$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada');
+		assertType('PDOStatement<array>|false', $stmt);
+
+		$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_COLUMN);
+		assertType('PDOStatement<array>|false', $stmt);
+
+		$stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_OBJ);
+		assertType('PDOStatement<array>|false', $stmt);
+	}
+}

tests/data/pdo.php

@@ -105,30 +105,6 @@ public function updateQuery(PDO $pdo)
         assertType('PDOStatement<array>|false', $stmt);
     }
 
-    public function supportedFetchTypes(PDO $pdo)
-    {
-        $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_NUM);
-        assertType('PDOStatement<array{string, int<0, 4294967295>}>', $stmt);
-
-        $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_ASSOC);
-        assertType('PDOStatement<array{email: string, adaid: int<0, 4294967295>}>', $stmt);
-
-        $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_BOTH);
-        assertType('PDOStatement<array{email: string, 0: string, adaid: int<0, 4294967295>, 1: int<0, 4294967295>}>', $stmt);
-    }
-
-    public function unsupportedFetchTypes(PDO $pdo)
-    {
-        $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada');
-        assertType('PDOStatement<array>|false', $stmt);
-
-        $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_COLUMN);
-        assertType('PDOStatement<array>|false', $stmt);
-
-        $stmt = $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_OBJ);
-        assertType('PDOStatement<array>|false', $stmt);
-    }
-
     /**
      * @param numeric          $n
      * @param non-empty-string $nonE