enmi-conf.org: comparison wp/wp-includes/class-wp-hook.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 * @since 4.7.0
 *
 * @see Iterator
 * @see ArrayAccess
 */
+#[AllowDynamicProperties]
 final class WP_Hook implements Iterator, ArrayAccess {
 	/**
 	 * Hook callbacks.
 	 *
 	 * @since 4.7.0
 	 * @var array
 	 */
 	public $callbacks = array();
+	/**
+	 * Priorities list.
+	 *
+	 * @since 6.4.0
+	 * @var array
+	 */
+	protected $priorities = array();
 	/**
 	 * The priority keys of actively running iterations of a hook.
 	 *
 	 * @since 4.7.0
 		$priority_existed = isset( $this->callbacks[ $priority ] );
 		$this->callbacks[ $priority ][ $idx ] = array(
 			'function'      => $callback,
-			'accepted_args' => $accepted_args,
+			'accepted_args' => (int) $accepted_args,
 		);
 		// If we're adding a new priority to the list, put them back in sorted order.
 		if ( ! $priority_existed && count( $this->callbacks ) > 1 ) {
 			ksort( $this->callbacks, SORT_NUMERIC );
 		}
+		$this->priorities = array_keys( $this->callbacks );
 		if ( $this->nesting_level > 0 ) {
 			$this->resort_active_iterations( $priority, $priority_existed );
 		}
 	}
 	 *                                    for no priority being added.
 	 * @param bool      $priority_existed Optional. Flag for whether the priority already existed before the new
 	 *                                    filter was added. Default false.
 	 */
 	private function resort_active_iterations( $new_priority = false, $priority_existed = false ) {
-		$new_priorities = array_keys( $this->callbacks );
+		$new_priorities = $this->priorities;
 		// If there are no remaining hooks, clear out all running iterations.
 		if ( ! $new_priorities ) {
 			foreach ( $this->iterations as $index => $iteration ) {
 				$this->iterations[ $index ] = $new_priorities;
 		if ( $exists ) {
 			unset( $this->callbacks[ $priority ][ $function_key ] );
 			if ( ! $this->callbacks[ $priority ] ) {
 				unset( $this->callbacks[ $priority ] );
+				$this->priorities = array_keys( $this->callbacks );
 				if ( $this->nesting_level > 0 ) {
 					$this->resort_active_iterations();
 				}
 			}
 		if ( ! $this->callbacks ) {
 			return;
 		}
 		if ( false === $priority ) {
-			$this->callbacks = array();
+			$this->callbacks  = array();
+			$this->priorities = array();
 		} elseif ( isset( $this->callbacks[ $priority ] ) ) {
 			unset( $this->callbacks[ $priority ] );
+			$this->priorities = array_keys( $this->callbacks );
 		}
 		if ( $this->nesting_level > 0 ) {
 			$this->resort_active_iterations();
 		}
 			return $value;
 		}
 		$nesting_level = $this->nesting_level++;
-		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
+		$this->iterations[ $nesting_level ] = $this->priorities;
-		$num_args                           = count( $args );
+		$num_args = count( $args );
 		do {
 			$this->current_priority[ $nesting_level ] = current( $this->iterations[ $nesting_level ] );
-			$priority                                 = $this->current_priority[ $nesting_level ];
+			$priority = $this->current_priority[ $nesting_level ];
 			foreach ( $this->callbacks[ $priority ] as $the_ ) {
 				if ( ! $this->doing_action ) {
 					$args[0] = $value;
 				}
 				// Avoid the array_slice() if possible.
-				if ( 0 == $the_['accepted_args'] ) {
+				if ( 0 === $the_['accepted_args'] ) {
 					$value = call_user_func( $the_['function'] );
 				} elseif ( $the_['accepted_args'] >= $num_args ) {
 					$value = call_user_func_array( $the_['function'], $args );
 				} else {
-					$value = call_user_func_array( $the_['function'], array_slice( $args, 0, (int) $the_['accepted_args'] ) );
+					$value = call_user_func_array( $the_['function'], array_slice( $args, 0, $the_['accepted_args'] ) );
 				}
 			}
 		} while ( false !== next( $this->iterations[ $nesting_level ] ) );
 		unset( $this->iterations[ $nesting_level ] );
 		unset( $this->current_priority[ $nesting_level ] );
-		$this->nesting_level--;
+		--$this->nesting_level;
 		return $value;
 	}
 	/**
 	 *
 	 * @param array $args Arguments to pass to the hook callbacks. Passed by reference.
 	 */
 	public function do_all_hook( &$args ) {
 		$nesting_level                      = $this->nesting_level++;
-		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
+		$this->iterations[ $nesting_level ] = $this->priorities;
 		do {
 			$priority = current( $this->iterations[ $nesting_level ] );
 			foreach ( $this->callbacks[ $priority ] as $the_ ) {
 				call_user_func_array( $the_['function'], $args );
 			}
 		} while ( false !== next( $this->iterations[ $nesting_level ] ) );
 		unset( $this->iterations[ $nesting_level ] );
-		$this->nesting_level--;
+		--$this->nesting_level;
 	}
 	/**
 	 * Return the current priority level of the currently running iteration of the hook.
 	 *
 	public static function build_preinitialized_hooks( $filters ) {
 		/** @var WP_Hook[] $normalized */
 		$normalized = array();
 		foreach ( $filters as $hook_name => $callback_groups ) {
-			if ( is_object( $callback_groups ) && $callback_groups instanceof WP_Hook ) {
+			if ( $callback_groups instanceof WP_Hook ) {
 				$normalized[ $hook_name ] = $callback_groups;
 				continue;
 			}
 			$hook = new WP_Hook();
 		if ( is_null( $offset ) ) {
 			$this->callbacks[] = $value;
 		} else {
 			$this->callbacks[ $offset ] = $value;
 		}
+		$this->priorities = array_keys( $this->callbacks );
 	}
 	/**
 	 * Unsets a specified offset.
 	 *
 	 * @param mixed $offset The offset to unset.
 	 */
 	#[ReturnTypeWillChange]
 	public function offsetUnset( $offset ) {
 		unset( $this->callbacks[ $offset ] );
+		$this->priorities = array_keys( $this->callbacks );
 	}
 	/**
 	 * Returns the current element.
 	 *
 	 */
 	#[ReturnTypeWillChange]
 	public function rewind() {
 		reset( $this->callbacks );
 	}
 }

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4