Merge pull request #4040 from greg0ire/merge-up-mistakes

Merge up mistakes

phpcs.xml.dist

@@ -112,6 +112,6 @@
     <!-- The SQLSRV_* functions are defined in the upper case by the sqlsrv extension and violate the standard
          see https://docs.microsoft.com/en-us/sql/connect/php/constants-microsoft-drivers-for-php-for-sql-server -->
     <rule ref="Squiz.PHP.LowercasePHPFunctions">
-        <exclude-pattern>lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
+        <exclude-pattern>src/Driver/SQLSrv/SQLSrvStatement.php</exclude-pattern>
     </rule>
 </ruleset>

tests/Platforms/AbstractPostgreSQLPlatformTestCase.php

@@ -3,7 +3,6 @@
 namespace Doctrine\DBAL\Tests\Platforms;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQL100Platform;
 use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ColumnDiff;
@@ -19,10 +18,10 @@ use function sprintf;
 
 abstract class AbstractPostgreSQLPlatformTestCase extends AbstractPlatformTestCase
 {
-    /** @var PostgreSQL94Platform|PostgreSQL100Platform */
+    /** @var PostgreSQL94Platform */
     protected $platform;
 
-    /** @return PostgreSQL94Platform|PostgreSQL100Platform */
+    /** @return PostgreSQL94Platform */
     abstract public function createPlatform() : AbstractPlatform;
 
     public function getGenerateTableSql() : string