[REMOVEME] Address some issues which exist in master but are not dete…

…cted there
doctrine · Aug 27, 2019 · 7d0eb29 · 7d0eb29
1 parent 2b78cd6
commit 7d0eb29
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -68,6 +68,7 @@
     <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>
 
     <!-- DB2_AUTOCOMMIT_ON/DB2_AUTOCOMMIT_OFF are of int type but db2_autocommit() incorrectly expects bool,

diff --git a/tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php b/tests/Doctrine/Tests/DBAL/Driver/Mysqli/MysqliConnectionTest.php
@@ -46,7 +46,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);

diff --git a/tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php b/tests/Doctrine/Tests/DBAL/Functional/ExceptionTest.php
@@ -297,7 +297,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');
         }