Merge pull request #64 from Yoast/JRF/update-for-phpunit-polyfills-1.1.0

Backport support for the `AssertObjectProperty` polyfill

README.md

@@ -35,7 +35,7 @@ Requirements
 * PHP 5.6 or higher.
 
 The following packages will be automatically required via Composer:
-* [PHPUnit Polyfills] 1.0.4 or higher.
+* [PHPUnit Polyfills] 1.1.0 or higher.
 * [PHPUnit] 5.7 - 9.x.
 * [BrainMonkey] 2.6.1 or higher.
 

composer.json

@@ -29,7 +29,7 @@
 	"require": {
 		"php": ">=5.6",
 		"brain/monkey": "^2.6.1",
-		"yoast/phpunit-polyfills": "^1.0.5"
+		"yoast/phpunit-polyfills": "^1.1.0"
 	},
 	"require-dev": {
 		"yoast/yoastcs": "^2.3.1"

src/WPIntegration/Autoload.php

@@ -3,6 +3,7 @@
 namespace Yoast\WPTestUtils\WPIntegration;
 
 use PHPUnit\Runner\Version as PHPUnit_Version;
+use WP_UnitTestCase;
 
 /**
  * Custom autoloader.
@@ -105,13 +106,20 @@ private static function load_mockobject_class( $class_name ) {
 	 * @return bool
 	 */
 	private static function load_test_case() {
-		if ( \method_exists( 'WP_UnitTestCase', 'set_up' ) === false ) {
+		if ( \method_exists( WP_UnitTestCase::class, 'set_up' ) === false ) {
 			// Older WP version from before the test changes.
 			require_once __DIR__ . '/TestCase.php';
 			return true;
 		}
 
-		// WP 5.9 or a WP 5.2 - 5.8 version which includes the Polyfills and the fixture method wrappers.
+		if ( \method_exists( WP_UnitTestCase::class, 'assertObjectHasProperty' ) === false ) {
+			// WP 5.2 - 5.8 version which includes the Polyfills and the fixture method wrappers,
+			// but doesn't include the latest polyfill.
+			require_once __DIR__ . '/TestCaseOnlyObjectPropertyPolyfill.php';
+			return true;
+		}
+
+		// WP 5.9 or higher which automatically includes all Polyfills and the fixture method wrappers.
 		require_once __DIR__ . '/TestCaseNoPolyfills.php';
 		return true;
 	}

src/WPIntegration/TestCase.php

@@ -10,6 +10,7 @@
 use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertObjectEquals;
+use Yoast\PHPUnitPolyfills\Polyfills\AssertObjectProperty;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains;
 use Yoast\PHPUnitPolyfills\Polyfills\EqualToSpecializations;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectExceptionMessageMatches;
@@ -50,6 +51,7 @@ abstract class TestCase extends WP_UnitTestCase {
 	use AssertionRenames;
 	use AssertIsType;
 	use AssertObjectEquals;
+	use AssertObjectProperty;
 	use AssertStringContains;
 	use EqualToSpecializations;
 	use ExpectExceptionMessageMatches;

src/WPIntegration/TestCaseNoPolyfills.php

@@ -15,14 +15,8 @@
  * polyfills to allow for using PHPUnit 9.x assertion and expectation syntax.
  *
  * This test case is suitable for use with:
- * - WP 5.2.13 and higher;
- * - WP 5.3.10 and higher;
- * - WP 5.4.8 and higher;
- * - WP 5.5.7 and higher;
- * - WP 5.6.6 and higher;
- * - WP 5.7.4 and higher;
- * - WP 5.8.1 and higher;
  * - WP 5.9.0 and higher.
+ * - WP 6.* and higher.
  *
  * The included autoloader will automatically load the correct test case for
  * the WordPress version the tests are being run on.

src/WPIntegration/TestCaseOnlyObjectPropertyPolyfill.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Yoast\WPTestUtils\WPIntegration;
+
+use WP_UnitTestCase;
+use Yoast\PHPUnitPolyfills\Polyfills\AssertObjectProperty;
+use Yoast\WPTestUtils\Helpers\ExpectOutputHelper;
+
+/**
+ * Basic test case for use with a WP Integration test test suite.
+ *
+ * This test case extends the WordPress native base test case and
+ * adds a limited set of test helper functions.
+ *
+ * The WordPress native base test case will include all relevant
+ * polyfills to allow for using PHPUnit 9.x assertion and expectation syntax
+ * with the exception of the PHPUnit 9.6.11+/PHPUnit Polyfills 1.1.0+
+ * assertObject*() polyfills, as that polyfill was added after the backport.
+ *
+ * This test case makes sure the assertObject*() polyfills are still
+ * available when running tests against WP versions below 5.9, which do
+ * include the backported changes from WP 5.9, but don't include the
+ * polyfill which was released after the backports were done.
+ *
+ * This test case is suitable for use with:
+ * - WP 5.2.13 and higher;
+ * - WP 5.3.10 and higher;
+ * - WP 5.4.8 and higher;
+ * - WP 5.5.7 and higher;
+ * - WP 5.6.6 and higher;
+ * - WP 5.7.4 and higher;
+ * - WP 5.8.1 and higher;
+ *
+ * The included autoloader will automatically load the correct test case for
+ * the WordPress version the tests are being run on.
+ *
+ * @since 1.2.0
+ */
+abstract class TestCase extends WP_UnitTestCase {
+
+	use AssertObjectProperty;
+	use ExpectOutputHelper;
+}