Changeset 51569

Timestamp:

08/07/2021 10:40:44 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove use of assertArraySubset() in Test_WP_Widget_Media::test_constructor().

The assertArraySubset() method has been deprecated in PHPUnit 8 and removed in PHPUnit 9.

This replaces the assertions with looping through the array and testing both the key and the value individually.

References:

• ​https://github.com/sebastianbergmann/phpunit/blob/8.0.6/ChangeLog-8.0.md#800---2019-02-01
• ​https://github.com/sebastianbergmann/phpunit/issues/3494

Note: There is a polyfill package available for the removed assertion: dms/phpunit-arraysubset-asserts, but as the assertion was only used in this one test method, adding this seems redundant.

Follow-up to [51559-51568].

Props jrf.
See #46149.

Location:

trunk/tests/phpunit/tests

Files:

• customize/nav-menus.php (modified) (1 diff)
• widgets/wpWidgetMedia.php (modified) (1 diff)

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -1145 +1145 @@
         $this->assertTrue( (bool) preg_match( '/data-customize-partial-placement-context="(.+?)"/', $result, $matches ) );
         $context = json_decode( html_entity_decode( $matches[1] ), true );
-        $this->assertSame( $original_args, wp_array_slice_assoc( $context, array_keys( $original_args ) ) ); // Because assertArraySubset is not available in PHP 5.2.
+
+        foreach ( $original_args as $key => $value ) {
+            $this->assertArrayHasKey( $key, $context );
+            $this->assertSame( $value, $context[ $key ] );
+        }
+
         $this->assertTrue( $context['can_partial_refresh'] );
     }

trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php

@@ -96 +96 @@
         $this->assertSame( $name, $widget->name );
 
-        $this->assertArraySubset( $widget_options, $widget->widget_options );
-        $this->assertArraySubset( $control_options, $widget->control_options );
+        foreach ( $widget_options as $key => $value ) {
+            $this->assertArrayHasKey( $key, $widget->widget_options );
+            $this->assertSame( $value, $widget->widget_options[ $key ] );
+        }
+
+        foreach ( $control_options as $key => $value ) {
+            $this->assertArrayHasKey( $key, $widget->control_options );
+            $this->assertSame( $value, $widget->control_options[ $key ] );
+        }
     }