vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-04 22:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build/Test Tools: Replace assertInternalType() usage in unit tests.

Browse Source 
The `assertInternalType()` and `assertNotInternalType()` methods are deprecated in PHPUnit 8 and removed in PHPUnit 9.

While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.

These methods introduced in PHPUnit 7.5 should be used as an alternative:

* `assertIsArray()`
* `assertIsBool()`
* `assertIsFloat()`
* `assertIsInt()`
* `assertIsNumeric()`
* `assertIsObject()`
* `assertIsResource()`
* `assertIsString()`
* `assertIsScalar()`
* `assertIsCallable()`
* `assertIsIterable()`
* `assertIsNotArray()`
* `assertIsNotBool()`
* `assertIsNotFloat()`
* `assertIsNotInt()`
* `assertIsNotNumeric()`
* `assertIsNotObject()`
* `assertIsNotResource()`
* `assertIsNotString()`
* `assertIsNotScalar()`
* `assertIsNotCallable()`
* `assertIsNotIterable()`

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods are now added to the `WP_UnitTestCase` class for PHPUnit < 7.5.

Props pbearne, jrf, dd32, SergeyBiryukov.
Fixes #53491. See #46149.

git-svn-id: https://develop.svn.wordpress.org/trunk@51331 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2021-07-05 17:21:53 +00:00
parent fee45f935c
commit bca693b190
104 changed files with 884 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/multisite/cleanDirsizeCache.php
+1 -1
View File
@@ -206,7 +206,7 @@ if ( is_multisite() ) :
// `dirsize_cache` should now be filled after upload and recurse_dirsize() call.
$cache_path = untrailingslashit( $upload_dir['path'] );
$this->assertInternalType( 'array', get_transient( 'dirsize_cache' ) );
$this->assertIsArray( get_transient( 'dirsize_cache' ) );
$this->assertSame( $size, get_transient( 'dirsize_cache' )[ $cache_path ] );
// Cleanup.
tests/phpunit/tests/multisite/network.php
+2 -2
View File
@@ -352,7 +352,7 @@ if ( is_multisite() ) :
// We can't use wp_schedule_update_network_counts() because WP_INSTALLING is set.
wp_schedule_event( time(), 'twicedaily', 'update_network_counts' );
$this->assertInternalType( 'int', wp_next_scheduled( 'update_network_counts' ) );
$this->assertIsInt( wp_next_scheduled( 'update_network_counts' ) );
}
/**
@@ -365,7 +365,7 @@ if ( is_multisite() ) :
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
$blog_id = self::factory()->blog->create( array( 'user_id' => $user_id ) );
$this->assertInternalType( 'int', $blog_id );
$this->assertIsInt( $blog_id );
// Set the dashboard blog to another one.
update_site_option( 'dashboard_blog', $blog_id );
tests/phpunit/tests/multisite/site.php
+6 -6
View File
@@ -94,7 +94,7 @@ if ( is_multisite() ) :
$this->assertSame( array(), $_wp_switched_stack );
$this->assertFalse( ms_is_switched() );
$current_blog_id = get_current_blog_id();
$this->assertInternalType( 'integer', $current_blog_id );
$this->assertIsInt( $current_blog_id );
wp_cache_set( 'switch-test', $current_blog_id, 'switch-test' );
$this->assertSame( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
@@ -141,7 +141,7 @@ if ( is_multisite() ) :
$blog_id = self::factory()->blog->create();
$this->assertInternalType( 'int', $blog_id );
$this->assertIsInt( $blog_id );
$prefix = $wpdb->get_blog_prefix( $blog_id );
// $get_all = false, only retrieve details from the blogs table.
@@ -1328,7 +1328,7 @@ if ( is_multisite() ) :
remove_action( 'wp_initialize_site', 'wp_initialize_site', 10 );
$site_id = wp_insert_site( $site_data );
$this->assertInternalType( 'integer', $site_id );
$this->assertIsInt( $site_id );
$site = get_site( $site_id );
foreach ( $expected_data as $key => $value ) {
@@ -1434,7 +1434,7 @@ if ( is_multisite() ) :
remove_action( 'clean_site_cache', array( $this, 'action_database_insert_on_clean_site_cache' ) );
$this->assertInternalType( 'integer', $site_id );
$this->assertIsInt( $site_id );
}
@@ -1819,7 +1819,7 @@ if ( is_multisite() ) :
'network_id' => 1,
)
);
$this->assertInternalType( 'integer', $site_id );
$this->assertIsInt( $site_id );
$site = get_site( $site_id );
$this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
@@ -1827,7 +1827,7 @@ if ( is_multisite() ) :
$second_date = current_time( 'mysql', true );
$site_id = wp_update_site( $site_id, array() );
$this->assertInternalType( 'integer', $site_id );
$this->assertIsInt( $site_id );
$site = get_site( $site_id );
$this->assertEqualsWithDelta( strtotime( $first_date ), strtotime( $site->registered ), 2, 'The dates should be equal' );
tests/phpunit/tests/multisite/siteMeta.php
+1 -1
View File
@@ -157,7 +157,7 @@ if ( is_multisite() ) :
}
$actual = update_site_meta( self::$site_id, 'foo', 'bar' );
$this->assertInternalType( 'int', $actual );
$this->assertIsInt( $actual );
$this->assertNotEmpty( $actual );
$meta = get_site_meta( self::$site_id, 'foo', true );