Forward compatibility with PHPUnit 9.3

doctrine · Jun 14, 2020 · 2a4eff1 · 2a4eff1
1 parent d200523
commit 2a4eff1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php b/tests/Doctrine/Tests/DBAL/Driver/OCI8/OCI8StatementTest.php
@@ -105,7 +105,7 @@ public static function executeDataProvider(): iterable
  public function testConvertNonTerminatedLiteral(string $sql, string $message): void
  {
  $this->expectException(OCI8Exception::class);
- $this->expectExceptionMessageRegExp($message);
+ $this->expectExceptionMessageMatches($message);
  OCI8Statement::convertPositionalToNamedPlaceholders($sql);
  }
 

diff --git a/tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php b/tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php
@@ -386,9 +386,6 @@ public function testVisitsVisitor(): void
  ->method('acceptTable')
  ->with($schema->getTable('bla.bloo'));
 
- $visitor->expects($this->exactly(2))
- ->method('acceptTable');
-
  $visitor->expects($this->at(3))
  ->method('acceptSequence')
  ->with($schema->getSequence('moo'));
@@ -397,9 +394,6 @@ public function testVisitsVisitor(): void
  ->method('acceptSequence')
  ->with($schema->getSequence('war'));
 
- $visitor->expects($this->exactly(2))
- ->method('acceptSequence');
-
  self::assertNull($schema->visit($visitor));
  }
 
@@ -436,9 +430,6 @@ public function testVisitsNamespaceVisitor(): void
  ->method('acceptNamespace')
  ->with('bla');
 
- $visitor->expects($this->exactly(3))
- ->method('acceptNamespace');
-
  $visitor->expects($this->at(4))
  ->method('acceptTable')
  ->with($schema->getTable('baz'));
@@ -447,9 +438,6 @@ public function testVisitsNamespaceVisitor(): void
  ->method('acceptTable')
  ->with($schema->getTable('bla.bloo'));
 
- $visitor->expects($this->exactly(2))
- ->method('acceptTable');
-
  $visitor->expects($this->at(6))
  ->method('acceptSequence')
  ->with($schema->getSequence('moo'));
@@ -458,9 +446,6 @@ public function testVisitsNamespaceVisitor(): void
  ->method('acceptSequence')
  ->with($schema->getSequence('war'));
 
- $visitor->expects($this->exactly(2))
- ->method('acceptSequence');
-
  self::assertNull($schema->visit($visitor));
  }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Schema/Visitor/DropSchemaSqlCollectorTest.php b/tests/Doctrine/Tests/DBAL/Schema/Visitor/DropSchemaSqlCollectorTest.php
@@ -28,9 +28,6 @@ public function testGetQueriesUsesAcceptedForeignKeys(): void
 
  $collector = new DropSchemaSqlCollector($platform);
 
- $platform->expects($this->exactly(2))
- ->method('getDropForeignKeySQL');
-
  $platform->expects($this->at(0))
  ->method('getDropForeignKeySQL')
  ->with($keyConstraintOne, $tableOne);

diff --git a/tests/Doctrine/Tests/DBAL/Tools/Console/RunSqlCommandTest.php b/tests/Doctrine/Tests/DBAL/Tools/Console/RunSqlCommandTest.php
@@ -31,10 +31,6 @@ protected function setUp(): void
  $this->commandTester = new CommandTester($this->command);
 
  $this->connectionMock = $this->createMock(Connection::class);
- $this->connectionMock->method('fetchAllAssociative')
- ->willReturn([[1]]);
- $this->connectionMock->method('executeUpdate')
- ->willReturn(42);
 
  $helperSet = ConsoleRunner::createHelperSet($this->connectionMock);
  $this->command->setHelperSet($helperSet);
@@ -97,21 +93,25 @@ public function testUpdateStatementsPrintsAffectedLines(): void
  private function expectConnectionExecuteUpdate(): void
  {
  $this->connectionMock
- ->expects($this->exactly(1))
- ->method('executeUpdate');
+ ->expects($this->once())
+ ->method('executeUpdate')
+ ->willReturn(42);
+
  $this->connectionMock
- ->expects($this->exactly(0))
+ ->expects($this->never())
  ->method('fetchAllAssociative');
  }
 
  private function expectConnectionFetchAllAssociative(): void
  {
  $this->connectionMock
- ->expects($this->exactly(0))
- ->method('executeUpdate');
+ ->expects($this->once())
+ ->method('fetchAllAssociative')
+ ->willReturn([[1]]);
+
  $this->connectionMock
- ->expects($this->exactly(1))
- ->method('fetchAllAssociative');
+ ->expects($this->never())
+ ->method('executeUpdate');
  }
 
  public function testStatementsWithFetchResultPrintsResult(): void