utilize composer autoloading in tests (#537)

staabm · Feb 22, 2023 · 3c2e2c0 · 3c2e2c0
1 parent 2524090
commit 3c2e2c0
Show file tree

Hide file tree

Showing 19 changed files with 1,314 additions and 13,008 deletions.
diff --git a/.phpstan-dba-mysqli.cache b/.phpstan-dba-mysqli.cache
diff --git a/.phpstan-dba-pdo-mysql.cache b/.phpstan-dba-pdo-mysql.cache
diff --git a/composer.json b/composer.json
@@ -37,7 +37,11 @@
 			"staabm\\PHPStanDba\\Tests\\": "tests/"
 		},
 		"classmap": [
-			"tests/default/data/runMysqlQuery.php"
+			"tests/default/data/",
+			"tests/defaultFetchAssoc/data/",
+			"tests/defaultFetchNumeric/data/",
+			"tests/rules/data/",
+			"tests/stringify/data/"
 		]
 	},
 	"scripts": {

diff --git a/tests/default/DbaInferenceTest.php b/tests/default/DbaInferenceTest.php
@@ -23,7 +23,6 @@ public function dataFileAsserts(): iterable
         }
 
         // make sure class constants can be resolved
-        require_once __DIR__ . '/data/pdo.php';
         yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo.php');
 
         if ('pdo-pgsql' === getenv('DBA_REFLECTOR')) {
@@ -32,31 +31,15 @@ public function dataFileAsserts(): iterable
             yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-mysql.php');
         }
         yield from $this->gatherAssertTypes(__DIR__ . '/data/dibi.php');
-
-        // make sure class constants can be resolved
-        require_once __DIR__ . '/data/pdo-quote.php';
         yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-quote.php');
-
-        // make sure class constants can be resolved
-        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-stmt-fetch.php';
         yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-stmt-fetch.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/pdo-column-count.php');
         yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-stmt-execute.php');
-
         yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli.php');
         yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli-escape.php');
 
-        // make sure class definitions within the test files are known to reflection
-        require_once __DIR__ . '/data/runMysqlQuery.php';
         yield from $this->gatherAssertTypes(__DIR__ . '/data/runMysqlQuery.php');
 
         // TODO pgsql: doesn't resolve null?