Updated PHPUnit to 9.0

composer.json

@@ -41,7 +41,7 @@
         "doctrine/coding-standard": "^6.0",
         "jetbrains/phpstorm-stubs": "^2019.1",
         "phpstan/phpstan": "^0.11.3",
-        "phpunit/phpunit": "^8.4.1",
+        "phpunit/phpunit": "^9.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
     },
     "suggest": {

tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php

@@ -104,7 +104,7 @@ class OCI8StatementTest extends DbalTestCase
     public function testConvertNonTerminatedLiteral(string $sql, string $message) : void
     {
         $this->expectException(OCI8Exception::class);
-        $this->expectExceptionMessageRegExp($message);
+        $this->expectExceptionMessageMatches($message);
         OCI8Statement::convertPositionalToNamedPlaceholders($sql);
     }
 

tests/Doctrine/Tests/DBAL/Functional/Driver/IBMDB2/DB2StatementTest.php

@@ -6,7 +6,6 @@ namespace Doctrine\Tests\DBAL\Functional\Driver\IBMDB2;
 
 use Doctrine\DBAL\Driver\IBMDB2\DB2Driver;
 use Doctrine\Tests\DbalFunctionalTestCase;
-use PHPUnit\Framework\Error\Notice;
 use function extension_loaded;
 
 class DB2StatementTest extends DbalFunctionalTestCase
@@ -33,7 +32,7 @@ class DB2StatementTest extends DbalFunctionalTestCase
         // unwrap the statement to prevent the wrapper from handling the PHPUnit-originated exception
         $wrappedStmt = $stmt->getWrappedStatement();
 
-        $this->expectException(Notice::class);
+        $this->expectNotice();
         $wrappedStmt->execute([[]]);
     }
 }

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

@@ -128,7 +128,11 @@ class PortabilityTest extends DbalFunctionalTestCase
      */
     public function assertFetchResultRow(array $row) : void
     {
-        self::assertContains($row['test_int'], [1, 2], 'Primary key test_int should either be 1 or 2.');
+        self::assertThat($row['test_int'], self::logicalOr(
+            self::equalTo(1),
+            self::equalTo(2)
+        ));
+
         self::assertArrayHasKey('test_string', $row, 'Case should be lowered.');
         self::assertEquals(3, strlen($row['test_string']), 'test_string should be rtrimed to length of three for CHAR(32) column.');
         self::assertNull($row['test_null']);