Changeset 51331 for trunk/tests/phpunit/tests/post/meta.php

Timestamp:

07/05/2021 05:21:53 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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

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.

File:

• trunk/tests/phpunit/tests/post/meta.php (modified) (13 diffs)

trunk/tests/phpunit/tests/post/meta.php

@@ -47 +47 @@
     function test_unique_postmeta() {
         // Add a unique post meta item.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique', 'value', true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'unique', 'value', true ) );
 
         // Check unique is enforced.
@@ -70 +70 @@
     function test_nonunique_postmeta() {
         // Add two non-unique post meta items.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'value' ) );
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'another value' ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'value' ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'another value' ) );
 
         // Check they exist.
@@ -88 +88 @@
 
         // Add a third one.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique', 'someother value' ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique', 'someother value' ) );
 
         // Check they exist.
@@ -107 +107 @@
     function test_update_post_meta() {
         // Add a unique post meta item.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
 
         // Add two non-unique post meta items.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );
 
         // Check they exist.
@@ -134 +134 @@
     function test_delete_post_meta() {
         // Add two unique post meta items.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_delete', 'value', true ) );
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id_2, 'unique_delete', 'value', true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'unique_delete', 'value', true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id_2, 'unique_delete', 'value', true ) );
 
         // Check they exist.
@@ -151 +151 @@
     function test_delete_post_meta_by_key() {
         // Add two unique post meta items.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'unique_delete_by_key', 'value', true ) );
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id_2, 'unique_delete_by_key', 'value', true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'unique_delete_by_key', 'value', true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id_2, 'unique_delete_by_key', 'value', true ) );
 
         // Check they exist.
@@ -168 +168 @@
     function test_get_post_meta_by_id() {
         $mid = add_post_meta( self::$post_id, 'get_post_meta_by_key', 'get_post_meta_by_key_value', true );
-        $this->assertInternalType( 'integer', $mid );
+        $this->assertIsInt( $mid );
 
         $mobj             = new stdClass;
@@ -179 +179 @@
 
         $mid = add_post_meta( self::$post_id, 'get_post_meta_by_key', array( 'foo', 'bar' ), true );
-        $this->assertInternalType( 'integer', $mid );
+        $this->assertIsInt( $mid );
         $mobj->meta_id    = $mid;
         $mobj->meta_value = array( 'foo', 'bar' );
@@ -188 +188 @@
     function test_delete_meta() {
         $mid = add_post_meta( self::$post_id, 'delete_meta', 'delete_meta_value', true );
-        $this->assertInternalType( 'integer', $mid );
+        $this->assertIsInt( $mid );
 
         $this->assertTrue( delete_meta( $mid ) );
@@ -198 +198 @@
     function test_update_meta() {
         // Add a unique post meta item.
-        $this->assertInternalType( 'integer', $mid1 = add_post_meta( self::$post_id, 'unique_update', 'value', true ) );
+        $mid1 = add_post_meta( self::$post_id, 'unique_update', 'value', true );
+        $this->assertIsInt( $mid1 );
 
         // Add two non-unique post meta items.
-        $this->assertInternalType( 'integer', $mid2 = add_post_meta( self::$post_id, 'nonunique_update', 'value' ) );
-        $this->assertInternalType( 'integer', $mid3 = add_post_meta( self::$post_id, 'nonunique_update', 'another value' ) );
+        $mid2 = add_post_meta( self::$post_id, 'nonunique_update', 'value' );
+        $this->assertIsInt( $mid2 );
+        $mid3 = add_post_meta( self::$post_id, 'nonunique_update', 'another value' );
+        $this->assertIsInt( $mid3 );
 
         // Check they exist.
@@ -243 +246 @@
 
         // Add a post meta item.
-        $this->assertInternalType( 'integer', add_post_meta( self::$post_id, 'test_funky_post_meta', $funky_meta, true ) );
+        $this->assertIsInt( add_post_meta( self::$post_id, 'test_funky_post_meta', $funky_meta, true ) );
 
         // Check it exists.
@@ -319 +322 @@
         wp_cache_delete( 'last_changed', 'posts' );
 
-        $this->assertInternalType( 'integer', add_metadata( 'post', $post_id, 'foo', 'bar' ) );
+        $this->assertIsInt( add_metadata( 'post', $post_id, 'foo', 'bar' ) );
         $this->assertNotFalse( wp_cache_get_last_changed( 'posts' ) );
     }
@@ -331 +334 @@
         wp_cache_delete( 'last_changed', 'posts' );
 
-        $this->assertInternalType( 'integer', update_metadata( 'post', $post_id, 'foo', 'bar' ) );
+        $this->assertIsInt( update_metadata( 'post', $post_id, 'foo', 'bar' ) );
         $this->assertNotFalse( wp_cache_get_last_changed( 'posts' ) );
     }