diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 194b1c0ba10ec0bac6d6ebe82d802a93f23d2333..7dc0c88ef7d679634cf3e4481b57c922c982fe77 100755 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -27,8 +27,5 @@ function _manually_load_plugin() { } tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' ); -// Load base class for compatibility. -require __DIR__ . '/class-test-case.php'; - // Start up the WP testing environment. require $_tests_dir . '/includes/bootstrap.php'; diff --git a/tests/class-test-case.php b/tests/class-test-case.php deleted file mode 100644 index fbd4b1d80ead346c33ba0ef5f440c5c58d01991b..0000000000000000000000000000000000000000 --- a/tests/class-test-case.php +++ /dev/null @@ -1,57 +0,0 @@ -<?php -/** - * Compatibility shim for PHP 8 tests. - * - * Yoast polyfills add return type declaration to `setUp` that isn't supported - * before PHP 7.1, hence this workaround. - */ - -namespace View_All_Posts_Pages\Tests; - -use WP_UnitTestCase; - -if ( version_compare( phpversion(), '8.0.0', '<' ) ) { - /** - * Class TestCase. - */ - abstract class TestCase extends WP_UnitTestCase { - /** - * Set up the test. - * - * @return void - */ - protected function setUp() { - parent::setUp(); - $this->_do_set_up(); - } - - /** - * Set up the test. - * - * @return void - */ - abstract function _do_set_up(); - } -} else { - abstract class TestCase extends WP_UnitTestCase { - /** - * Set up the test. - * - * @return void - */ - protected function setUp(): void { - parent::setUp(); - $this->_do_set_up(); - } - - /** - * Set up the test. - * - * Not setting a return type as implementing methods cannot always do - * so. - * - * @return void - */ - abstract protected function _do_set_up(); - } -} diff --git a/tests/test-post-filters.php b/tests/test-post-filters.php index 0749a7aa735b2b834b6e87fb43d02e5d94f6afdc..cdcfd35fb59ed7de0d3464ce3bd5e7363a3bf7f0 100755 --- a/tests/test-post-filters.php +++ b/tests/test-post-filters.php @@ -5,12 +5,10 @@ * @package View_All_Posts_Pages */ -use View_All_Posts_Pages\Tests\TestCase; - /** * Content-filter test case. */ -class PostFilters extends TestCase { +class PostFilters extends WP_UnitTestCase { /** * Text for each page of multipage post. * @@ -42,7 +40,7 @@ class PostFilters extends TestCase { * Not using `setUp` because Yoast polyfills add a return type for PHP 8 * that isn't supported before PHP 7.1. */ - protected function _do_set_up() { + protected function set_up() { static::$post_id = $this->factory->post->create( array( 'post_title' => 'Pagination Test',