minor #37831 stop using deprecated PHPUnit APIs (xabbuh)

fabpot · fabpot · commit 166b795abf0d · 2020-08-17T11:56:45.000+02:00
This PR was merged into the 4.4 branch.

Discussion
----------

stop using deprecated PHPUnit APIs

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       |
| License       | MIT
| Doc PR        |

Commits
-------

3d209c46e4 stop using deprecated PHPUnit APIs
diff --git a/Tests/Command/TranslationDebugCommandTest.php b/Tests/Command/TranslationDebugCommandTest.php
@@ -78,8 +78,8 @@ public function testDebugLegacyDefaultDirectory()
         $tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);
         $tester->execute(['locale' => 'en']);
 
-        $this->assertRegExp('/missing/', $tester->getDisplay());
-        $this->assertRegExp('/unused/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
     }
 
     public function testDebugDefaultRootDirectory()
diff --git a/Tests/Command/TranslationUpdateCommandTest.php b/Tests/Command/TranslationUpdateCommandTest.php
@@ -36,31 +36,31 @@ public function testDumpSortedMessagesAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort' => 'asc']);
-        $this->assertRegExp("/\*bar\*foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));
-        $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression("/\*bar\*foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));
+        $this->assertMatchesRegularExpression('/3 messages were successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpReverseSortedMessagesAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort' => 'desc']);
-        $this->assertRegExp("/\*test\*foo\*bar/", preg_replace('/\s+/', '', $tester->getDisplay()));
-        $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression("/\*test\*foo\*bar/", preg_replace('/\s+/', '', $tester->getDisplay()));
+        $this->assertMatchesRegularExpression('/3 messages were successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpSortWithoutValueAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort']);
-        $this->assertRegExp("/\*bar\*foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));
-        $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression("/\*bar\*foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));
+        $this->assertMatchesRegularExpression('/3 messages were successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpWrongSortAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort' => 'test']);
-        $this->assertRegExp('/\[ERROR\] Wrong sort order/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/\[ERROR\] Wrong sort order/', $tester->getDisplay());
     }
 
     public function testDumpMessagesAndCleanInRootDirectory()
@@ -126,7 +126,7 @@ public function testWriteMessagesInLegacyRootDirectory()
 
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', '--force' => true]);
-        $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
     public function testWriteMessagesForSpecificDomain()
diff --git a/Tests/Console/ApplicationTest.php b/Tests/Console/ApplicationTest.php
@@ -232,19 +232,19 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
     public function testSuggestingPackagesWithExactMatch()
     {
         $result = $this->createEventForSuggestingPackages('server:dump', []);
-        $this->assertRegExp('/You may be looking for a command provided by/', $result);
+        $this->assertMatchesRegularExpression('/You may be looking for a command provided by/', $result);
     }
 
     public function testSuggestingPackagesWithPartialMatchAndNoAlternatives()
     {
         $result = $this->createEventForSuggestingPackages('server', []);
-        $this->assertRegExp('/You may be looking for a command provided by/', $result);
+        $this->assertMatchesRegularExpression('/You may be looking for a command provided by/', $result);
     }
 
     public function testSuggestingPackagesWithPartialMatchAndAlternatives()
     {
         $result = $this->createEventForSuggestingPackages('server', ['server:run']);
-        $this->assertNotRegExp('/You may be looking for a command provided by/', $result);
+        $this->assertDoesNotMatchRegularExpression('/You may be looking for a command provided by/', $result);
     }
 
     private function createEventForSuggestingPackages(string $command, array $alternatives = []): string

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ public function testDebugLegacyDefaultDirectory()`
`78`	`78`	`$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);`
`79`	`79`	`$tester->execute(['locale' => 'en']);`
`80`	`80`
`81`		`- $this->assertRegExp('/missing/', $tester->getDisplay());`
`82`		`- $this->assertRegExp('/unused/', $tester->getDisplay());`
	`81`	`+ $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());`
	`82`	`+ $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public function testDebugDefaultRootDirectory()`
Original file line number	Diff line number	Diff line change
`@@ -36,31 +36,31 @@ public function testDumpSortedMessagesAndClean()`
`36`	`36`	`{`
`37`	`37`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);`
`38`	`38`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort' => 'asc']);`
`39`		`- $this->assertRegExp("/\bar\foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));`
`40`		`- $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());`
	`39`	`+ $this->assertMatchesRegularExpression("/\bar\foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));`
	`40`	`+ $this->assertMatchesRegularExpression('/3 messages were successfully extracted/', $tester->getDisplay());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public function testDumpReverseSortedMessagesAndClean()`
`44`	`44`	`{`
`45`	`45`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);`
`46`	`46`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort' => 'desc']);`
`47`		`- $this->assertRegExp("/\test\foo\*bar/", preg_replace('/\s+/', '', $tester->getDisplay()));`
`48`		`- $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());`
	`47`	`+ $this->assertMatchesRegularExpression("/\test\foo\*bar/", preg_replace('/\s+/', '', $tester->getDisplay()));`
	`48`	`+ $this->assertMatchesRegularExpression('/3 messages were successfully extracted/', $tester->getDisplay());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function testDumpSortWithoutValueAndClean()`
`52`	`52`	`{`
`53`	`53`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);`
`54`	`54`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort']);`
`55`		`- $this->assertRegExp("/\bar\foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));`
`56`		`- $this->assertRegExp('/3 messages were successfully extracted/', $tester->getDisplay());`
	`55`	`+ $this->assertMatchesRegularExpression("/\bar\foo\*test/", preg_replace('/\s+/', '', $tester->getDisplay()));`
	`56`	`+ $this->assertMatchesRegularExpression('/3 messages were successfully extracted/', $tester->getDisplay());`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function testDumpWrongSortAndClean()`
`60`	`60`	`{`
`61`	`61`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']]);`
`62`	`62`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--sort' => 'test']);`
`63`		`- $this->assertRegExp('/\[ERROR\] Wrong sort order/', $tester->getDisplay());`
	`63`	`+ $this->assertMatchesRegularExpression('/\[ERROR\] Wrong sort order/', $tester->getDisplay());`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function testDumpMessagesAndCleanInRootDirectory()`
`@@ -126,7 +126,7 @@ public function testWriteMessagesInLegacyRootDirectory()`
`126`	`126`
`127`	`127`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);`
`128`	`128`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', '--force' => true]);`
`129`		`- $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());`
	`129`	`+ $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`public function testWriteMessagesForSpecificDomain()`
Original file line number	Diff line number	Diff line change
`@@ -232,19 +232,19 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()`
`232`	`232`	`public function testSuggestingPackagesWithExactMatch()`
`233`	`233`	`{`
`234`	`234`	`$result = $this->createEventForSuggestingPackages('server:dump', []);`
`235`		`- $this->assertRegExp('/You may be looking for a command provided by/', $result);`
	`235`	`+ $this->assertMatchesRegularExpression('/You may be looking for a command provided by/', $result);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`public function testSuggestingPackagesWithPartialMatchAndNoAlternatives()`
`239`	`239`	`{`
`240`	`240`	`$result = $this->createEventForSuggestingPackages('server', []);`
`241`		`- $this->assertRegExp('/You may be looking for a command provided by/', $result);`
	`241`	`+ $this->assertMatchesRegularExpression('/You may be looking for a command provided by/', $result);`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`public function testSuggestingPackagesWithPartialMatchAndAlternatives()`
`245`	`245`	`{`
`246`	`246`	`$result = $this->createEventForSuggestingPackages('server', ['server:run']);`
`247`		`- $this->assertNotRegExp('/You may be looking for a command provided by/', $result);`
	`247`	`+ $this->assertDoesNotMatchRegularExpression('/You may be looking for a command provided by/', $result);`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`private function createEventForSuggestingPackages(string $command, array $alternatives = []): string`