mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-04 20:23:27 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Tests: Do whitespace replacement in assertDiscardWhitespace() only when string.

Browse Source 
The `assertDiscardWhitespace()` method uses `assertEquals()` under the hood, meaning that in reality any type of actual/expected value should be accepted by the function. Fixed the documentation to reflect that.

At the same time, only strings can contain whitespace differences. So the whitespace replacement should only be done when string values are passed.

This change (a) prevents potential `passing null to non-nullable` errors on PHP 8.1, if either of the inputs would turn out to be `null` and (b) increases tests stability.

Follow-up to [35003], [44902].

Props jrf.
See #53363.

git-svn-id: https://develop.svn.wordpress.org/trunk@51698 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Tonya Mork 2021-08-30 20:40:05 +00:00
parent 877c39bb7f
commit 30f9d4e136
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/phpunit/includes/abstract-testcase.php
View File

@ -701,12 +701,20 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase {
* @since UT (3.7.0)
* @since 5.9.0 Added the `$message` parameter.
*
* @param string $expected The expected value.
* @param string $actual The actual value.
* @param mixed $expected The expected value.
* @param mixed $actual The actual value.
* @param string $message Optional. Message to display when the assertion fails.
*/
public function assertDiscardWhitespace( $expected, $actual, $message = '' ) {
$this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ), $message );
if ( is_string( $expected ) ) {
$expected = preg_replace( '/\s*/', '', $expected );
}
if ( is_string( $actual ) ) {
$actual = preg_replace( '/\s*/', '', $actual );
}
$this->assertEquals( $expected, $actual, $message );
}
/**