minor #37831 stop using deprecated PHPUnit APIs (xabbuh)

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
symfony · Aug 17, 2020 · 50ad671 · 50ad671
2 parents e65c7f8 + 5b924ef
commit 50ad671
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Tests/Encoder/Base64EncoderTest.php b/Tests/Encoder/Base64EncoderTest.php
@@ -65,17 +65,17 @@ public function testPadLength()
         $encoder = new Base64Encoder();
         for ($i = 0; $i < 30; ++$i) {
             $input = pack('C', random_int(0, 255));
-            $this->assertRegExp('~^[a-zA-Z0-9/\+]{2}==$~', $encoder->encodeString($input), 'A single byte should have 2 bytes of padding');
+            $this->assertMatchesRegularExpression('~^[a-zA-Z0-9/\+]{2}==$~', $encoder->encodeString($input), 'A single byte should have 2 bytes of padding');
         }
 
         for ($i = 0; $i < 30; ++$i) {
             $input = pack('C*', random_int(0, 255), random_int(0, 255));
-            $this->assertRegExp('~^[a-zA-Z0-9/\+]{3}=$~', $encoder->encodeString($input), 'Two bytes should have 1 byte of padding');
+            $this->assertMatchesRegularExpression('~^[a-zA-Z0-9/\+]{3}=$~', $encoder->encodeString($input), 'Two bytes should have 1 byte of padding');
         }
 
         for ($i = 0; $i < 30; ++$i) {
             $input = pack('C*', random_int(0, 255), random_int(0, 255), random_int(0, 255));
-            $this->assertRegExp('~^[a-zA-Z0-9/\+]{4}$~', $encoder->encodeString($input), 'Three bytes should have no padding');
+            $this->assertMatchesRegularExpression('~^[a-zA-Z0-9/\+]{4}$~', $encoder->encodeString($input), 'Three bytes should have no padding');
         }
     }
 

diff --git a/Tests/Encoder/QpMimeHeaderEncoderTest.php b/Tests/Encoder/QpMimeHeaderEncoderTest.php
@@ -31,7 +31,7 @@ public function testSpaceAndTabNeverAppear()
         */
 
         $encoder = new QpMimeHeaderEncoder();
-        $this->assertNotRegExp('~[ \t]~', $encoder->encodeString("a \t b"), 'encoded-words in headers cannot contain LWSP as per RFC 2047.');
+        $this->assertDoesNotMatchRegularExpression('~[ \t]~', $encoder->encodeString("a \t b"), 'encoded-words in headers cannot contain LWSP as per RFC 2047.');
     }
 
     public function testSpaceIsRepresentedByUnderscore()

diff --git a/Tests/Encoder/Rfc2231EncoderTest.php b/Tests/Encoder/Rfc2231EncoderTest.php
@@ -38,7 +38,7 @@ public function testEncodingAsciiCharactersProducesValidToken()
         $encoded = $encoder->encodeString($string);
 
         foreach (explode("\r\n", $encoded) as $line) {
-            $this->assertRegExp($this->rfc2045Token, $line, 'Encoder should always return a valid RFC 2045 token.');
+            $this->assertMatchesRegularExpression($this->rfc2045Token, $line, 'Encoder should always return a valid RFC 2045 token.');
         }
     }
 
@@ -53,7 +53,7 @@ public function testEncodingNonAsciiCharactersProducesValidToken()
         $encoded = $encoder->encodeString($string);
 
         foreach (explode("\r\n", $encoded) as $line) {
-            $this->assertRegExp($this->rfc2045Token, $line, 'Encoder should always return a valid RFC 2045 token.');
+            $this->assertMatchesRegularExpression($this->rfc2045Token, $line, 'Encoder should always return a valid RFC 2045 token.');
         }
     }
 

diff --git a/Tests/Header/UnstructuredHeaderTest.php b/Tests/Header/UnstructuredHeaderTest.php
@@ -78,7 +78,7 @@ public function testPrintableAsciiOnlyAppearsInHeaders()
 
         $nonAsciiChar = pack('C', 0x8F);
         $header = new UnstructuredHeader('X-Test', $nonAsciiChar);
-        $this->assertRegExp('~^[^:\x00-\x20\x80-\xFF]+: [^\x80-\xFF\r\n]+$~s', $header->toString());
+        $this->assertMatchesRegularExpression('~^[^:\x00-\x20\x80-\xFF]+: [^\x80-\xFF\r\n]+$~s', $header->toString());
     }
 
     public function testEncodedWordsFollowGeneralStructure()
@@ -91,7 +91,7 @@ public function testEncodedWordsFollowGeneralStructure()
 
         $nonAsciiChar = pack('C', 0x8F);
         $header = new UnstructuredHeader('X-Test', $nonAsciiChar);
-        $this->assertRegExp('~^X-Test: \=?.*?\?.*?\?.*?\?=$~s', $header->toString());
+        $this->assertMatchesRegularExpression('~^X-Test: \=?.*?\?.*?\?.*?\?=$~s', $header->toString());
     }
 
     public function testEncodedWordIncludesCharsetAndEncodingMethodAndText()

diff --git a/Tests/Part/Multipart/FormDataPartTest.php b/Tests/Part/Multipart/FormDataPartTest.php
@@ -98,7 +98,7 @@ public function testBoundaryContentTypeHeader()
             'file' => new DataPart('data.csv', 'data.csv', 'text/csv'),
         ]);
         $headers = $f->getPreparedHeaders()->toArray();
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             '/^Content-Type: multipart\/form-data; boundary=[a-zA-Z0-9\-_]{8}$/',
             $headers[0]
         );