Changeset 51331 for trunk/tests/phpunit/tests/customize/manager.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/customize/manager.php (modified) (18 diffs)

trunk/tests/phpunit/tests/customize/manager.php

@@ -678 +678 @@
 
         foreach ( array( 'widget_text[2]', 'widget_meta[2]' ) as $setting_id ) {
-            $this->assertInternalType( 'array', $changeset_values[ $setting_id ] );
+            $this->assertIsArray( $changeset_values[ $setting_id ] );
             $instance_data = $wp_customize->widgets->sanitize_widget_instance( $changeset_values[ $setting_id ] );
-            $this->assertInternalType( 'array', $instance_data );
+            $this->assertIsArray( $instance_data );
             $this->assertArrayHasKey( 'title', $instance_data );
         }
@@ -732 +732 @@
         $this->assertSame( 1000, has_action( 'customize_register', array( $wp_customize, '_save_starter_content_changeset' ) ) );
         do_action( 'customize_register', $wp_customize ); // This will trigger the changeset save.
-        $this->assertInternalType( 'int', $wp_customize->changeset_post_id() );
+        $this->assertIsInt( $wp_customize->changeset_post_id() );
         $this->assertNotEmpty( $wp_customize->changeset_data() );
         foreach ( $wp_customize->changeset_data() as $setting_id => $setting_params ) {
@@ -788 +788 @@
         $this->assertNotEquals( $changeset_data['blogname']['value'], get_option( 'blogname' ) );
         $r = $wp_customize->save_changeset_post( array( 'status' => 'publish' ) );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
         $this->assertSame( 'publish', get_post( $posts_by_name['about'] )->post_status );
         $this->assertSame( 'inherit', get_post( $posts_by_name['waffles'] )->post_status );
@@ -1042 +1042 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
 
         $this->assertSame( $did_action['customize_save_validation_before'] + 1, did_action( 'customize_save_validation_before' ) );
@@ -1099 +1099 @@
         $this->assertInstanceOf( 'WP_Error', $r );
         $this->assertSame( 'transaction_fail', $r->get_error_code() );
-        $this->assertInternalType( 'array', $r->get_error_data() );
+        $this->assertIsArray( $r->get_error_data() );
         $this->assertArrayHasKey( 'setting_validities', $r->get_error_data() );
         $error_data = $r->get_error_data();
@@ -1138 +1138 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
         $this->assertArrayHasKey( 'setting_validities', $r );
         $this->assertTrue( $r['setting_validities']['blogname'] );
@@ -1206 +1206 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
         $this->assertSame( 'Do it live \o/', get_option( 'blogname' ) );
         $this->assertSame( 'trash', get_post_status( $post_id ) ); // Auto-trashed.
@@ -1423 +1423 @@
     function filter_customize_changeset_save_data( $data, $context ) {
         $this->customize_changeset_save_data_call_count += 1;
-        $this->assertInternalType( 'array', $data );
-        $this->assertInternalType( 'array', $context );
+        $this->assertIsArray( $data );
+        $this->assertIsArray( $context );
         $this->assertArrayHasKey( 'uuid', $context );
         $this->assertArrayHasKey( 'title', $context );
@@ -1514 +1514 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
         $this->assertSame(
             array_fill_keys( array( 'blogname', 'scratchpad', 'background_color' ), true ),
@@ -1541 +1541 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
         $this->assertSame(
             array_fill_keys( array( 'blogname', 'background_color' ), true ),
@@ -1570 +1570 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
         $this->assertSame(
             array_fill_keys( array( 'blogname', 'scratchpad' ), true ),
@@ -1889 +1889 @@
             )
         );
-        $this->assertInternalType( 'array', $r );
+        $this->assertIsArray( $r );
 
         // Verify that autosave happened.
@@ -2716 +2716 @@
         $error->add( 'bad_number', 'Bad number', array( 'number' => 123 ) );
         $validity = $this->manager->prepare_setting_validity_for_js( $error );
-        $this->assertInternalType( 'array', $validity );
+        $this->assertIsArray( $validity );
         foreach ( $error->errors as $code => $messages ) {
             $this->assertArrayHasKey( $code, $validity );
-            $this->assertInternalType( 'array', $validity[ $code ] );
+            $this->assertIsArray( $validity[ $code ] );
             $this->assertSame( implode( ' ', $messages ), $validity[ $code ]['message'] );
             $this->assertArrayHasKey( 'data', $validity[ $code ] );
@@ -2911 +2911 @@
      */
     function filter_customize_dynamic_setting_args_for_test_dynamic_settings( $setting_args, $setting_id ) {
-        $this->assertInternalType( 'string', $setting_id );
+        $this->assertIsString( $setting_id );
         if ( in_array( $setting_id, array( 'foo', 'bar' ), true ) ) {
             $setting_args = array( 'default' => "dynamic_{$setting_id}_default" );
@@ -2928 +2928 @@
     function filter_customize_dynamic_setting_class_for_test_dynamic_settings( $setting_class, $setting_id, $setting_args ) {
         $this->assertSame( 'WP_Customize_Setting', $setting_class );
-        $this->assertInternalType( 'string', $setting_id );
-        $this->assertInternalType( 'array', $setting_args );
+        $this->assertIsString( $setting_id );
+        $this->assertIsArray( $setting_args );
         return $setting_class;
     }
@@ -3040 +3040 @@
     function test_nonces() {
         $nonces = $this->manager->get_nonces();
-        $this->assertInternalType( 'array', $nonces );
+        $this->assertIsArray( $nonces );
         $this->assertArrayHasKey( 'save', $nonces );
         $this->assertArrayHasKey( 'preview', $nonces );
@@ -3204 +3204 @@
      */
     function return_array_containing_widgets( $components, $customize_manager ) {
-        $this->assertInternalType( 'array', $components );
+        $this->assertIsArray( $components );
         $this->assertContains( 'widgets', $components );
         $this->assertContains( 'nav_menus', $components );
-        $this->assertInternalType( 'array', $components );
+        $this->assertIsArray( $components );
         $this->assertInstanceOf( 'WP_Customize_Manager', $customize_manager );
         return array( 'widgets' );
@@ -3221 +3221 @@
      */
     function return_array_containing_nav_menus( $components, $customize_manager ) {
-        $this->assertInternalType( 'array', $components );
+        $this->assertIsArray( $components );
         $this->assertContains( 'widgets', $components );
         $this->assertContains( 'nav_menus', $components );
-        $this->assertInternalType( 'array', $components );
+        $this->assertIsArray( $components );
         $this->assertInstanceOf( 'WP_Customize_Manager', $customize_manager );
         return array( 'nav_menus' );