Modernized deprecated PHPUnit assertion calls

derrabus · fabpot · commit 389cb6c90c97 · 2020-08-09T10:13:48.000+02:00
diff --git a/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -87,6 +87,6 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
         }
         $containerRef = new \ReflectionClass(require $containerFile);
         $containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());
-        $this->assertRegExp(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
+        $this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
     }
 }
diff --git a/Tests/Command/RouterDebugCommandTest.php b/Tests/Command/RouterDebugCommandTest.php
@@ -58,7 +58,7 @@ public function testLegacyDebugCommand()
 
         $tester->execute([]);
 
-        $this->assertRegExp('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());
     }
 
     /**
diff --git a/Tests/Command/TranslationDebugCommandTest.php b/Tests/Command/TranslationDebugCommandTest.php
@@ -28,40 +28,40 @@ public function testDebugMissingMessages()
         $tester = $this->createCommandTester(['foo' => 'foo']);
         $tester->execute(['locale' => 'en', 'bundle' => 'foo']);
 
-        $this->assertRegExp('/missing/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
     }
 
     public function testDebugUnusedMessages()
     {
         $tester = $this->createCommandTester([], ['foo' => 'foo']);
         $tester->execute(['locale' => 'en', 'bundle' => 'foo']);
 
-        $this->assertRegExp('/unused/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
     }
 
     public function testDebugFallbackMessages()
     {
         $tester = $this->createCommandTester([], ['foo' => 'foo']);
         $tester->execute(['locale' => 'fr', 'bundle' => 'foo']);
 
-        $this->assertRegExp('/fallback/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/fallback/', $tester->getDisplay());
     }
 
     public function testNoDefinedMessages()
     {
         $tester = $this->createCommandTester();
         $tester->execute(['locale' => 'fr', 'bundle' => 'test']);
 
-        $this->assertRegExp('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());
     }
 
     public function testDebugDefaultDirectory()
     {
         $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()
@@ -75,8 +75,8 @@ public function testDebugDefaultRootDirectory()
         $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 testDebugCustomDirectory()
@@ -90,8 +90,8 @@ public function testDebugCustomDirectory()
         $tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar'], $kernel);
         $tester->execute(['locale' => 'en', 'bundle' => $this->translationDir]);
 
-        $this->assertRegExp('/missing/', $tester->getDisplay());
-        $this->assertRegExp('/unused/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());
     }
 
     public function testDebugInvalidDirectory()
diff --git a/Tests/Command/TranslationUpdateCommandTest.php b/Tests/Command/TranslationUpdateCommandTest.php
@@ -27,8 +27,8 @@ public function testDumpMessagesAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
-        $this->assertRegExp('/foo/', $tester->getDisplay());
-        $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpMessagesAndCleanInRootDirectory()
@@ -40,32 +40,32 @@ public function testDumpMessagesAndCleanInRootDirectory()
 
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', '--dump-messages' => true, '--clean' => true]);
-        $this->assertRegExp('/foo/', $tester->getDisplay());
-        $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpTwoMessagesAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
-        $this->assertRegExp('/foo/', $tester->getDisplay());
-        $this->assertRegExp('/bar/', $tester->getDisplay());
-        $this->assertRegExp('/2 messages were successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/bar/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/2 messages were successfully extracted/', $tester->getDisplay());
     }
 
     public function testDumpMessagesForSpecificDomain()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--domain' => 'mydomain']);
-        $this->assertRegExp('/bar/', $tester->getDisplay());
-        $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/bar/', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
     }
 
     public function testWriteMessages()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true]);
-        $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
     public function testWriteMessagesInRootDirectory()
@@ -77,14 +77,14 @@ public function testWriteMessagesInRootDirectory()
 
         $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()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);
         $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--domain' => 'mydomain']);
-        $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
+        $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
     protected function setUp()

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,6 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()`
`87`	`87`	`}`
`88`	`88`	`$containerRef = new \ReflectionClass(require $containerFile);`
`89`	`89`	`$containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());`
`90`		`- $this->assertRegExp(sprintf('/\'kernel.container_class\'\s=>\s\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');`
	`90`	`+ $this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s=>\s\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function testLegacyDebugCommand()`
`58`	`58`
`59`	`59`	`$tester->execute([]);`
`60`	`60`
`61`		`- $this->assertRegExp('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());`
	`61`	`+ $this->assertMatchesRegularExpression('/foo\s+ANY\s+ANY\s+ANY\s+\\/foo/', $tester->getDisplay());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -28,40 +28,40 @@ public function testDebugMissingMessages()`
`28`	`28`	`$tester = $this->createCommandTester(['foo' => 'foo']);`
`29`	`29`	`$tester->execute(['locale' => 'en', 'bundle' => 'foo']);`
`30`	`30`
`31`		`- $this->assertRegExp('/missing/', $tester->getDisplay());`
	`31`	`+ $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function testDebugUnusedMessages()`
`35`	`35`	`{`
`36`	`36`	`$tester = $this->createCommandTester([], ['foo' => 'foo']);`
`37`	`37`	`$tester->execute(['locale' => 'en', 'bundle' => 'foo']);`
`38`	`38`
`39`		`- $this->assertRegExp('/unused/', $tester->getDisplay());`
	`39`	`+ $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function testDebugFallbackMessages()`
`43`	`43`	`{`
`44`	`44`	`$tester = $this->createCommandTester([], ['foo' => 'foo']);`
`45`	`45`	`$tester->execute(['locale' => 'fr', 'bundle' => 'foo']);`
`46`	`46`
`47`		`- $this->assertRegExp('/fallback/', $tester->getDisplay());`
	`47`	`+ $this->assertMatchesRegularExpression('/fallback/', $tester->getDisplay());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function testNoDefinedMessages()`
`51`	`51`	`{`
`52`	`52`	`$tester = $this->createCommandTester();`
`53`	`53`	`$tester->execute(['locale' => 'fr', 'bundle' => 'test']);`
`54`	`54`
`55`		`- $this->assertRegExp('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());`
	`55`	`+ $this->assertMatchesRegularExpression('/No defined or extracted messages for locale "fr"/', $tester->getDisplay());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function testDebugDefaultDirectory()`
`59`	`59`	`{`
`60`	`60`	`$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);`
`61`	`61`	`$tester->execute(['locale' => 'en']);`
`62`	`62`
`63`		`- $this->assertRegExp('/missing/', $tester->getDisplay());`
`64`		`- $this->assertRegExp('/unused/', $tester->getDisplay());`
	`63`	`+ $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());`
	`64`	`+ $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public function testDebugDefaultRootDirectory()`
`@@ -75,8 +75,8 @@ public function testDebugDefaultRootDirectory()`
`75`	`75`	`$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar']);`
`76`	`76`	`$tester->execute(['locale' => 'en']);`
`77`	`77`
`78`		`- $this->assertRegExp('/missing/', $tester->getDisplay());`
`79`		`- $this->assertRegExp('/unused/', $tester->getDisplay());`
	`78`	`+ $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());`
	`79`	`+ $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public function testDebugCustomDirectory()`
`@@ -90,8 +90,8 @@ public function testDebugCustomDirectory()`
`90`	`90`	`$tester = $this->createCommandTester(['foo' => 'foo'], ['bar' => 'bar'], $kernel);`
`91`	`91`	`$tester->execute(['locale' => 'en', 'bundle' => $this->translationDir]);`
`92`	`92`
`93`		`- $this->assertRegExp('/missing/', $tester->getDisplay());`
`94`		`- $this->assertRegExp('/unused/', $tester->getDisplay());`
	`93`	`+ $this->assertMatchesRegularExpression('/missing/', $tester->getDisplay());`
	`94`	`+ $this->assertMatchesRegularExpression('/unused/', $tester->getDisplay());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`public function testDebugInvalidDirectory()`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ public function testDumpMessagesAndClean()`
`27`	`27`	`{`
`28`	`28`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);`
`29`	`29`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);`
`30`		`- $this->assertRegExp('/foo/', $tester->getDisplay());`
`31`		`- $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());`
	`30`	`+ $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());`
	`31`	`+ $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function testDumpMessagesAndCleanInRootDirectory()`
`@@ -40,32 +40,32 @@ public function testDumpMessagesAndCleanInRootDirectory()`
`40`	`40`
`41`	`41`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);`
`42`	`42`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', '--dump-messages' => true, '--clean' => true]);`
`43`		`- $this->assertRegExp('/foo/', $tester->getDisplay());`
`44`		`- $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());`
	`43`	`+ $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());`
	`44`	`+ $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function testDumpTwoMessagesAndClean()`
`48`	`48`	`{`
`49`	`49`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'bar' => 'bar']]);`
`50`	`50`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);`
`51`		`- $this->assertRegExp('/foo/', $tester->getDisplay());`
`52`		`- $this->assertRegExp('/bar/', $tester->getDisplay());`
`53`		`- $this->assertRegExp('/2 messages were successfully extracted/', $tester->getDisplay());`
	`51`	`+ $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());`
	`52`	`+ $this->assertMatchesRegularExpression('/bar/', $tester->getDisplay());`
	`53`	`+ $this->assertMatchesRegularExpression('/2 messages were successfully extracted/', $tester->getDisplay());`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function testDumpMessagesForSpecificDomain()`
`57`	`57`	`{`
`58`	`58`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);`
`59`	`59`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true, '--domain' => 'mydomain']);`
`60`		`- $this->assertRegExp('/bar/', $tester->getDisplay());`
`61`		`- $this->assertRegExp('/1 message was successfully extracted/', $tester->getDisplay());`
	`60`	`+ $this->assertMatchesRegularExpression('/bar/', $tester->getDisplay());`
	`61`	`+ $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function testWriteMessages()`
`65`	`65`	`{`
`66`	`66`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);`
`67`	`67`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true]);`
`68`		`- $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());`
	`68`	`+ $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public function testWriteMessagesInRootDirectory()`
`@@ -77,14 +77,14 @@ public function testWriteMessagesInRootDirectory()`
`77`	`77`
`78`	`78`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);`
`79`	`79`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', '--force' => true]);`
`80`		`- $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());`
	`80`	`+ $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public function testWriteMessagesForSpecificDomain()`
`84`	`84`	`{`
`85`	`85`	`$tester = $this->createCommandTester(['messages' => ['foo' => 'foo'], 'mydomain' => ['bar' => 'bar']]);`
`86`	`86`	`$tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--domain' => 'mydomain']);`
`87`		`- $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());`
	`87`	`+ $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`protected function setUp()`