PHPUnit 10 fixes

Author: aik099

tests/DatabaseMigration/AbstractDatabaseAwareTestCase.php

@@ -69,7 +69,7 @@ protected function assertTableEmpty($table_name)
 	 */
 	protected function assertTableContent($table_name, array $expected_content)
 	{
-		$this->assertSame(
+		$this->assertEquals(
 			$expected_content,
 			$this->_dumpTable($table_name),
 			'Table "' . $table_name . '" content isn\'t correct.'

tests/DatabaseMigration/AbstractMigrationRunnerTestCase.php

@@ -13,6 +13,8 @@
 
 use ConsoleHelpers\DatabaseMigration\AbstractMigrationRunner;
 use Prophecy\Prophecy\ObjectProphecy;
+use Aura\Sql\ExtendedPdoInterface;
+use ConsoleHelpers\DatabaseMigration\MigrationContext;
 
 abstract class AbstractMigrationRunnerTestCase extends AbstractTestCase
 {
@@ -44,9 +46,9 @@ abstract class AbstractMigrationRunnerTestCase extends AbstractTestCase
 	 */
 	protected function setupTest()
 	{
-		$this->database = $this->prophesize('Aura\Sql\ExtendedPdoInterface');
+		$this->database = $this->prophesize(ExtendedPdoInterface::class);
 
-		$this->context = $this->prophesize('ConsoleHelpers\DatabaseMigration\MigrationContext');
+		$this->context = $this->prophesize(MigrationContext::class);
 		$this->context->getDatabase()->willReturn($this->database);
 
 		$this->runner = $this->createMigrationRunner();

tests/DatabaseMigration/AbstractTestCase.php

@@ -17,4 +17,21 @@
 abstract class AbstractTestCase extends TestCase
 {
 	use ProphecyTrait;
+
+	/**
+	 * Returns a test name.
+	 *
+	 * @return string
+	 */
+	protected function getTestName()
+	{
+		if ( method_exists($this, 'getName') ) {
+			// PHPUnit 9-.
+			return $this->getName(false);
+		}
+
+		// PHPUnit 10+.
+		return $this->name();
+	}
+
 }

tests/DatabaseMigration/MigrationContextTest.php

@@ -44,7 +44,7 @@ class MigrationContextTest extends AbstractTestCase
 	 */
 	protected function setupTest()
 	{
-		$this->database = $this->prophesize('Aura\Sql\ExtendedPdoInterface')->reveal();
+		$this->database = $this->prophesize(ExtendedPdoInterface::class)->reveal();
 		$this->container = $this->prophesize('ArrayAccess')->reveal();
 
 		$this->context = new MigrationContext($this->database);

tests/DatabaseMigration/MigrationManagerTest.php

@@ -18,6 +18,7 @@
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Tests\ConsoleHelpers\DatabaseMigration\ProphecyToken\RegExToken;
+use ConsoleHelpers\DatabaseMigration\AbstractMigrationRunner;
 
 class MigrationManagerTest extends AbstractDatabaseAwareTestCase
 {
@@ -54,7 +55,7 @@ protected function setupTest()
 	 */
 	protected function tearDownTest()
 	{
-		if ( strpos($this->getName(false), 'testCreateMigration') === 0 ) {
+		if ( strpos($this->getTestName(), 'testCreateMigration') === 0 ) {
 			$this->deleteTempMigrations();
 		}
 	}
@@ -110,7 +111,7 @@ public function testCreateMigrationWithInvalidName($migration_name)
 		$manager->createMigration($migration_name, 'one');
 	}
 
-	public function createMigrationWithInvalidNameDataProvider()
+	public static function createMigrationWithInvalidNameDataProvider()
 	{
 		return array(
 			array(' '),
@@ -292,7 +293,7 @@ public function testRunRemovedMigrationsAreDeleted()
 
 	public function testRunSetsContainerToContext()
 	{
-		$context = $this->prophesize('ConsoleHelpers\DatabaseMigration\MigrationContext');
+		$context = $this->prophesize(MigrationContext::class);
 		$context->setContainer($this->container)->shouldBeCalled();
 		$context->getDatabase()->willReturn($this->database)->shouldBeCalled();
 
@@ -340,7 +341,7 @@ protected function deleteTempMigrations()
 	 */
 	protected function createMigrationRunnerMock($file_extension)
 	{
-		$runner = $this->prophesize('ConsoleHelpers\DatabaseMigration\AbstractMigrationRunner');
+		$runner = $this->prophesize(AbstractMigrationRunner::class);
 		$runner->getFileExtension()->willReturn($file_extension)->shouldBeCalled();
 
 		return $runner;

tests/DatabaseMigration/PhpMigrationRunnerTest.php

@@ -32,7 +32,8 @@ public function testRunMalformedPHPMigration()
 
 	public function testRun()
 	{
-		$this->database->perform('test')->shouldBeCalled();
+		$pdo_statement = $this->prophesize(\PDOStatement::class)->reveal();
+		$this->database->perform('test')->willReturn($pdo_statement)->shouldBeCalled();
 
 		$this->runner->run($this->getFixture('non-empty-migration.php'), $this->context->reveal());
 	}

tests/DatabaseMigration/SqlMigrationRunnerTest.php

@@ -34,11 +34,14 @@ public function testRunEmptySQLMigration()
 	public function testRun()
 	{
 		$sequence = array();
+		$pdo_statement = $this->prophesize(\PDOStatement::class)->reveal();
 
 		$this->database
 			->perform(Argument::any())
-			->will(function (array $args) use (&$sequence) {
+			->will(function (array $args) use (&$sequence, $pdo_statement) {
 				$sequence[] = $args[0];
+
+				return $pdo_statement;
 			})
 			->shouldBeCalled();