Build/Test Tools: Implement use of the void solution.

> PHPUnit 8.0.0 introduced a `void` return type declaration to the "fixture" methods – `setUpBeforeClass()`, `setUp()`, `tearDown()` and `tearDownAfterClass()`. As the `void` return type was not introduced until PHP 7.1, this makes it more difficult to create cross-version compatible tests when using fixtures, due to signature mismatches.
>
> The `Yoast\PHPUnitPolyfills\TestCases\TestCase` overcomes the signature mismatch by having two versions. The correct one will be loaded depending on the PHPUnit version being used.
>
> When using this TestCase, if an individual test, or another TestCase which extends this TestCase, needs to overload any of the "fixture" methods, it should do so by using a snake_case variant of the original fixture method name, i.e. `set_up_before_class()`, `set_up()`, `assert_pre_conditions()`, `assert_post_conditions()`, `tear_down()`, and `tear_down_after_class()`.
>
> The snake_case methods will automatically be called by PHPUnit.
>
> > IMPORTANT: The snake_case methods should not call the PHPUnit parent, i.e. do not use `parent::setUp()` from within an overloaded `set_up()` method. If necessary, DO call `parent::set_up()`.

Reference: https://github.com/Yoast/PHPUnit-Polyfills#testcases

This commit renames all declared fixture methods, and calls to parent versions of those fixture methods, from camelCase to snake_case.

Follow-up to [51559-51567].

Props jrf, hellofromTonya, johnbillion, netweb, dd32, pputzer, SergeyBiryukov.
See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51568 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2021-08-07 10:29:41 +00:00
parent cb6bf02638
commit ddb409edca
260 changed files with 726 additions and 726 deletions

View File

@@ -7,15 +7,15 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
public $q;
public static $post_type = 'page'; // Can be anything.
public function setUp() {
parent::setUp();
public function set_up() {
parent::set_up();
unset( $this->q );
$this->q = new WP_Query();
}
public function tearDown() {
public function tear_down() {
unset( $this->q );
parent::tearDown();
parent::tear_down();
}
public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {

View File

@@ -14,8 +14,8 @@ class Tests_Query_Conditionals extends WP_UnitTestCase {
protected $page_ids;
protected $post_ids;
function setUp() {
parent::setUp();
function set_up() {
parent::set_up();
update_option( 'comments_per_page', 5 );
update_option( 'posts_per_page', 5 );

View File

@@ -45,8 +45,8 @@ class Tests_Query_Date extends WP_UnitTestCase {
}
}
public function setUp() {
parent::setUp();
public function set_up() {
parent::set_up();
unset( $this->q );
$this->q = new WP_Query();
}

View File

@@ -13,8 +13,8 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
public $q;
public function setUp() {
parent::setUp();
public function set_up() {
parent::set_up();
unset( $this->q );
$this->q = new WP_Query();
}

View File

@@ -62,8 +62,8 @@ class Tests_Query_InvalidQueries extends WP_UnitTestCase {
/**
* Set up prior to each test.
*/
public function setUp() {
parent::setUp();
public function set_up() {
parent::set_up();
// Clean up variable before each test.
self::$last_posts_request = '';

View File

@@ -22,8 +22,8 @@ class Tests_Query_IsTerm extends WP_UnitTestCase {
protected $tag;
protected $tax;
function setUp() {
parent::setUp();
function set_up() {
parent::set_up();
$GLOBALS['wp_the_query'] = new WP_Query();
$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];

View File

@@ -78,8 +78,8 @@ class Tests_Query_PostStatus extends WP_UnitTestCase {
);
}
public function setUp() {
parent::setUp();
public function set_up() {
parent::set_up();
self::register_custom_post_objects();
}

View File

@@ -294,8 +294,8 @@ class Tests_Query_Results extends WP_UnitTestCase {
self::$post_ids[] = self::$child_four;
}
function setUp() {
parent::setUp();
function set_up() {
parent::set_up();
unset( $this->q );
$this->q = new WP_Query();

View File

@@ -7,8 +7,8 @@ class Tests_Query_Search extends WP_UnitTestCase {
protected $q;
protected $post_type;
function setUp() {
parent::setUp();
function set_up() {
parent::set_up();
$this->post_type = rand_str( 12 );
register_post_type( $this->post_type );
@@ -16,10 +16,10 @@ class Tests_Query_Search extends WP_UnitTestCase {
$this->q = new WP_Query();
}
function tearDown() {
function tear_down() {
unset( $this->q );
parent::tearDown();
parent::tear_down();
}
function get_search_results( $terms ) {

View File

@@ -7,8 +7,8 @@ require_once __DIR__ . '/conditionals.php';
* @group rewrite
*/
class Tests_Query_VerbosePageRules extends Tests_Query_Conditionals {
function setUp() {
parent::setUp();
function set_up() {
parent::set_up();
$this->set_permalink_structure( '/%category%/%year%/%postname%/' );
create_initial_taxonomies();