From 84cb88211561cea2f40457275bc9e121f9648190 Mon Sep 17 00:00:00 2001 From: sikofitt Date: Wed, 20 Jan 2021 14:44:22 -0800 Subject: [PATCH] PHPUnit 9.x fix --- tests/GenerateMacCommandTest.php | 4 ++-- tests/MacTest.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/GenerateMacCommandTest.php b/tests/GenerateMacCommandTest.php index 2655fb5..c61e43a 100644 --- a/tests/GenerateMacCommandTest.php +++ b/tests/GenerateMacCommandTest.php @@ -49,7 +49,7 @@ class GenerateMacCommandTest extends TestCase { $this->commandTester->execute([]); $display = $this->commandTester->getDisplay(); - $this->assertContains('// Generated 1 mac addresses', $display); + $this->assertStringContainsString('// Generated 1 mac addresses', $display); $this->assertSame(0, $this->commandTester->getStatusCode()); $this->expectException(\RuntimeException::class); $this->commandTester->execute(['--count' => -1]); @@ -65,7 +65,7 @@ class GenerateMacCommandTest extends TestCase public function testPlain(): void { $this->commandTester->execute(['--output' => 'plain', '--count' => 1]); - $this->assertRegExp(self::REGEX, $this->commandTester->getDisplay()); + $this->assertMatchesRegularExpression(self::REGEX, $this->commandTester->getDisplay()); $this->assertSame(0, $this->commandTester->getStatusCode()); } diff --git a/tests/MacTest.php b/tests/MacTest.php index da99e7b..a91abc3 100644 --- a/tests/MacTest.php +++ b/tests/MacTest.php @@ -36,10 +36,10 @@ class MacTest extends TestCase $this->assertCount(50, $macAddresses); foreach ($macAddresses as $address) { - $this->assertRegExp(self::REGEX, $address); + $this->assertMatchesRegularExpression(self::REGEX, $address); } - $this->assertRegExp(self::REGEX, $mac->getMacAddress()); + $this->assertMatchesRegularExpression(self::REGEX, $mac->getMacAddress()); $this->assertSame(Mac::SEPARATOR_COLON, $mac->getSeparator()); $this->assertTrue($mac->getUnique()); } @@ -49,10 +49,10 @@ class MacTest extends TestCase $mac = new Mac(Mac::SEPARATOR_DASH); $this->assertSame(Mac::SEPARATOR_DASH, $mac->getSeparator()); - $this->assertRegExp(self::REGEX, $mac->getMacAddress()); + $this->assertMatchesRegularExpression(self::REGEX, $mac->getMacAddress()); $mac->setSeparator(Mac::SEPARATOR_COLON); $this->assertSame(Mac::SEPARATOR_COLON, $mac->getSeparator()); - $this->assertRegExp(self::REGEX, $mac->getMacAddress()); + $this->assertMatchesRegularExpression(self::REGEX, $mac->getMacAddress()); $this->assertNotFalse(strpos($mac->getMacAddress(), ':')); }