Merge branch '2.11.x' into 3.0.x

UPGRADE.md

@@ -228,6 +228,10 @@ Please use other database client applications for import, e.g.:
 
 # Upgrade to 2.11
 
+## `Connection::getParams()` has been marked internal
+
+Consumers of the Connection class should not rely on connection parameters stored in the connection object. If needed, they should be obtained from a different source, e.g. application configuration.
+
 ## Deprecated `Doctrine\DBAL\Driver::getDatabase()`
 
 - The usage of `Doctrine\DBAL\Driver::getDatabase()` is deprecated. Please use `Doctrine\DBAL\Connection::getDatabase()` instead.

composer.json

@@ -42,7 +42,7 @@
         "nikic/php-parser": "^4.4",
         "phpstan/phpstan": "^0.12.18",
         "phpstan/phpstan-strict-rules": "^0.12.2",
-        "phpunit/phpunit": "^9.1.1",
+        "phpunit/phpunit": "^9.2",
         "psalm/plugin-phpunit": "^0.10.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
         "vimeo/psalm": "^3.11.4"

phpcs.xml.dist

@@ -101,6 +101,11 @@
         <exclude-pattern>src/Driver/SQLSrv/Result.php</exclude-pattern>
     </rule>
 
+    <!-- See https://github.com/slevomat/coding-standard/issues/1038 -->
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+        <exclude-pattern>tests/Functional/Driver/IBMDB2/DB2StatementTest.php</exclude-pattern>
+    </rule>
+
     <!-- see https://github.com/doctrine/dbal/issues/3377 -->
     <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedNotEqualOperator">
         <exclude-pattern>src/Schema/Comparator.php</exclude-pattern>

src/Connection.php

@@ -189,6 +189,8 @@ class Connection implements DriverConnection
     /**
      * Gets the parameters used during instantiation.
      *
+     * @internal
+     *
      * @return mixed[]
      */
     public function getParams()
@@ -987,7 +989,7 @@ class Connection implements DriverConnection
             throw CacheException::noResultDriverConfigured();
         }
 
-        $connectionParams = $this->getParams();
+        $connectionParams = $this->params;
         unset($connectionParams['platform']);
 
         [$cacheKey, $realKey] = $qcp->generateCacheKeys($query, $params, $types, $connectionParams);

src/Driver/AbstractSQLServerDriver/PortWithoutHost.php

+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\AbstractSQLServerDriver;
+
+use Doctrine\DBAL\Driver\AbstractDriverException;
+
+/**
+ * @internal
+ *
+ * @psalm-immutable
+ */
+final class PortWithoutHost extends AbstractDriverException
+{
+    public static function new(): self
+    {
+        return new self('Connection port specified without the host');
+    }
+}

src/Driver/IBMDB2/DB2Connection.php

@@ -2,6 +2,9 @@
 
 namespace Doctrine\DBAL\Driver\IBMDB2;
 
+use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionError;
+use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionFailed;
+use Doctrine\DBAL\Driver\IBMDB2\Exception\PrepareFailed;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\Driver\Statement as DriverStatement;
@@ -11,7 +14,6 @@ use stdClass;
 use function assert;
 use function db2_autocommit;
 use function db2_commit;
-use function db2_conn_errormsg;
 use function db2_connect;
 use function db2_escape_string;
 use function db2_exec;
@@ -21,7 +23,7 @@ use function db2_pconnect;
 use function db2_prepare;
 use function db2_rollback;
 use function db2_server_info;
-use function db2_stmt_errormsg;
+use function error_get_last;
 use function is_bool;
 
 use const DB2_AUTOCOMMIT_OFF;
@@ -51,7 +53,7 @@ class DB2Connection implements ServerInfoAwareConnection
         }
 
         if ($conn === false) {
-            throw new DB2Exception(db2_conn_errormsg());
+            throw ConnectionFailed::new();
         }
 
         $this->conn = $conn;
@@ -79,8 +81,9 @@ class DB2Connection implements ServerInfoAwareConnection
     public function prepare(string $sql): DriverStatement
     {
         $stmt = @db2_prepare($this->conn, $sql);
+
         if ($stmt === false) {
-            throw new DB2Exception(db2_stmt_errormsg());
+            throw PrepareFailed::new(error_get_last()['message']);
         }
 
         return new DB2Statement($stmt);
@@ -110,7 +113,7 @@ class DB2Connection implements ServerInfoAwareConnection
         $stmt = @db2_exec($this->conn, $statement);
 
         if ($stmt === false) {
-            throw new DB2Exception(db2_stmt_errormsg());
+            throw ConnectionError::new($this->conn);
         }
 
         return db2_num_rows($stmt);
@@ -141,7 +144,7 @@ class DB2Connection implements ServerInfoAwareConnection
     public function commit()
     {
         if (! db2_commit($this->conn)) {
-            throw new DB2Exception(db2_conn_errormsg($this->conn));
+            throw ConnectionError::new($this->conn);
         }
 
         $result = db2_autocommit($this->conn, DB2_AUTOCOMMIT_ON);
@@ -156,7 +159,7 @@ class DB2Connection implements ServerInfoAwareConnection
     public function rollBack()
     {
         if (! db2_rollback($this->conn)) {
-            throw new DB2Exception(db2_conn_errormsg($this->conn));
+            throw ConnectionError::new($this->conn);
         }
 
         $result = db2_autocommit($this->conn, DB2_AUTOCOMMIT_ON);

src/Driver/IBMDB2/DB2Exception.php

@@ -2,11 +2,11 @@
 
 namespace Doctrine\DBAL\Driver\IBMDB2;
 
-use Exception;
+use Doctrine\DBAL\Driver\AbstractDriverException;
 
 /**
  * @psalm-immutable
  */
-class DB2Exception extends Exception
+class DB2Exception extends AbstractDriverException
 {
 }

src/Driver/IBMDB2/DB2Statement.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\IBMDB2;
 
+use Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\ParameterType;
@@ -9,7 +10,6 @@ use Doctrine\DBAL\ParameterType;
 use function assert;
 use function db2_bind_param;
 use function db2_execute;
-use function db2_stmt_errormsg;
 use function error_get_last;
 use function fclose;
 use function fwrite;
@@ -103,7 +103,7 @@ class DB2Statement implements Statement
         $this->bindParam[$position] =& $variable;
 
         if (! db2_bind_param($this->stmt, $position, 'variable', $parameterType, $dataType)) {
-            throw new DB2Exception(db2_stmt_errormsg());
+            throw StatementError::new($this->stmt);
         }
     }
 
@@ -141,7 +141,7 @@ class DB2Statement implements Statement
         $this->lobs = [];
 
         if ($result === false) {
-            throw new DB2Exception(db2_stmt_errormsg());
+            throw StatementError::new($this->stmt);
         }
 
         return new Result($this->stmt);

src/Driver/IBMDB2/Exception/ConnectionError.php

+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
+
+use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+
+use function db2_conn_error;
+use function db2_conn_errormsg;
+
+/**
+ * @psalm-immutable
+ */
+final class ConnectionError extends DB2Exception
+{
+    /**
+     * @param resource $connection
+     */
+    public static function new($connection): self
+    {
+        return new self(db2_conn_errormsg($connection), db2_conn_error($connection));
+    }
+}

src/Driver/IBMDB2/Exception/ConnectionFailed.php

+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
+
+use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+
+use function db2_conn_error;
+use function db2_conn_errormsg;
+
+/**
+ * @psalm-immutable
+ */
+final class ConnectionFailed extends DB2Exception
+{
+    public static function new(): self
+    {
+        return new self(db2_conn_errormsg(), db2_conn_error());
+    }
+}

src/Driver/IBMDB2/Exception/PrepareFailed.php

+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
+
+use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+
+/**
+ * @psalm-immutable
+ */
+final class PrepareFailed extends DB2Exception
+{
+    public static function new(string $message): self
+    {
+        return new self($message);
+    }
+}

src/Driver/IBMDB2/Exception/StatementError.php

+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\IBMDB2\Exception;
+
+use Doctrine\DBAL\Driver\IBMDB2\DB2Exception;
+
+use function db2_stmt_error;
+use function db2_stmt_errormsg;
+
+/**
+ * @psalm-immutable
+ */
+final class StatementError extends DB2Exception
+{
+    /**
+     * @param resource $statement
+     */
+    public static function new($statement): self
+    {
+        return new self(db2_stmt_errormsg($statement), db2_stmt_error($statement));
+    }
+}

src/Driver/PDOSqlsrv/Driver.php

@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Driver\PDOSqlsrv;
 
 use Doctrine\DBAL\Driver\AbstractSQLServerDriver;
+use Doctrine\DBAL\Driver\AbstractSQLServerDriver\PortWithoutHost;
 use PDO;
 
 use function is_int;
@@ -56,10 +57,12 @@ class Driver extends AbstractSQLServerDriver
 
         if (isset($params['host'])) {
             $dsn .= $params['host'];
-        }
 
-        if (isset($params['port'])) {
-            $dsn .= ',' . $params['port'];
+            if (isset($params['port'])) {
+                $dsn .= ',' . $params['port'];
+            }
+        } elseif (isset($params['port'])) {
+            throw PortWithoutHost::new();
         }
 
         if (isset($params['dbname'])) {

src/Driver/SQLSrv/Driver.php

@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Driver\SQLSrv;
 
 use Doctrine\DBAL\Driver\AbstractSQLServerDriver;
+use Doctrine\DBAL\Driver\AbstractSQLServerDriver\PortWithoutHost;
 
 /**
  * Driver for ext/sqlsrv.
@@ -14,13 +15,16 @@ class Driver extends AbstractSQLServerDriver
      */
     public function connect(array $params)
     {
-        if (! isset($params['host'])) {
-            throw new SQLSrvException("Missing 'host' in configuration for sqlsrv driver.");
-        }
+        $serverName = '';
+
+        if (isset($params['host'])) {
+            $serverName = $params['host'];
 
-        $serverName = $params['host'];
-        if (isset($params['port'])) {
-            $serverName .= ', ' . $params['port'];
+            if (isset($params['port'])) {
+                $serverName .= ',' . $params['port'];
+            }
+        } elseif (isset($params['port'])) {
+            throw PortWithoutHost::new();
         }
 
         $driverOptions = $params['driver_options'] ?? [];

src/Id/TableGenerator.php

@@ -4,6 +4,7 @@ namespace Doctrine\DBAL\Id;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\LockMode;
 use Throwable;
@@ -69,12 +70,16 @@ class TableGenerator
      */
     public function __construct(Connection $conn, $generatorTableName = 'sequences')
     {
-        $params = $conn->getParams();
-        if ($params['driver'] === 'pdo_sqlite') {
+        if ($conn->getDriver() instanceof Driver\PDOSqlite\Driver) {
             throw new DBALException('Cannot use TableGenerator with SQLite.');
         }
 
-        $this->conn               = DriverManager::getConnection($params, $conn->getConfiguration(), $conn->getEventManager());
+        $this->conn = DriverManager::getConnection(
+            $conn->getParams(),
+            $conn->getConfiguration(),
+            $conn->getEventManager()
+        );
+
         $this->generatorTableName = $generatorTableName;
     }
 

tests/Driver/AbstractSQLServerDriverTest.php

@@ -3,20 +3,14 @@
 namespace Doctrine\DBAL\Tests\Driver;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\AbstractSQLServerDriver;
+use Doctrine\DBAL\Driver\AbstractSQLServerDriver\PortWithoutHost;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SQLServer2012Platform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\SQLServerSchemaManager;
 
-class AbstractSQLServerDriverTest extends AbstractDriverTest
+abstract class AbstractSQLServerDriverTest extends AbstractDriverTest
 {
-    protected function createDriver(): Driver
-    {
-        return $this->getMockForAbstractClass(AbstractSQLServerDriver::class);
-    }
-
     protected function createPlatform(): AbstractPlatform
     {
         return new SQLServer2012Platform();
@@ -36,4 +30,10 @@ class AbstractSQLServerDriverTest extends AbstractDriverTest
             ['12', SQLServer2012Platform::class],
         ];
     }
+
+    public function testPortWithoutHost(): void
+    {
+        $this->expectException(PortWithoutHost::class);
+        $this->driver->connect(['port' => 1433]);
+    }
 }

tests/Functional/DataAccessTest.php

@@ -5,6 +5,7 @@ namespace Doctrine\DBAL\Tests\Functional;
 use DateTime;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver\IBMDB2\DB2Driver;
 use Doctrine\DBAL\Driver\Mysqli\Driver as MySQLiDriver;
 use Doctrine\DBAL\Driver\SQLSrv\Driver as SQLSrvDriver;
 use Doctrine\DBAL\ParameterType;
@@ -191,8 +192,9 @@ class DataAccessTest extends FunctionalTestCase
 
     /**
      * @group DBAL-209
+     * @dataProvider fetchProvider
      */
-    public function testFetchAllWithMissingTypes(): void
+    public function testFetchAllWithMissingTypes(callable $fetch): void
     {
         if (
             $this->connection->getDriver() instanceof MySQLiDriver ||
@@ -201,13 +203,51 @@ class DataAccessTest extends FunctionalTestCase
             self::markTestSkipped('mysqli and sqlsrv actually supports this');
         }
 
+        if (
+            $this->connection->getDriver() instanceof DB2Driver
+        ) {
+            $this->markTestSkipped(
+                'ibm_ibm2 may or may not report the error depending on the PHP version and the connection state'
+            );
+        }
+
         $datetimeString = '2010-01-01 10:10:10';
         $datetime       = new DateTime($datetimeString);
         $sql            = 'SELECT test_int, test_datetime FROM fetch_table WHERE test_int = ? AND test_datetime = ?';
 
         $this->expectException(DBALException::class);
 
-        $this->connection->fetchAllAssociative($sql, [1, $datetime]);
+        $fetch($this->connection, $sql, [1, $datetime]);
+    }
+
+    /**
+     * @return iterable<string,array{0:callable}>
+     */
+    public static function fetchProvider(): iterable
+    {
+        yield 'fetch-all-associative' => [
+            static function (Connection $connection, string $query, array $params): void {
+                $connection->fetchAllAssociative($query, $params);
+            },
+        ];
+
+        yield 'fetch-numeric' => [
+            static function (Connection $connection, string $query, array $params): void {
+                $connection->fetchNumeric($query, $params);
+            },
+        ];
+
+        yield 'fetch-associative' => [
+            static function (Connection $connection, string $query, array $params): void {
+                $connection->fetchAssociative($query, $params);
+            },
+        ];
+
+        yield 'fetch-one' => [
+            static function (Connection $connection, string $query, array $params): void {
+                $connection->fetchOne($query, $params);
+            },
+        ];
     }
 
     public function testFetchNoResult(): void
@@ -250,24 +290,6 @@ class DataAccessTest extends FunctionalTestCase
         self::assertStringStartsWith($datetimeString, $row['test_datetime']);
     }
 
-    public function testFetchAssocWithMissingTypes(): void
-    {
-        if (
-            $this->connection->getDriver() instanceof MySQLiDriver ||
-            $this->connection->getDriver() instanceof SQLSrvDriver
-        ) {
-            self::markTestSkipped('mysqli and sqlsrv actually supports this');
-        }
-
-        $datetimeString = '2010-01-01 10:10:10';
-        $datetime       = new DateTime($datetimeString);
-        $sql            = 'SELECT test_int, test_datetime FROM fetch_table WHERE test_int = ? AND test_datetime = ?';
-
-        $this->expectException(DBALException::class);
-
-        $this->connection->fetchAssociative($sql, [1, $datetime]);
-    }
-
     public function testFetchArray(): void
     {
         $sql = 'SELECT test_int, test_string FROM fetch_table WHERE test_int = ? AND test_string = ?';
@@ -297,25 +319,7 @@ class DataAccessTest extends FunctionalTestCase
         self::assertStringStartsWith($datetimeString, $row[1]);
     }
 
-    public function testFetchArrayWithMissingTypes(): void
-    {
-        if (
-            $this->connection->getDriver() instanceof MySQLiDriver ||
-            $this->connection->getDriver() instanceof SQLSrvDriver
-        ) {
-            self::markTestSkipped('mysqli and sqlsrv actually supports this');
-        }
-
-        $datetimeString = '2010-01-01 10:10:10';
-        $datetime       = new DateTime($datetimeString);
-        $sql            = 'SELECT test_int, test_datetime FROM fetch_table WHERE test_int = ? AND test_datetime = ?';
-
-        $this->expectException(DBALException::class);
-
-        $this->connection->fetchNumeric($sql, [1, $datetime]);
-    }
-
-    public function testFetchOne(): void
+    public function testFetchColumn(): void
     {
         $sql     = 'SELECT test_int FROM fetch_table WHERE test_int = ? AND test_string = ?';
         $testInt = $this->connection->fetchOne($sql, [1, 'foo']);
@@ -345,24 +349,6 @@ class DataAccessTest extends FunctionalTestCase
         self::assertStringStartsWith($datetimeString, $column);
     }
 
-    public function testFetchOneWithMissingTypes(): void
-    {
-        if (
-            $this->connection->getDriver() instanceof MySQLiDriver ||
-            $this->connection->getDriver() instanceof SQLSrvDriver
-        ) {
-            self::markTestSkipped('mysqli and sqlsrv actually supports this');
-        }
-
-        $datetimeString = '2010-01-01 10:10:10';
-        $datetime       = new DateTime($datetimeString);
-        $sql            = 'SELECT test_int, test_datetime FROM fetch_table WHERE test_int = ? AND test_datetime = ?';
-
-        $this->expectException(DBALException::class);
-
-        $this->connection->fetchOne($sql, [1, $datetime]);
-    }
-
     /**
      * @group DDC-697
      */

tests/Functional/Driver/IBMDB2/ConnectionTest.php

+<?php
+
+namespace Doctrine\DBAL\Tests\Functional\Driver\IBMDB2;
+
+use Doctrine\DBAL\Driver\IBMDB2\DB2Connection;
+use Doctrine\DBAL\Driver\IBMDB2\DB2Driver;
+use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionFailed;
+use Doctrine\DBAL\Driver\IBMDB2\Exception\PrepareFailed;
+use Doctrine\DBAL\Tests\FunctionalTestCase;
+use ReflectionProperty;
+
+use function db2_close;
+use function extension_loaded;
+
+class ConnectionTest extends FunctionalTestCase
+{
+    protected function setUp(): void
+    {
+        if (! extension_loaded('ibm_db2')) {
+            $this->markTestSkipped('ibm_db2 is not installed.');
+        }
+
+        parent::setUp();
+
+        if ($this->connection->getDriver() instanceof DB2Driver) {
+            return;
+        }
+
+        $this->markTestSkipped('ibm_db2 only test.');
+    }
+
+    protected function tearDown(): void
+    {
+        $this->resetSharedConn();
+    }
+
+    public function testConnectionFailure(): void
+    {
+        $this->expectException(ConnectionFailed::class);
+        new DB2Connection('garbage', false, '', '');
+    }
+
+    public function testPrepareFailure(): void
+    {
+        $driverConnection = $this->connection->getWrappedConnection();
+
+        $re = new ReflectionProperty($driverConnection, 'conn');
+        $re->setAccessible(true);
+        $conn = $re->getValue($driverConnection);
+        db2_close($conn);
+
+        $this->expectException(PrepareFailed::class);
+        $driverConnection->prepare('SELECT 1');
+    }
+}

tests/Functional/Driver/IBMDB2/DB2StatementTest.php

@@ -5,10 +5,15 @@ declare(strict_types=1);
 namespace Doctrine\DBAL\Tests\Functional\Driver\IBMDB2;
 
 use Doctrine\DBAL\Driver\IBMDB2\DB2Driver;
+use Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 
 use function extension_loaded;
 
+use const E_ALL;
+use const E_NOTICE;
+use const E_WARNING;
+
 class DB2StatementTest extends FunctionalTestCase
 {
     protected function setUp(): void
@@ -28,12 +33,14 @@ class DB2StatementTest extends FunctionalTestCase
 
     public function testExecutionErrorsAreNotSuppressed(): void
     {
-        $stmt = $this->connection->prepare('SELECT * FROM SYSIBM.SYSDUMMY1 WHERE \'foo\' = ?');
+        $driverConnection = $this->connection->getWrappedConnection();
+
+        $stmt = $driverConnection->prepare('SELECT * FROM SYSIBM.SYSDUMMY1 WHERE \'foo\' = ?');
 
-        // unwrap the statement to prevent the wrapper from handling the PHPUnit-originated exception
-        $wrappedStmt = $stmt->getWrappedStatement();
+        // prevent the PHPUnit error handler from handling the errors that db2_execute() may trigger
+        $this->iniSet('error_reporting', (string) (E_ALL & ~E_WARNING & ~E_NOTICE));
 
-        $this->expectNotice();
-        $wrappedStmt->execute([[]]);
+        $this->expectException(StatementError::class);
+        $stmt->execute([[]]);
     }
 }

tests/Schema/SchemaTest.php

@@ -378,27 +378,19 @@ class SchemaTest extends TestCase
             ->method('acceptSchema')
             ->with($schema);
 
-        $visitor->expects(self::at(1))
-            ->method('acceptTable')
-            ->with($schema->getTable('baz'));
-
-        $visitor->expects(self::at(2))
+        $visitor->expects(self::exactly(2))
             ->method('acceptTable')
-            ->with($schema->getTable('bla.bloo'));
+            ->withConsecutive(
+                [$schema->getTable('baz')],
+                [$schema->getTable('bla.bloo')]
+            );
 
         $visitor->expects(self::exactly(2))
-            ->method('acceptTable');
-
-        $visitor->expects(self::at(3))
-            ->method('acceptSequence')
-            ->with($schema->getSequence('moo'));
-
-        $visitor->expects(self::at(4))
             ->method('acceptSequence')
-            ->with($schema->getSequence('war'));
-
-        $visitor->expects(self::exactly(2))
-            ->method('acceptSequence');
+            ->withConsecutive(
+                [$schema->getSequence('moo')],
+                [$schema->getSequence('war')]
+            );
 
         self::assertNull($schema->visit($visitor));
     }
@@ -436,10 +428,7 @@ class SchemaTest extends TestCase
             ->method('acceptNamespace')
             ->with('bla');
 
-        $visitor->expects(self::exactly(3))
-            ->method('acceptNamespace');
-
-        $visitor->expects(self::at(4))
+        $visitor->expects($this->at(4))
             ->method('acceptTable')
             ->with($schema->getTable('baz'));
 
@@ -447,10 +436,7 @@ class SchemaTest extends TestCase
             ->method('acceptTable')
             ->with($schema->getTable('bla.bloo'));
 
-        $visitor->expects(self::exactly(2))
-            ->method('acceptTable');
-
-        $visitor->expects(self::at(6))
+        $visitor->expects($this->at(6))
             ->method('acceptSequence')
             ->with($schema->getSequence('moo'));
 
@@ -458,9 +444,6 @@ class SchemaTest extends TestCase
             ->method('acceptSequence')
             ->with($schema->getSequence('war'));
 
-        $visitor->expects(self::exactly(2))
-            ->method('acceptSequence');
-
         self::assertNull($schema->visit($visitor));
     }
 }

tests/Schema/Visitor/DropSchemaSqlCollectorTest.php

@@ -29,15 +29,11 @@ class DropSchemaSqlCollectorTest extends TestCase
         $collector = new DropSchemaSqlCollector($platform);
 
         $platform->expects(self::exactly(2))
-            ->method('getDropForeignKeySQL');
-
-        $platform->expects(self::at(0))
-            ->method('getDropForeignKeySQL')
-            ->with($keyConstraintOne, $tableOne);
-
-        $platform->expects(self::at(1))
             ->method('getDropForeignKeySQL')
-            ->with($keyConstraintTwo, $tableTwo);
+            ->withConsecutive(
+                [$keyConstraintOne, $tableOne],
+                [$keyConstraintTwo, $tableTwo]
+            );
 
         $collector->acceptForeignKey($tableOne, $keyConstraintOne);
         $collector->acceptForeignKey($tableTwo, $keyConstraintTwo);

tests/Tools/Console/RunSqlCommandTest.php

@@ -25,10 +25,6 @@ class RunSqlCommandTest extends TestCase
     protected function setUp(): void
     {
         $this->connectionMock = $this->createMock(Connection::class);
-        $this->connectionMock->method('fetchAllAssociative')
-            ->willReturn([[1]]);
-        $this->connectionMock->method('executeUpdate')
-            ->willReturn(42);
 
         $application = new Application();
         $application->add(new RunSqlCommand(new SingleConnectionProvider($this->connectionMock)));
@@ -94,21 +90,25 @@ class RunSqlCommandTest extends TestCase
     private function expectConnectionExecuteUpdate(): void
     {
         $this->connectionMock
-            ->expects(self::exactly(1))
-            ->method('executeUpdate');
+            ->expects(self::once())
+            ->method('executeUpdate')
+            ->willReturn(42);
+
         $this->connectionMock
-            ->expects(self::exactly(0))
+            ->expects(self::never())
             ->method('fetchAllAssociative');
     }
 
     private function expectConnectionFetchAllAssociative(): void
     {
         $this->connectionMock
-            ->expects(self::exactly(0))
-            ->method('executeUpdate');
+            ->expects(self::once())
+            ->method('fetchAllAssociative')
+            ->willReturn([[1]]);
+
         $this->connectionMock
-            ->expects(self::exactly(1))
-            ->method('fetchAllAssociative');
+            ->expects(self::never())
+            ->method('executeUpdate');
     }
 
     public function testStatementsWithFetchResultPrintsResult(): void