Merge branch '4.4' into 5.1

* 4.4:
  stop using deprecated PHPUnit APIs

Author: fabpot

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()

Tests/Console/ApplicationTest.php

@@ -209,19 +209,19 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
     public function testSuggestingPackagesWithExactMatch()
     {
         $result = $this->createEventForSuggestingPackages('doctrine:fixtures', []);
-        $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