staabm · staabm · Feb 3, 2022 · Feb 3, 2022 · Feb 3, 2022
diff --git a/.phpunit-phpstan-dba.cache b/.phpunit-phpstan-dba.cache
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"staabm\\PHPStanDba\\Tests\\Fixture\\": "tests/Fixture/",
-			"staabm\\PHPStanDba\\Tests\\": "tests/"
+			"staabm\\PHPStanDba\\Tests\\Fixture\\": "tests/default/Fixture/",
+			"staabm\\PHPStanDba\\Tests\\": "tests/default/"
 		}
 	},
 	"scripts": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -15,7 +15,7 @@ parameters:
     ignoreErrors:
         -
             message: '#Function Deployer\\runMysqlQuery\(\) should return array<int, array<int, string>>\|null but return statement is missing.#'
-            path: tests/data/runMysqlQuery.php
+            path: tests/default/data/runMysqlQuery.php
         -
             message: '#.*has no return type specified.#'
             path: tests/*

diff --git a/phpunit.xml b/phpunit.xml
@@ -14,7 +14,7 @@
 
     <testsuites>
         <testsuite name="PHPStanDba">
-            <directory suffix="Test.php">tests/</directory>
+            <directory suffix="Test.php">tests/default/</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/QueryReflection/QuerySimulation.php b/src/QueryReflection/QuerySimulation.php
@@ -104,7 +104,7 @@ public static function simulateParamValueType(Type $paramType, bool $preparedPar
             return null;
         }
 
-        throw new DbaException(sprintf('Unexpected expression type %s', \get_class($paramType)));
+        throw new DbaException(sprintf('Unexpected expression type %s of class %s', $paramType->describe(VerbosityLevel::precise()), \get_class($paramType)));
     }
 
     public static function simulate(string $queryString): ?string

diff --git a/tests/DbaInferenceTest.php → tests/default/DbaInferenceTest.php b/tests/DbaInferenceTest.php → tests/default/DbaInferenceTest.php
@@ -57,8 +57,8 @@ public function testFileAsserts(
     public static function getAdditionalConfigFiles(): array
     {
         return [
-            __DIR__.'/../config/stubFiles.neon',
-            __DIR__.'/../config/extensions.neon',
+            __DIR__.'/../../config/stubFiles.neon',
+            __DIR__.'/../../config/extensions.neon',
         ];
     }
 }
diff --git a/tests/Fixture/Connection.php → tests/default/Fixture/Connection.php b/tests/Fixture/Connection.php → tests/default/Fixture/Connection.php
diff --git a/tests/Fixture/PreparedStatement.php → tests/default/Fixture/PreparedStatement.php b/tests/Fixture/PreparedStatement.php → tests/default/Fixture/PreparedStatement.php
diff --git a/tests/Fixture/StringableObject.php → tests/default/Fixture/StringableObject.php b/tests/Fixture/StringableObject.php → tests/default/Fixture/StringableObject.php
diff --git a/tests/PdoStatementExecuteMethodRuleTest.php → ...ult/PdoStatementExecuteMethodRuleTest.php b/tests/PdoStatementExecuteMethodRuleTest.php → ...ult/PdoStatementExecuteMethodRuleTest.php
@@ -13,7 +13,7 @@ class PdoStatementExecuteMethodRuleTest extends AbstractServiceAwareRuleTestCase
 {
     protected function getRule(): Rule
     {
-        return $this->getRuleFromConfig(PdoStatementExecuteMethodRule::class, __DIR__.'/../config/dba.neon');
+        return $this->getRuleFromConfig(PdoStatementExecuteMethodRule::class, __DIR__.'/../../config/dba.neon');
     }
 
     public function testParameterErrors(): void

diff --git a/tests/QuerySimulationTest.php → tests/default/QuerySimulationTest.php b/tests/QuerySimulationTest.php → tests/default/QuerySimulationTest.php
diff --git a/...rrorInPreparedStatementMethodRuleTest.php → ...rrorInPreparedStatementMethodRuleTest.php b/...rrorInPreparedStatementMethodRuleTest.php → ...rrorInPreparedStatementMethodRuleTest.php
diff --git a/tests/SyntaxErrorInQueryFunctionRuleTest.php → ...lt/SyntaxErrorInQueryFunctionRuleTest.php b/tests/SyntaxErrorInQueryFunctionRuleTest.php → ...lt/SyntaxErrorInQueryFunctionRuleTest.php
@@ -13,7 +13,7 @@ class SyntaxErrorInQueryFunctionRuleTest extends AbstractServiceAwareRuleTestCas
 {
     protected function getRule(): Rule
     {
-        return $this->getRuleFromConfig(SyntaxErrorInQueryFunctionRule::class, __DIR__.'/../config/dba.neon');
+        return $this->getRuleFromConfig(SyntaxErrorInQueryFunctionRule::class, __DIR__.'/../../config/dba.neon');
     }
 
     public function testSyntaxErrorInQueryRule(): void

diff --git a/tests/SyntaxErrorInQueryMethodRuleTest.php → ...ault/SyntaxErrorInQueryMethodRuleTest.php b/tests/SyntaxErrorInQueryMethodRuleTest.php → ...ault/SyntaxErrorInQueryMethodRuleTest.php
@@ -13,7 +13,7 @@ class SyntaxErrorInQueryMethodRuleTest extends AbstractServiceAwareRuleTestCase
 {
     protected function getRule(): Rule
     {
-        return $this->getRuleFromConfig(SyntaxErrorInQueryMethodRule::class, __DIR__.'/../config/dba.neon');
+        return $this->getRuleFromConfig(SyntaxErrorInQueryMethodRule::class, __DIR__.'/../../config/dba.neon');
     }
 
     public function testSyntaxErrorInQueryRule(): void

diff --git a/tests/UnresolvablePdoStatementRuleTest.php → ...ault/UnresolvablePdoStatementRuleTest.php b/tests/UnresolvablePdoStatementRuleTest.php → ...ault/UnresolvablePdoStatementRuleTest.php
@@ -25,7 +25,7 @@ protected function tearDown(): void
 
     protected function getRule(): Rule
     {
-        return $this->getRuleFromConfig(PdoStatementExecuteMethodRule::class, __DIR__.'/../config/dba.neon');
+        return $this->getRuleFromConfig(PdoStatementExecuteMethodRule::class, __DIR__.'/../../config/dba.neon');
     }
 
     public function testSyntaxErrorInQueryRule(): void

diff --git a/...UnresolvablePreparedStatementRuleTest.php → ...UnresolvablePreparedStatementRuleTest.php b/...UnresolvablePreparedStatementRuleTest.php → ...UnresolvablePreparedStatementRuleTest.php
diff --git a/tests/UnresolvableQueryFunctionRuleTest.php → ...ult/UnresolvableQueryFunctionRuleTest.php b/tests/UnresolvableQueryFunctionRuleTest.php → ...ult/UnresolvableQueryFunctionRuleTest.php
@@ -25,7 +25,7 @@ protected function tearDown(): void
 
     protected function getRule(): Rule
     {
-        return $this->getRuleFromConfig(SyntaxErrorInQueryFunctionRule::class, __DIR__.'/../config/dba.neon');
+        return $this->getRuleFromConfig(SyntaxErrorInQueryFunctionRule::class, __DIR__.'/../../config/dba.neon');
     }
 
     public function testSyntaxErrorInQueryRule(): void

diff --git a/tests/UnresolvableQueryMethodRuleTest.php → ...fault/UnresolvableQueryMethodRuleTest.php b/tests/UnresolvableQueryMethodRuleTest.php → ...fault/UnresolvableQueryMethodRuleTest.php
@@ -25,7 +25,7 @@ protected function tearDown(): void
 
     protected function getRule(): Rule
     {
-        return $this->getRuleFromConfig(SyntaxErrorInQueryMethodRule::class, __DIR__.'/../config/dba.neon');
+        return $this->getRuleFromConfig(SyntaxErrorInQueryMethodRule::class, __DIR__.'/../../config/dba.neon');
     }
 
     public function testSyntaxErrorInQueryRule(): void

diff --git a/...g/syntax-error-in-prepared-statement.neon → ...g/syntax-error-in-prepared-statement.neon b/...g/syntax-error-in-prepared-statement.neon → ...g/syntax-error-in-prepared-statement.neon
@@ -1,6 +1,6 @@
 includes:
-    - ../../config/stubFiles.neon
-    - ../../config/extensions.neon
+    - ../../../config/stubFiles.neon
+    - ../../../config/extensions.neon
 
 services:
     -

diff --git a/tests/data/doctrine-dbal.php → tests/default/data/doctrine-dbal.php b/tests/data/doctrine-dbal.php → tests/default/data/doctrine-dbal.php
diff --git a/tests/data/mysqli-escape.php → tests/default/data/mysqli-escape.php b/tests/data/mysqli-escape.php → tests/default/data/mysqli-escape.php
diff --git a/tests/data/mysqli.php → tests/default/data/mysqli.php b/tests/data/mysqli.php → tests/default/data/mysqli.php
diff --git a/tests/data/pdo-column-count.php → tests/default/data/pdo-column-count.php b/tests/data/pdo-column-count.php → tests/default/data/pdo-column-count.php
diff --git a/tests/data/pdo-fetch-types.php → tests/default/data/pdo-fetch-types.php b/tests/data/pdo-fetch-types.php → tests/default/data/pdo-fetch-types.php
diff --git a/tests/data/pdo-prepare.php → tests/default/data/pdo-prepare.php b/tests/data/pdo-prepare.php → tests/default/data/pdo-prepare.php
diff --git a/tests/data/pdo-quote.php → tests/default/data/pdo-quote.php b/tests/data/pdo-quote.php → tests/default/data/pdo-quote.php
diff --git a/tests/data/pdo-stmt-execute-error.php → ...s/default/data/pdo-stmt-execute-error.php b/tests/data/pdo-stmt-execute-error.php → ...s/default/data/pdo-stmt-execute-error.php
diff --git a/tests/data/pdo-stmt-execute.php → tests/default/data/pdo-stmt-execute.php b/tests/data/pdo-stmt-execute.php → tests/default/data/pdo-stmt-execute.php
diff --git a/tests/data/pdo-stmt-fetch.php → tests/default/data/pdo-stmt-fetch.php b/tests/data/pdo-stmt-fetch.php → tests/default/data/pdo-stmt-fetch.php
diff --git a/tests/data/pdo.php → tests/default/data/pdo.php b/tests/data/pdo.php → tests/default/data/pdo.php
diff --git a/tests/data/runMysqlQuery.php → tests/default/data/runMysqlQuery.php b/tests/data/runMysqlQuery.php → tests/default/data/runMysqlQuery.php
diff --git a/...ta/syntax-error-in-prepared-statement.php → ...ta/syntax-error-in-prepared-statement.php b/...ta/syntax-error-in-prepared-statement.php → ...ta/syntax-error-in-prepared-statement.php
diff --git a/...s/data/syntax-error-in-query-function.php → ...t/data/syntax-error-in-query-function.php b/...s/data/syntax-error-in-query-function.php → ...t/data/syntax-error-in-query-function.php
diff --git a/tests/data/syntax-error-in-query-method.php → ...ult/data/syntax-error-in-query-method.php b/tests/data/syntax-error-in-query-method.php → ...ult/data/syntax-error-in-query-method.php
diff --git a/tests/data/unresolvable-pdo-statement.php → ...fault/data/unresolvable-pdo-statement.php b/tests/data/unresolvable-pdo-statement.php → ...fault/data/unresolvable-pdo-statement.php
diff --git a/...s/data/unresolvable-query-in-function.php → ...t/data/unresolvable-query-in-function.php b/...s/data/unresolvable-query-in-function.php → ...t/data/unresolvable-query-in-function.php
diff --git a/tests/data/unresolvable-query-in-method.php → ...ult/data/unresolvable-query-in-method.php b/tests/data/unresolvable-query-in-method.php → ...ult/data/unresolvable-query-in-method.php
diff --git a/tests/data/unresolvable-statement.php → ...s/default/data/unresolvable-statement.php b/tests/data/unresolvable-statement.php → ...s/default/data/unresolvable-statement.php