Merge pull request #5166 from morozov/issues/4511

Enforce consistent constructor in dynamically instantiated classes
doctrine · Jan 6, 2022 · 4832932 · 4832932
2 parents f0a0491 + 7533fa0
commit 4832932
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -41,6 +41,7 @@
  * lazy connecting and more.
  *
  * @psalm-import-type Params from DriverManager
+ * @psalm-consistent-constructor
  */
 class Connection implements DriverConnection
 {

diff --git a/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php b/lib/Doctrine/DBAL/Platforms/Keywords/KeywordList.php
@@ -8,6 +8,8 @@
 
 /**
  * Abstract interface for a SQL reserved keyword dictionary.
+ *
+ * @psalm-consistent-constructor
  */
 abstract class KeywordList
 {

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -389,15 +389,6 @@
  <file name="lib/Doctrine/DBAL/Driver/PDOStatement.php"/>
  </errorLevel>
  </UnimplementedInterfaceMethod>
- <UnsafeInstantiation>
- <errorLevel type="suppress">
- <!-- See https://github.com/doctrine/dbal/issues/4510 -->
- <file name="lib/Doctrine/DBAL/Platforms/AbstractPlatform.php"/>
- <file name="lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php"/>
- <!-- See https://github.com/doctrine/dbal/issues/4511 -->
- <file name="lib/Doctrine/DBAL/DriverManager.php"/>
- </errorLevel>
- </UnsafeInstantiation>
  <InvalidArgument>
  <errorLevel type="suppress">
  <!-- See https://github.com/doctrine/dbal/pull/3803 -->