Tests: Apply fixes for PHP 8.1 and 8.2

- Make dynamic properties explicit. - Skip a test that generates a deprecation notice in PHP 8.1 + WP < 6.3.
Automattic · Jul 23, 2023 · 43c4136 · 43c4136
1 parent 0f3def8
commit 43c4136
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 4 deletions.
diff --git a/php/class-coauthors-endpoint.php b/php/class-coauthors-endpoint.php
@@ -130,7 +130,8 @@ public function get_coauthors_search_results( $request ) {
 		$response = array();
 
 		$search  = strtolower( $request->get_param( 'q' ) );
-		$ignore  = explode( ',', $request->get_param( 'existing_authors' ) );
+		$ignorable = null === $request->get_param( 'existing_authors' ) ? '' : $request->get_param( 'existing_authors' );
+		$ignore  = explode( ',', $ignorable );
 		$authors = $this->coauthors->search_authors( $search, $ignore );
 
 		if ( ! empty( $authors ) ) {

diff --git a/php/class-coauthors-guest-authors.php b/php/class-coauthors-guest-authors.php
@@ -140,9 +140,6 @@ function __construct() {
 		);
 		register_post_type( $this->post_type, $args );
 
-		// Some of the common sizes used by get_avatar
-		$this->avatar_sizes = array();
-
 		// Hacky way to remove the title and the editor
 		remove_post_type_support( $this->post_type, 'title' );
 		remove_post_type_support( $this->post_type, 'editor' );

diff --git a/tests/coauthorsplus-testcase.php b/tests/coauthorsplus-testcase.php
@@ -5,6 +5,16 @@
  * Base unit test class for Co-Authors Plus
  */
 class CoAuthorsPlus_TestCase extends \Yoast\WPTestUtils\WPIntegration\TestCase {
+
+	/**
+	 * @var CoAuthors_Plus
+	 */
+	protected $_cap;
+	/**
+	 * @var Endpoints
+	 */
+	protected $_api;
+
 	public function set_up() {
 		parent::set_up();
 

diff --git a/tests/test-coauthors-endpoint.php b/tests/test-coauthors-endpoint.php
@@ -9,6 +9,21 @@ class Test_Endpoints extends CoAuthorsPlus_TestCase {
 
 	use \DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 
+	private $author1;
+	private $author2;
+	private $editor1;
+	private $contributor1;
+	private $subscriber1;
+	/**
+	 * @var int|WP_Error
+	 */
+	private $coauthor1;
+	/**
+	 * @var int|WP_Error
+	 */
+	private $coauthor2;
+	private $post;
+
 	public function set_up() {
 
 		parent::set_up();

diff --git a/tests/test-coauthors-guest-authors.php b/tests/test-coauthors-guest-authors.php
@@ -4,6 +4,11 @@ class Test_CoAuthors_Guest_Authors extends CoAuthorsPlus_TestCase {
 
 	use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains;
 
+	private $admin1;
+	private $author1;
+	private $editor1;
+	private $post;
+
 	public function set_up() {
 
 		parent::set_up();

diff --git a/tests/test-coauthors-plus.php b/tests/test-coauthors-plus.php
@@ -2,6 +2,10 @@
 
 class Test_CoAuthors_Plus extends CoAuthorsPlus_TestCase {
 
+	private $author1;
+	private $editor1;
+	private $post;
+
 	public function set_up() {
 
 		parent::set_up();

diff --git a/tests/test-manage-coauthors.php b/tests/test-manage-coauthors.php
@@ -2,6 +2,26 @@
 
 class Test_Manage_CoAuthors extends CoAuthorsPlus_TestCase {
 
+	private $admin1;
+	private $author1;
+	private $editor1;
+	/**
+	 * @var int|WP_Error
+	 */
+	private $author1_post1;
+	/**
+	 * @var int|WP_Error
+	 */
+	private $author1_post2;
+	/**
+	 * @var int|WP_Error
+	 */
+	private $author1_page1;
+	/**
+	 * @var int|WP_Error
+	 */
+	private $author1_page2;
+
 	public function set_up() {
 		parent::set_up();
 

diff --git a/tests/test-template-tags.php b/tests/test-template-tags.php
@@ -4,6 +4,10 @@ class Test_Template_Tags extends CoAuthorsPlus_TestCase {
 
 	use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains;
 
+	private $author1;
+	private $editor1;
+	private $post;
+
 	public function set_up() {
 
 		parent::set_up();
@@ -718,6 +722,15 @@ public function test_coauthors_links_single_author_url_is_set() {
 	 * @covers ::coauthors_links_single()
 	 */
 	public function test_coauthors_links_single_when_url_not_exist() {
+		global $wp_version;
+		if ( PHP_VERSION_ID >= 80100 && version_compare( $wp_version, '6.3.0', '<' ) ) {
+			/*
+			 * Ignoring PHP 8.1 "null to non-nullable" deprecation that is fixed in WP 6.3.
+			 *
+			 * @see https://core.trac.wordpress.org/ticket/58157
+			*/
+			$this->markTestSkipped( 'PHP 8.1 gives a deprecation notice that is fixed in WP 6.3' );
+		}
 
 		global $post, $authordata;