TRAC 46149 - Assertions | WAIT FOR 47381 | Tests: replace `expectExce…

…ption()` for PHP native errors

... with calls to the dedicated PHPUnit 8.4.0+ methods.

The old manner of testing these is soft deprecated as of PHPUnit  8.4, hard deprecated as of PHPUnit 9.0 and will be removed in PHPUnit 10.0.0.

The dedicated `expectDeprecation()`, `expectDeprecationMessage()`, `expectDeprecationMessageMatches()`, `expectNotice()`, `expectNoticeMessage()`, `expectNoticeMessageMatches()`, `expectWarning()`, `expectWarningMessage()`, `expectWarningMessageMatches()`, `expectError()`, `expectErrorMessage()`, `expectErrorMessageMatches()` methods were introduced as replacement in PHPUnit 8.4 and should be used instead.

These new PHPUnit methods are all polyfilled by the PHPUnit Polyfills and switching to these will future proof the tests some more.

Ref:
* https://github.com/sebastianbergmann/phpunit/blob/8.4.3/ChangeLog-8.4.md#840---2019-10-04
* sebastianbergmann/phpunit#3775

tests/phpunit/tests/compat.php

@@ -180,7 +180,7 @@ function test_hash_hmac_output() {
 	}
 
 	function test_json_encode_decode() {
-		$this->expectException( 'PHPUnit_Framework_Error_Deprecated' );
+		$this->expectDeprecation();
 
 		require_once ABSPATH . WPINC . '/class-json.php';
 		$json = new Services_JSON();

tests/phpunit/tests/dependencies/scripts.php

@@ -1423,12 +1423,15 @@ public function test_wp_enqueue_code_editor_when_simple_array_will_be_passed() {
 	 */
 	public function test_wp_localize_script_data_formats( $l10n_data, $expected, $warning = false ) {
 		if ( $warning ) {
-			if ( PHP_VERSION_ID < 80000 ) {
-				$this->expectException( 'PHPUnit_Framework_Error_Warning' );
-			} else {
-				// As this exception will only be set on PHP 8 in combination with PHPUnit 7, this will work (for now).
+ 			if ( PHP_VERSION_ID < 80000 ) {
+				$this->expectWarning();
+ 			} else {
+				/* As this exception will only be set on PHP 8 in combination with PHPUnit 7, this will work (for now).
+				 * Once the PHPUnit version constraints have been widened and a _supported_ PHPUnit version is
+				 * used to run the tests on PHP 8.x, this should be changed to `$this->expectError()`.
+				 */
 				$this->expectException( 'Error' );
-			}
+ 			}
 		}
 
 		if ( ! is_array( $l10n_data ) ) {

tests/phpunit/tests/locale.php

@@ -27,9 +27,9 @@ public function test_get_weekday() {
 
 	public function test_get_weekday_undefined_index() {
 		if ( PHP_VERSION_ID >= 80000 ) {
-			$this->expectException( 'PHPUnit_Framework_Error_Warning' );
+			$this->expectWarning();
 		} else {
-			$this->expectException( 'PHPUnit_Framework_Error_Notice' );
+			$this->expectNotice();
 		}
 
 		$this->locale->get_weekday( 7 );

tests/phpunit/tests/rest-api/rest-block-directory-controller.php

@@ -89,7 +89,7 @@ public function test_get_items_wdotorg_unavailable() {
 
 		$this->prevent_requests_to_host( 'api.wordpress.org' );
 
-		$this->expectException( 'PHPUnit_Framework_Error_Warning' );
+		$this->expectWarning();
 		$response = rest_do_request( $request );
 		$this->assertErrorResponse( 'plugins_api_failed', $response, 500 );
 	}

tests/phpunit/tests/rest-api/rest-plugins-controller.php

@@ -536,7 +536,7 @@ public function test_create_item_wdotorg_unreachable() {
 
 		$this->prevent_requests_to_host( 'api.wordpress.org' );
 
-		$this->expectException( 'PHPUnit_Framework_Error_Warning' );
+		$this->expectWarning();
 		$response = rest_do_request( $request );
 		$this->assertErrorResponse( 'plugins_api_failed', $response, 500 );
 	}

tests/phpunit/tests/rest-api/rest-schema-sanitization.php

@@ -457,9 +457,9 @@ public function test_format_validation_is_skipped_if_non_string_type() {
 	 */
 	public function test_format_validation_is_applied_if_missing_type() {
 		if ( PHP_VERSION_ID >= 80000 ) {
-			$this->expectException( 'PHPUnit_Framework_Error_Warning' ); // For the undefined index.
+			$this->expectWarning(); // For the undefined index.
 		} else {
-			$this->expectException( 'PHPUnit_Framework_Error_Notice' );
+			$this->expectNotice(); // For the undefined index.
 		}
 
 		$this->setExpectedIncorrectUsage( 'rest_sanitize_value_from_schema' );

tests/phpunit/tests/rest-api/rest-schema-validation.php

@@ -157,9 +157,9 @@ public function test_format_validation_is_skipped_if_non_string_type() {
 	 */
 	public function test_format_validation_is_applied_if_missing_type() {
 		if ( PHP_VERSION_ID >= 80000 ) {
-			$this->expectException( 'PHPUnit_Framework_Error_Warning' ); // For the undefined index.
+			$this->expectWarning(); // For the undefined index.
 		} else {
-			$this->expectException( 'PHPUnit_Framework_Error_Notice' );
+			$this->expectNotice(); // For the undefined index.
 		}
 
 		$this->setExpectedIncorrectUsage( 'rest_validate_value_from_schema' );