Remove use of Doctrine stub and and generic Doctrine result types

staabm · staabm · commit 7a2e5b089d6f · 2024-11-07T16:22:51.000+01:00
diff --git a/config/DoctrineDbal.stub b/config/DoctrineDbal.stub
diff --git a/config/dba.neon b/config/dba.neon
@@ -1,12 +1,3 @@
 includes:
-    - stubFiles.neon
     - extensions.neon
     - rules.neon
-
-parameters:
-    featureToggles:
-        skipCheckGenericClasses:
-            - Doctrine\DBAL\Result
-            - Doctrine\DBAL\Statement
-
-        duplicateStubs: false  # workaround for: https://github.com/staabm/phpstan-dba/issues/466
diff --git a/config/stubFiles.neon b/config/stubFiles.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - config/stubFiles.neon
     - config/extensions.neon
     - config/rules.neon
     - phpstan-baseline.neon
diff --git a/tests/default/DbaInferenceTest.php b/tests/default/DbaInferenceTest.php
@@ -90,7 +90,6 @@ public function testFileAsserts(
     public static function getAdditionalConfigFiles(): array
     {
         return [
-            __DIR__ . '/../../config/stubFiles.neon',
             __DIR__ . '/../../config/extensions.neon',
         ];
     }
diff --git a/tests/default/config/phpstan.neon.dist b/tests/default/config/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - ../../../config/stubFiles.neon
     - ../../../config/extensions.neon
 
 parameters:
diff --git a/tests/defaultFetchAssoc/DefaultFetchModeTest.php b/tests/defaultFetchAssoc/DefaultFetchModeTest.php
@@ -29,7 +29,6 @@ public function testFileAsserts(
     public static function getAdditionalConfigFiles(): array
     {
         return [
-            __DIR__ . '/../../config/stubFiles.neon',
             __DIR__ . '/../../config/extensions.neon',
         ];
     }
diff --git a/tests/defaultFetchAssoc/config/phpstan.neon.dist b/tests/defaultFetchAssoc/config/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - ../../../config/stubFiles.neon
     - ../../../config/extensions.neon
 
 parameters:
diff --git a/tests/defaultFetchNumeric/DefaultFetchModeTest.php b/tests/defaultFetchNumeric/DefaultFetchModeTest.php
@@ -29,7 +29,6 @@ public function testFileAsserts(
     public static function getAdditionalConfigFiles(): array
     {
         return [
-            __DIR__ . '/../../config/stubFiles.neon',
             __DIR__ . '/../../config/extensions.neon',
         ];
     }
diff --git a/tests/defaultFetchNumeric/config/phpstan.neon.dist b/tests/defaultFetchNumeric/config/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - ../../../config/stubFiles.neon
     - ../../../config/extensions.neon
 
 parameters:
diff --git a/tests/rules/config/phpstan.neon.dist b/tests/rules/config/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - ../../../config/stubFiles.neon
     - ../../../config/extensions.neon
 
 parameters:
diff --git a/tests/sqlAst/SqlAstInferenceTest.php b/tests/sqlAst/SqlAstInferenceTest.php
@@ -32,7 +32,6 @@ public function testFileAsserts(
     public static function getAdditionalConfigFiles(): array
     {
         return [
-            __DIR__ . '/../../config/stubFiles.neon',
             __DIR__ . '/../../config/extensions.neon',
         ];
     }
diff --git a/tests/sqlAst/config/phpstan.neon.dist b/tests/sqlAst/config/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - ../../../config/stubFiles.neon
     - ../../../config/extensions.neon
 
 parameters:
diff --git a/tests/stringify/InferenceStringifyTest.php b/tests/stringify/InferenceStringifyTest.php
@@ -33,7 +33,6 @@ public function testFileAsserts(
     public static function getAdditionalConfigFiles(): array
     {
         return [
-            __DIR__ . '/../../config/stubFiles.neon',
             __DIR__ . '/../../config/extensions.neon',
         ];
     }
diff --git a/tests/stringify/config/phpstan.neon.dist b/tests/stringify/config/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - ../../../config/stubFiles.neon
     - ../../../config/extensions.neon
 
 parameters:

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`includes:`
`2`		`- - config/stubFiles.neon`
`3`	`2`	`- config/extensions.neon`
`4`	`3`	`- config/rules.neon`
`5`	`4`	`- phpstan-baseline.neon`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ public function testFileAsserts(`
`90`	`90`	`public static function getAdditionalConfigFiles(): array`
`91`	`91`	`{`
`92`	`92`	`return [`
`93`		`- __DIR__ . '/../../config/stubFiles.neon',`
`94`	`93`	`__DIR__ . '/../../config/extensions.neon',`
`95`	`94`	`];`
`96`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`includes:`
`2`		`- - ../../../config/stubFiles.neon`
`3`	`2`	`- ../../../config/extensions.neon`
`4`	`3`
`5`	`4`	`parameters:`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ public function testFileAsserts(`
`29`	`29`	`public static function getAdditionalConfigFiles(): array`
`30`	`30`	`{`
`31`	`31`	`return [`
`32`		`- __DIR__ . '/../../config/stubFiles.neon',`
`33`	`32`	`__DIR__ . '/../../config/extensions.neon',`
`34`	`33`	`];`
`35`	`34`	`}`