Changeset 51565 for trunk/tests/phpunit/tests/comment/commentForm.php

Timestamp:

08/06/2021 09:52:06 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertRegExp() with assertMatchesRegularExpression().

The assertRegExp() and assertNotRegExp() methods were hard deprecated in PHPUnit 9.1 and the functionality will be removed in PHPUnit 10.0.

The assertMatchesRegularExpression() and assertDoesNotMatchRegularExpression() methods were introduced as a replacement in PHPUnit 9.1.

These new PHPUnit methods are polyfilled by the PHPUnit Polyfills and switching to them will future-proof the tests some more.

References:

• ​https://github.com/sebastianbergmann/phpunit/blob/9.1.5/ChangeLog-9.1.md#910---2020-04-03
• ​https://github.com/sebastianbergmann/phpunit/issues/4085
• ​https://github.com/sebastianbergmann/phpunit/issues/4088

Follow-up to [51559-51564].

Props jrf.
See #46149.

File:

• trunk/tests/phpunit/tests/comment/commentForm.php (modified) (4 diffs)

trunk/tests/phpunit/tests/comment/commentForm.php

@@ -19 +19 @@
         $button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
         $hidden = get_comment_id_fields( $p );
-        $this->assertRegExp( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
+        $this->assertMatchesRegularExpression( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
     }
 
@@ -54 +54 @@
         $button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
         $hidden = get_comment_id_fields( $p );
-        $this->assertRegExp( '|<p class="my\-custom\-submit\-field">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
+        $this->assertMatchesRegularExpression( '|<p class="my\-custom\-submit\-field">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
     }
 
@@ -76 +76 @@
         $button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
         $hidden = get_comment_id_fields( $p );
-        $this->assertRegExp( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
+        $this->assertMatchesRegularExpression( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
     }
 
@@ -103 +103 @@
         remove_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
 
-        $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
+        $this->assertMatchesRegularExpression( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
     }