chore: sync Settings API and Hook Registry updates

Author: ajaydsouza

includes/admin/settings/class-settings-api.php

@@ -577,8 +577,6 @@ public static function enqueue_scripts_styles( $prefix, $args = array() ) {
 		wp_enqueue_script( "wz-{$prefix}-tom-select" );
 
 		$defaults = array(
-			'action'   => $prefix . '_taxonomy_search_tom_select',
-			'nonce'    => wp_create_nonce( $prefix . '_taxonomy_search_tom_select' ),
 			'endpoint' => 'category',
 			'strings'  => array(
 				'no_results' => 'No results found for "%s"',
@@ -730,11 +728,7 @@ public function settings_defaults() {
 			}
 		}
 
-		$upgraded_settings = $this->upgraded_settings;
-
-		if ( false !== $upgraded_settings ) {
-			$options = array_merge( $options, $upgraded_settings );
-		}
+		$options = array_merge( $options, $this->upgraded_settings );
 
 		/**
 		 * Filters the default settings array.

includes/admin/settings/class-settings-sanitize.php

@@ -288,7 +288,7 @@ public function sanitize_sensitive_field( $value, $key ) {
 	/**
 	 * Sanitize repeater field.
 	 *
-	 * @param array $value Array of repeater values.
+	 * @param mixed $value Array of repeater values (may be non-array from form data).
 	 * @param array $field Field configuration array.
 	 * @return array Sanitized array
 	 */
@@ -418,7 +418,7 @@ public static function str_putcsv( $input_array, $delimiter = ',', $enclosure =
 						break;
 					// Make sure sprintf has a good datatype to work with.
 					case 'integer':
-						$sp_format = '%i';
+						$sp_format = '%d';
 						break;
 					case 'double':
 						$sp_format = '%0.2f';

includes/admin/settings/class-settings-wizard-api.php

@@ -341,7 +341,7 @@ public function process_step() {
 		// Initialise the current step based on the URL or stored option before processing the action.
 		$this->current_step = $this->get_current_step();
 
-		$action = isset( $_POST['wizard_action'] ) ? sanitize_text_field( wp_unslash( $_POST['wizard_action'] ) ) : '';
+		$action = sanitize_text_field( wp_unslash( $_POST['wizard_action'] ) );
 
 		switch ( $action ) {
 			case 'next_step':

includes/util/class-hook-registry.php

@@ -23,7 +23,7 @@ class Hook_Registry {
 	 *
 	 * @var array
 	 */
-	private static $hooks = array();
+	public static $hooks = array();
 
 	/**
 	 * Register a hook (action or filter).
@@ -36,20 +36,17 @@ class Hook_Registry {
 	 *
 	 * @return bool True if registered, false if duplicate or invalid hook.
 	 */
-	public static function register( $hook_type, $hook_name, $callback, $priority = 10, $args = 1 ) {
+	public static function register( string $hook_type, string $hook_name, callable $callback, int $priority = 10, int $args = 1 ): bool {
 		if ( ! in_array( $hook_type, array( 'action', 'filter' ), true ) ) {
 			return false;
 		}
-		if ( ! is_string( $hook_name ) || empty( trim( $hook_name ) ) ) {
+		if ( empty( trim( $hook_name ) ) ) {
 			return false;
 		}
-		if ( ! is_callable( $callback ) ) {
+		if ( $priority < 0 ) {
 			return false;
 		}
-		if ( ! is_numeric( $priority ) || $priority < 0 ) {
-			return false;
-		}
-		if ( ! is_numeric( $args ) || $args < 1 ) {
+		if ( $args < 1 ) {
 			return false;
 		}
 
@@ -220,7 +217,7 @@ public static function remove_all_hooks() {
 	 *
 	 * @return string Unique key.
 	 */
-	private static function create_hook_key( $hook_name, $callback, $priority, $closure_id = '' ) {
+	public static function create_hook_key( $hook_name, $callback, $priority, $closure_id = '' ) {
 		return md5( $hook_name . self::callback_to_string( $callback ) . $priority . $closure_id );
 	}
 
@@ -231,7 +228,7 @@ private static function create_hook_key( $hook_name, $callback, $priority, $clos
 	 *
 	 * @return string String representation of the callback.
 	 */
-	private static function callback_to_string( $callback ) {
+	public static function callback_to_string( $callback ) {
 		if ( is_string( $callback ) ) {
 			return $callback;
 		}