From 3998173f347ab87fdd8458ee92aee0533c8d824f Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Mon, 7 Dec 2020 21:39:46 +0000
Subject: [PATCH] Add centralized test case with polyfills

---
 tests/bootstrap.php       |  8 +-------
 tests/wp-cli-testcase.php | 12 ++++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 tests/wp-cli-testcase.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e5ee5b542..9cf26389d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -27,15 +27,9 @@
 		: '2.x.x'
 );
 
-/**
- * Compatibility with PHPUnit 6+
- */
-if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
-	require_once __DIR__ . '/phpunit6-compat.php';
-}
-
 require_once VENDOR_DIR . '/autoload.php';
 require_once WP_CLI_ROOT . '/php/utils.php';
+require_once __DIR__ . '/wp-cli-testcase.php';
 
 function wpcli_tests_include_config( array $config_filenames = [] ) {
 	$config_filename = false;
diff --git a/tests/wp-cli-testcase.php b/tests/wp-cli-testcase.php
new file mode 100644
index 000000000..1d44ee14d
--- /dev/null
+++ b/tests/wp-cli-testcase.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace WP_CLI\Tests;
+
+use Yoast\PHPUnitPolyfills\TestCases\TestCase as PolyfilledTestCase;
+
+/**
+ * WP-CLI base test case.
+ */
+class TestCase extends PolyfilledTestCase {
+
+}