Merge branch 'trac-59649-php8-improvements' of https://github.com/vidushigupta0607/wordpress-develop into trac-59649-php8-improvements

Author: vidushigupta0607

src/wp-includes/IXR/class-IXR-value.php

@@ -121,17 +121,16 @@ function getXml()
     /**
      * Checks whether or not the supplied array is a struct or not
      *
-     * @param array $array
+     * @param array $values List or map to inspect.
      * @return bool
      */
-    function isStruct($array)
-    {
+    function isStruct( $values ) {
         $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key !== (string)$expected) {
+        foreach ( $values as $key => $value ) {
+            if ( (string) $key !== (string) $expected ) {
                 return true;
             }
-            $expected++;
+            ++$expected;
         }
         return false;
     }

src/wp-includes/class-wp-hook.php

@@ -318,6 +318,12 @@ public function apply_filters( $value, $args ) {
 			return $value;
 		}
 
+		$args = wp_normalize_call_user_func_args( $args );
+
+		if ( ! $this->doing_action && array_key_exists( 0, $args ) ) {
+			$value = $args[0];
+		}
+
 		$nesting_level = $this->nesting_level++;
 
 		$this->iterations[ $nesting_level ] = $this->priorities;

src/wp-includes/plugin.php

@@ -228,6 +228,8 @@ function apply_filters( $hook_name, $value, ...$args ) {
 function apply_filters_ref_array( $hook_name, $args ) {
 	global $wp_filter, $wp_filters, $wp_current_filter;
 
+	$args = wp_normalize_call_user_func_args( $args );
+
 	if ( ! isset( $wp_filters[ $hook_name ] ) ) {
 		$wp_filters[ $hook_name ] = 1;
 	} else {

tests/phpunit/tests/filters.php

@@ -449,6 +449,57 @@ public function test_filter_ref_array_result() {
 		$this->assertNotEmpty( $args[0][1]->foo );
 	}
 
+	/**
+	 * PHP 8.0+ interprets string keys in call_user_func_array() as named parameters.
+	 * Hook callbacks must still receive arguments positionally when the args array uses string keys.
+	 *
+	 * @covers ::apply_filters_ref_array
+	 * @covers ::wp_normalize_call_user_func_args
+	 */
+	public function test_apply_filters_ref_array_with_string_keys_passes_arguments_positionally() {
+		$hook_name = __FUNCTION__;
+		add_filter(
+			$hook_name,
+			static function ( $first, $second ) {
+				return $first . $second;
+			},
+			10,
+			2
+		);
+
+		$result = apply_filters_ref_array(
+			$hook_name,
+			array(
+				'foo' => 'hello',
+				'bar' => 'world',
+			)
+		);
+
+		$this->assertSame( 'helloworld', $result );
+	}
+
+	/**
+	 * @covers ::do_action_ref_array
+	 * @covers ::wp_normalize_call_user_func_args
+	 */
+	public function test_do_action_ref_array_with_string_keys_passes_arguments_positionally() {
+		$a         = new MockAction();
+		$hook_name = __FUNCTION__;
+
+		add_action( $hook_name, array( $a, 'action' ), 10, 2 );
+
+		do_action_ref_array(
+			$hook_name,
+			array(
+				'foo' => 'first',
+				'bar' => 'second',
+			)
+		);
+
+		$args = $a->get_args();
+		$this->assertSame( array( 'first', 'second' ), $args[0] );
+	}
+
 	/**
 	 * @ticket 29070
 	 */