use trait

Author: ilicfilip

Diff for: tests/bootstrap.php

@@ -43,4 +43,4 @@ function _manually_load_plugin() {
 require "{$_tests_dir}/includes/bootstrap.php";
 
 // Load base provider test class.
-require_once __DIR__ . '/phpunit/class-task-provider-test-abstract.php';
+require_once __DIR__ . '/phpunit/class-task-provider-test-trait.php';

Diff for: tests/phpunit/class-task-provider-test-abstract.php renamed to tests/phpunit/class-task-provider-test-trait.php

@@ -13,14 +13,7 @@
 /**
  * Task provider test case.
  */
-abstract class Task_Provider_Test_Abstract extends \WP_UnitTestCase {
-
-	/**
-	 * The task provider ID.
-	 *
-	 * @var string
-	 */
-	protected $task_provider_id;
+trait Task_Provider_Test_Trait {
 
 	/**
 	 * The task provider instance.
@@ -41,7 +34,7 @@ abstract class Task_Provider_Test_Abstract extends \WP_UnitTestCase {
 	 *
 	 * @return void
 	 */
-	public static function setUpBeforeClass(): void {
+	public static function setUpBeforeClass(): void { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
 		// Set the current user to the admin user.
 		wp_set_current_user( 1 );
 	}
@@ -51,7 +44,7 @@ public static function setUpBeforeClass(): void {
 	 *
 	 * @return void
 	 */
-	public static function tearDownAfterClass(): void {
+	public static function tearDownAfterClass(): void { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
 		// Reset the current user.
 		wp_set_current_user( 0 );
 	}

Diff for: tests/phpunit/test-class-core-blogdescription.php

@@ -10,7 +10,9 @@
 /**
  * Core blogdescription test case.
  */
-class Core_Blogdescription_Test extends Task_Provider_Test_Abstract {
+class Core_Blogdescription_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait;
 
 	/**
 	 * The task provider ID.

Diff for: tests/phpunit/test-class-core-permalink-structure.php

@@ -10,7 +10,12 @@
 /**
  * Core permalink structure test case.
  */
-class Core_Permalink_Structure_Test extends Task_Provider_Test_Abstract {
+class Core_Permalink_Structure_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait {
+		setUpBeforeClass as public parentSetUpBeforeClass;
+		tearDownAfterClass as public parentTearDownAfterClass;
+	}
 
 	/**
 	 * The task provider ID.
@@ -25,7 +30,7 @@ class Core_Permalink_Structure_Test extends Task_Provider_Test_Abstract {
 	 * @return void
 	 */
 	public static function setUpBeforeClass(): void {
-		parent::setUpBeforeClass();
+		self::parentSetUpBeforeClass();
 
 		\update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
 	}
@@ -36,7 +41,7 @@ public static function setUpBeforeClass(): void {
 	 * @return void
 	 */
 	public static function tearDownAfterClass(): void {
-		parent::tearDownAfterClass();
+		self::parentTearDownAfterClass();
 
 		\update_option( 'permalink_structure', '' );
 	}

Diff for: tests/phpunit/test-class-core-siteicon.php

@@ -10,7 +10,9 @@
 /**
  * Core siteicon test case.
  */
-class Core_Siteicon_Test extends Task_Provider_Test_Abstract {
+class Core_Siteicon_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait;
 
 	/**
 	 * The task provider ID.

Diff for: tests/phpunit/test-class-disable-comments.php

@@ -10,7 +10,9 @@
 /**
  * Settings saved test case.
  */
-class Disable_Comments_Test extends Task_Provider_Test_Abstract {
+class Disable_Comments_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait;
 
 	/**
 	 * The task provider ID.

Diff for: tests/phpunit/test-class-rename-uncategorized-category.php

@@ -10,7 +10,9 @@
 /**
  * Rename Uncategorized Category test case.
  */
-class Rename_Uncategorized_Category_Test extends Task_Provider_Test_Abstract {
+class Rename_Uncategorized_Category_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait;
 
 	/**
 	 * The task provider ID.

Diff for: tests/phpunit/test-class-search-engine-visibility.php

@@ -10,7 +10,11 @@
 /**
  * Settings saved test case.
  */
-class Search_Engine_Visibility_Test extends Task_Provider_Test_Abstract {
+class Search_Engine_Visibility_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait {
+		setUpBeforeClass as public parentSetUpBeforeClass;
+	}
 
 	/**
 	 * The task provider ID.
@@ -25,7 +29,7 @@ class Search_Engine_Visibility_Test extends Task_Provider_Test_Abstract {
 	 * @return void
 	 */
 	public static function setUpBeforeClass(): void {
-		parent::setUpBeforeClass();
+		self::parentSetUpBeforeClass();
 
 		\update_option( 'blog_public', 0 );
 	}

Diff for: tests/phpunit/test-class-settings-saved.php

@@ -10,7 +10,9 @@
 /**
  * Settings saved test case.
  */
-class Settings_Saved_Test extends Task_Provider_Test_Abstract {
+class Settings_Saved_Test extends \WP_UnitTestCase {
+
+	use Task_Provider_Test_Trait;
 
 	/**
 	 * The task provider ID.