Merge pull request #3667 from morozov/phpstan-fix-backport

Phpstan fix backport

Author: Ocramius

phpcs.xml.dist

@@ -77,5 +77,6 @@
     <rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.IncorrectReturnTypeHint">
         <exclude-pattern>lib/Doctrine/DBAL/Types/ArrayType.php</exclude-pattern>
         <exclude-pattern>lib/Doctrine/DBAL/Types/ObjectType.php</exclude-pattern>
+        <exclude-pattern>tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php</exclude-pattern>
     </rule>
 </ruleset>

tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php

@@ -44,7 +44,7 @@ public function testDoesNotRequireQueryForServerVersion() : void
 
     public function testRestoresErrorHandlerOnException() : void
     {
-        $handler         = static function () : void {
+        $handler         = static function () : bool {
             self::fail('Never expected this to be called');
         };
         $default_handler = set_error_handler($handler);

tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php

@@ -296,7 +296,7 @@ public function testSyntaxErrorException() : void
 
     public function testConnectionExceptionSqLite() : void
     {
-        if ($this->connection instanceof SqlitePlatform) {
+        if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
             $this->markTestSkipped('Only fails this way on sqlite');
         }