reduxframework / redux-framework

redux-core/framework.php

Indentation +850 added lines, -850 removed lines

@@ -39,854 +39,854 @@
 // Don't duplicate me!
 if ( ! class_exists( 'ReduxFramework', false ) ) {
 
-	/**
-	 * Main ReduxFramework class
-	 *
-	 * @since       1.0.0
-	 */
-	class ReduxFramework {
-
-		/**
-		 * ReduxFramework instance storage.
-		 *
-		 * @var null|ReduxFramework
-		 * @access public
-		 */
-		public static ?ReduxFramework $instance;
-
-		/**
-		 * Redux current version.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_version = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Absolute directory of the Redux instance.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Full URL of the Redux instance.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_url = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Current WordPress upload directory.
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_upload_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Current WordPress upload URL
-		 *
-		 * @var string
-		 * @access public
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static string $_upload_url; // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Init
-		 *
-		 * Backward compatibility for previous versions of Redux.
-		 */
-		public static function init() {
-
-			// Backward compatibility for extensions.
-			self::$_version    = Redux_Core::$version;
-			self::$_dir        = Redux_Core::$dir;
-			self::$_url        = Redux_Core::$url;
-			self::$_upload_dir = Redux_Core::$upload_dir;
-			self::$_upload_url = Redux_Core::$upload_url;
-			self::$_as_plugin  = Redux_Core::$as_plugin;
-			self::$_is_plugin  = Redux_Core::$is_plugin;
-		}
-
-		/**
-		 * Array of field arrays.
-		 *
-		 * @var null|array
-		 */
-		public ?array $fields = array();
-
-		/**
-		 * Array of field sections.
-		 *
-		 * @var null|array
-		 */
-		public ?array $field_sections = array();
-
-		/**
-		 * Array of field types.
-		 *
-		 * @var null|array
-		 */
-		public ?array $field_types = array();
-
-		/**
-		 * Array of field heads.
-		 *
-		 * @var null|array
-		 */
-		public ?array $field_head = array();
-
-		/**
-		 * Array of extensions by type used in the panel.
-		 *
-		 * @var null|array
-		 */
-		public ?array $extensions = array();
-
-		/**
-		 * Array of sections and fields arrays.
-		 *
-		 * @var null|array
-		 */
-		public ?array $sections = array();
-
-		/**
-		 * Array of generated errors from the panel for localization.
-		 *
-		 * @var null|array
-		 */
-		public ?array $errors = array();
-
-		/**
-		 * Array of generated warnings from the panel for localization.
-		 *
-		 * @var null|array
-		 */
-		public ?array $warnings = array();
-
-		/**
-		 * Array of generated sanitize notices from the panel for localization.
-		 *
-		 * @var null|array
-		 */
-		public ?array $sanitize = array();
-
-		/**
-		 * Array of current option values.
-		 *
-		 * @var null|array
-		 */
-		public ?array $options = array();
-
-		/**
-		 * Array of option defaults.
-		 *
-		 * @var null|array
-		 */
-		public ?array $options_defaults = null;
-
-		/**
-		 * Array of fields set to trigger the compiler hook.
-		 *
-		 * @var null|array
-		 */
-		public ?array $compiler_fields = array();
-
-		/**
-		 * Array of fields with CSS output selectors.
-		 *
-		 * @var null|array
-		 */
-		public ?array $output = array();
-
-		/**
-		 * Autogenerated CSS appended to the header (snake case maintained for backward compatibility).
-		 *
-		 * @var null|string
-		 */
-		public ?string $outputCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
-
-		/**
-		 * Autogenerated variables appended to dynamic output.
-		 *
-		 * @var null|array
-		 */
-		public ?array $output_variables = array();
-
-		/**
-		 * CSS sent to the compiler hook (snake case maintained for backward compatibility).
-		 *
-		 * @var null|string
-		 */
-		public ?string $compilerCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
-
-		/**
-		 * Array of global arguments.
-		 *
-		 * @var array|null
-		 */
-		public ?array $args = array();
-
-		/**
-		 * Used in customizer hooks.
-		 *
-		 * @var null|string
-		 */
-		public ?string $old_opt_name = '';
-
-		/**
-		 * Pointer to the Redux_Options_Default class.
-		 *
-		 * @var null|Redux_Options_Defaults
-		 */
-		public ?Redux_Options_Defaults $options_defaults_class = null;
-
-		/**
-		 * Pointer to the Redux_Options class.
-		 *
-		 * @var null|Redux_Options_Constructor
-		 */
-		public ?Redux_Options_Constructor $options_class = null;
-
-		/**
-		 * Pointer to the Redux_Required class
-		 *
-		 * @var null|Redux_Required
-		 */
-		public ?Redux_Required $required_class = null;
-
-		/**
-		 * Pointer to the Redux_Output class.
-		 *
-		 * @var null|Redux_Output
-		 */
-		public ?Redux_Output $output_class = null;
-
-		/**
-		 * Pointer to the Redux_Page_Render class.
-		 *
-		 * @var null|Redux_Page_Render
-		 */
-		public ?Redux_Page_Render $render_class = null;
-
-		/**
-		 * Pointer to the Redux_Enqueue class.
-		 *
-		 * @var null|Redux_Enqueue
-		 */
-		public ?Redux_Enqueue $enqueue_class = null;
-
-		/**
-		 * Pointer to the Redux_Transients class.
-		 *
-		 * @var null|Redux_Transients
-		 */
-		public ?Redux_Transients $transient_class = null;
-
-		/**
-		 * Pointer to the Redux_wordPress_Data class.
-		 *
-		 * @var null|Redux_WordPress_Data
-		 */
-		public ?Redux_WordPress_Data $wordpress_data = null;
-
-		/**
-		 * Pointer to the Redux_Validation class.
-		 *
-		 * @var null|Redux_Validation
-		 */
-		public ?Redux_Validation $validate_class = null;
-
-		/**
-		 * Pointer to the Redux_Sanitize class.
-		 *
-		 * @var null|Redux_Sanitize
-		 */
-		public ?Redux_Sanitize $sanitize_class = null;
-
-		/**
-		 * Pointer to the Redux_Args class.
-		 *
-		 * @var null|Redux_Args
-		 */
-		public ?Redux_Args $args_class = null;
-
-		/**
-		 * Array of active transients used by Redux.
-		 *
-		 * @var null|mixed
-		 */
-		public $transients = array();
-
-		/**
-		 * Array of localized repeater data.
-		 *
-		 * @var null|array
-		 */
-		public ?array $repeater_data = array();
-
-		/**
-		 * Array of localized data.
-		 *
-		 * @var null|array
-		 */
-		public ?array $localize_data = array();
-
-		/**
-		 * Array of checked transients used by Redux.
-		 *
-		 * @var null|mixed
-		 */
-		public $transients_check = array();
-
-		/**
-		 * Never save to DB flag for metaboxes.
-		 *
-		 * @var bool
-		 */
-		public bool $never_save_to_db;
-
-		/**
-		 * File system object used for I/O file operations.  Done the WordPress way.
-		 *
-		 * @var null|object
-		 *
-		 * @deprecated 4.5.1
-		 */
-		public ?object $filesystem;
-
-		/**
-		 * Deprecated shim for v3 templates.
-		 *
-		 * @var null|array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public ?array $hidden_perm_sections = array();
-
-		/**
-		 * Deprecated shim for v3 as plugin check.
-		 *
-		 * @var bool
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static bool $_as_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Deprecated shim for v3 as plugin check.
-		 *
-		 * @var bool
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public static bool $_is_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
-
-		/**
-		 * Cloning is forbidden.
-		 *
-		 * @since 4.0.0
-		 */
-		public function __clone() {
-			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
-		}
-
-		/**
-		 * Un-serializing instances of this class are forbidden.
-		 *
-		 * @since 4.0.0
-		 */
-		public function __wakeup() {
-			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
-		}
-
-		/**
-		 * Add a deprecating notice for all the old themes that still use this method..
-		 *
-		 * @param object $filesystem Filesystem object.
-		 *
-		 * @since 4.0.0
-		 */
-		private function deprecated_filesystem( $filesystem ) {
-			//_deprecated_function( esc_html__( 'The global variable "$filesystem" of the ReduxFramework object', 'redux-framework' ), '4.5.1', 'Redux_Core::$filesystem' );
-
-			return $filesystem;
-		}
-
-		/**
-		 * Class Constructor. Defines the args for the theme options class
-		 *
-		 * @param array $sections Panel sections.
-		 * @param array $args     Class constructor arguments.
-		 *
-		 * @throws ReflectionException Exception.
-		 * @since       1.0.0
-		 */
-		public function __construct( array $sections = array(), array $args = array() ) {
-			global $pagenow;
-
-			if ( Redux_Core::is_heartbeat() ) {
-				return;
-			}
-
-			$args['load_on_cron'] = $args['load_on_cron'] ?? false;
-
-			if ( false === $args['load_on_cron'] && 'wp-cron.php' === $pagenow ) {
-				return;
-			}
-
-			if ( empty( $args ) || ( empty( $args['opt_name'] ) ) ) {
-				return;
-			}
-
-			if ( ! isset( Redux::$init[ $args['opt_name'] ] ) ) {
-				// Let's go back to the Redux API instead of having it run directly.
-				Redux_Functions_Ex::record_caller( $args['opt_name'] );
-				Redux::set_args( $args['opt_name'], $args );
-				if ( ! empty( $sections ) ) {
-					Redux::set_sections( $args['opt_name'], $sections );
-				}
-				$sections = Redux::construct_sections( $args['opt_name'] );
-				$args     = Redux::construct_args( $args['opt_name'] );
-				Redux::set_defaults( $args['opt_name'] );
-				Redux::$init[ $args['opt_name'] ] = 1;
-			}
-
-			$args             = new Redux_Args( $this, $args );
-			$this->args_class = $args;
-			$this->args       = $args->get;
-
-			Redux_Core::core_construct( $this );
-
-			new Redux_Admin_Notices( $this );
-
-			if ( ! empty( $this->args['opt_name'] ) ) {
-				new Redux_Instances( $this );
-
-				Redux_Core::$filesystem = Redux_Filesystem::get_instance( $this );
-
-				$this->filesystem = $this->deprecated_filesystem( Redux_Core::$filesystem );
-
-				/**
-				 * Filter 'redux/options/{opt_name}/sections'
-				 *
-				 * @param  array $sections field option sections
-				 */
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				$this->sections = apply_filters( "redux/options/{$this->args['opt_name']}/sections", $sections );
-
-				/**
-				 * Construct hook
-				 * action 'redux/construct'
-				 *
-				 * @param object $this ReduxFramework
-				 */
-
-				// phpcs:ignore WordPress.NamingConventions.ValidHookName
-				do_action( 'redux/construct', $this );
-
-				// Internationalization.
-				new Redux_I18n( $this, __FILE__ );
-
-				$this->required_class  = new Redux_Required( $this );
-				$this->transient_class = new Redux_Transients( $this );
-				$this->wordpress_data  = new Redux_WordPress_Data( $this );
-				$this->validate_class  = new Redux_Validation( $this );
-				$this->sanitize_class  = new Redux_Sanitize( $this );
-
-				// Register extra extensions.
-				new Redux_Extensions( $this );
-
-				// Grab database values.
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-				$this->options_class->get();
-
-				$this->output_class  = new Redux_Output( $this );
-				$this->render_class  = new Redux_Page_Render( $this );
-				$this->enqueue_class = new Redux_Enqueue( $this );
-
-				new Redux_AJAX_Save( $this );
-				new Redux_AJAX_Typography( $this );
-				new Redux_AJAX_Select2( $this );
-			}
-
-			/**
-			 * Loaded hook
-			 * action 'redux/loaded'
-			 *
-			 * @param  object $this ReduxFramework
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			do_action( 'redux/loaded', $this );
-		}
-
-		/**
-		 * Begin backward compatibility shims for Redux v3 configs and extensions.
-		 */
-
-		/**
-		 * SHIM: _register_settings
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _register_settings() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->register()' );
-
-			$this->options_class->register();
-		}
-
-		/**
-		 * SHIM: _field_input
-		 *
-		 * @param array        $field Field array.
-		 * @param string|array $v     Field values.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _field_input( array $field, $v = null ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->field_input( $field, $value )' );
-
-			$this->render_class->field_input( $field, $v );
-		}
-
-		/**
-		 * SHIM: field_default_values
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function field_default_values( array $field ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_defaults_class->field_default_values( $opt_name, $field )' );
-
-			$this->options_defaults_class->field_default_values( '', $field );
-		}
-
-		/**
-		 * SHIM: set_options
-		 *
-		 * @param string|array $value Option values.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function set_options( $value ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->set( $value )' );
-
-			$this->options_class->set( $value );
-		}
-
-		/**
-		 * SHIM: get_options
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_options() {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get()' );
-
-			$this->options_class->get();
-		}
-
-		/**
-		 * SHIM: _default_values
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _default_values() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->default_values()' );
-
-			return $this->default_values();
-		}
-
-		/**
-		 * Get default values.
-		 *
-		 * @return array
-		 */
-		public function default_values() {
-			if ( ! isset( $this->options_class ) ) {
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-			}
-
-			return $this->options_class->default_values();
-		}
-
-		/**
-		 * SHIM: check_dependencies
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function check_dependencies( array $field ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'required_class->check_dependencies( $field )' );
-
-			$this->required_class->check_dependencies( $field );
-		}
-
-		/**
-		 * SHIM: _enqueue_output
-		 *
-		 * @throws ReflectionException Exception.
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _enqueue_output() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'output_class->enqueue()' );
-
-			if ( empty( $this->output_class ) ) {
-				$obj          = new ReduxFramework( $this->sections, $this->args );
-				$obj->options = $this->options;
-				$obj->output_class->enqueue();
-				$this->outputCSS = $obj->outputCSS; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
-			} else {
-				$this->output_class->enqueue();
-			}
-		}
-
-		/**
-		 * SHIM: _enqueue
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _enqueue() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'enqueue_class->init()' );
-
-			$this->enqueue_class->init();
-		}
-
-		/**
-		 * _enqueue replacement.
-		 *
-		 * @return void
-		 */
-		public function init_enqueue() {
-			$this->enqueue_class->init();
-		}
-
-		/**
-		 * SHIM: generate_panel
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function generate_panel() {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->generate_panel()' );
-
-			$this->render_class->generate_panel();
-		}
-
-		/**
-		 * SHIM: get_default_values
-		 *
-		 * @param string $key       Key value.
-		 * @param bool   $array_key Flag to determine array status.
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_default_values( $key, $array_key = false ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
-
-			if ( ! isset( $this->options_class ) ) {
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-			}
-
-			return $this->options_class->get_default_value( $key, $array_key );
-		}
-
-		/**
-		 * SHIM: get_default_value
-		 *
-		 * @param string $key       Key value.
-		 * @param bool   $array_key Flag to determine array status.
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_default_value( $key, $array_key = false ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
-
-			if ( ! isset( $this->options_class ) ) {
-				$this->options_defaults_class = new Redux_Options_Defaults();
-				$this->options_class          = new Redux_Options_Constructor( $this );
-			}
-
-			return $this->options_class->get_default_value( $key, $array_key );
-		}
-
-		/**
-		 * SHIM: get_wordpress_data
-		 *
-		 * @param bool         $type data type.
-		 * @param array        $args args to pass to WordPress API.
-		 * @param string|array $current_value Current value.
-		 *
-		 * @return array|mixed|string|void
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_wordpress_data( $type = false, $args = array(), $current_value = null ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'wordpress_data->get( $type, $args, $opt_name, $value )' );
-
-			return $this->wordpress_data->get( $type, $args, $this->args['opt_name'], $current_value );
-		}
-
-		/**
-		 * SHIM: _validate_values
-		 *
-		 * @param array $plugin_options Current panel options.
-		 * @param array $options        Options to validate.
-		 * @param array $sections       Sections array.
-		 *
-		 * @return array
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function _validate_values( $plugin_options, $options, $sections ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-			_deprecated_function( __FUNCTION__, '4.0.0', 'validate_class->validate( $plugin_options, $options, $sections )' );
-
-			if ( ! isset( $this->validate_class ) ) {
-				$this->validate_class = new Redux_Validation( $this );
-			}
-
-			return $this->validate_class->validate( $plugin_options, $options, $sections );
-		}
-
-		/**
-		 * SHIM: set_transients
-		 *
-		 * @return void
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function set_transients() {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'Please update the extension that uses this deprecated function.' );
-		}
-
-		/**
-		 * SHIM: section_menu
-		 *
-		 * @param int    $k        Array Key.
-		 * @param array  $section  Section array.
-		 * @param string $suffix   Unique string.
-		 * @param array  $sections Section array.
-		 *
-		 * @return string
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function section_menu( $k, $section, $suffix = '', $sections = array() ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->section_menu( $index, $section, $suffix, $sections )' );
-
-			return $this->render_class->section_menu( $k, $section, $suffix, $sections );
-		}
-
-		/**
-		 * SHIM: get_header_html
-		 *
-		 * @param array $field Field array.
-		 *
-		 * @return string
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function get_header_html( $field ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'render_class->get_header_html( $field )' );
-
-			return $this->render_class->get_header_html( $field );
-		}
-
-		/**
-		 * SHIM: current_user_can
-		 *
-		 * @param string $permission User permission.
-		 *
-		 * @return bool
-		 *
-		 * @deprecated 4.0.0
-		 */
-		public function current_user_can( $permission ) {
-			_deprecated_function( __FUNCTION__, '4.0.0', 'Redux_Helpers::current_user_can' );
-
-			return Redux_Helpers::current_user_can( $permission );
-		}
-
-		/**
-		 * End backward compatibility shims for Redux v3 configs and extensions.
-		 */
-
-		/**
-		 * Pointer to the ReduxFramework instance.
-		 *
-		 * @return ReduxFramework|null
-		 */
-		public function get_instance(): ?ReduxFramework {
-			return self::$instance;
-		}
-
-		/**
-		 * →get(); This is used to return and option value from the option array
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       string $opt_name The option name to return.
-		 * @param       mixed  $defaults (null) The value to return if an option isn't set.
-		 *
-		 * @return      mixed
-		 */
-		public function get( string $opt_name, $defaults = null ) {
-			return ( ! empty( $this->options[ $opt_name ] ) ) ? $this->options[ $opt_name ] : $this->options_class->get_default( $opt_name, $defaults );
-		}
-
-		/**
-		 * →set(); This is used to set an arbitrary option in the option array
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       string $opt_name The name of the option being added.
-		 * @param       mixed  $values   The value of the option being added.
-		 *
-		 * @return      void
-		 */
-		public function set( string $opt_name = '', $values = array() ) {
-			if ( ! empty( $opt_name ) && is_array( $values ) ) {
-				$this->options[ $opt_name ] = $values;
-				$this->options_class->set( $values );
-			}
-		}
-	}
-
-	ReduxFramework::init();
-
-	/**
-	 * Action 'redux/init'
-	 */
-	do_action( 'redux/init' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
+    /**
+     * Main ReduxFramework class
+     *
+     * @since       1.0.0
+     */
+    class ReduxFramework {
+
+        /**
+         * ReduxFramework instance storage.
+         *
+         * @var null|ReduxFramework
+         * @access public
+         */
+        public static ?ReduxFramework $instance;
+
+        /**
+         * Redux current version.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_version = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Absolute directory of the Redux instance.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Full URL of the Redux instance.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_url = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Current WordPress upload directory.
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_upload_dir = ''; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Current WordPress upload URL
+         *
+         * @var string
+         * @access public
+         *
+         * @deprecated 4.0.0
+         */
+        public static string $_upload_url; // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Init
+         *
+         * Backward compatibility for previous versions of Redux.
+         */
+        public static function init() {
+
+            // Backward compatibility for extensions.
+            self::$_version    = Redux_Core::$version;
+            self::$_dir        = Redux_Core::$dir;
+            self::$_url        = Redux_Core::$url;
+            self::$_upload_dir = Redux_Core::$upload_dir;
+            self::$_upload_url = Redux_Core::$upload_url;
+            self::$_as_plugin  = Redux_Core::$as_plugin;
+            self::$_is_plugin  = Redux_Core::$is_plugin;
+        }
+
+        /**
+         * Array of field arrays.
+         *
+         * @var null|array
+         */
+        public ?array $fields = array();
+
+        /**
+         * Array of field sections.
+         *
+         * @var null|array
+         */
+        public ?array $field_sections = array();
+
+        /**
+         * Array of field types.
+         *
+         * @var null|array
+         */
+        public ?array $field_types = array();
+
+        /**
+         * Array of field heads.
+         *
+         * @var null|array
+         */
+        public ?array $field_head = array();
+
+        /**
+         * Array of extensions by type used in the panel.
+         *
+         * @var null|array
+         */
+        public ?array $extensions = array();
+
+        /**
+         * Array of sections and fields arrays.
+         *
+         * @var null|array
+         */
+        public ?array $sections = array();
+
+        /**
+         * Array of generated errors from the panel for localization.
+         *
+         * @var null|array
+         */
+        public ?array $errors = array();
+
+        /**
+         * Array of generated warnings from the panel for localization.
+         *
+         * @var null|array
+         */
+        public ?array $warnings = array();
+
+        /**
+         * Array of generated sanitize notices from the panel for localization.
+         *
+         * @var null|array
+         */
+        public ?array $sanitize = array();
+
+        /**
+         * Array of current option values.
+         *
+         * @var null|array
+         */
+        public ?array $options = array();
+
+        /**
+         * Array of option defaults.
+         *
+         * @var null|array
+         */
+        public ?array $options_defaults = null;
+
+        /**
+         * Array of fields set to trigger the compiler hook.
+         *
+         * @var null|array
+         */
+        public ?array $compiler_fields = array();
+
+        /**
+         * Array of fields with CSS output selectors.
+         *
+         * @var null|array
+         */
+        public ?array $output = array();
+
+        /**
+         * Autogenerated CSS appended to the header (snake case maintained for backward compatibility).
+         *
+         * @var null|string
+         */
+        public ?string $outputCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+        /**
+         * Autogenerated variables appended to dynamic output.
+         *
+         * @var null|array
+         */
+        public ?array $output_variables = array();
+
+        /**
+         * CSS sent to the compiler hook (snake case maintained for backward compatibility).
+         *
+         * @var null|string
+         */
+        public ?string $compilerCSS = ''; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+        /**
+         * Array of global arguments.
+         *
+         * @var array|null
+         */
+        public ?array $args = array();
+
+        /**
+         * Used in customizer hooks.
+         *
+         * @var null|string
+         */
+        public ?string $old_opt_name = '';
+
+        /**
+         * Pointer to the Redux_Options_Default class.
+         *
+         * @var null|Redux_Options_Defaults
+         */
+        public ?Redux_Options_Defaults $options_defaults_class = null;
+
+        /**
+         * Pointer to the Redux_Options class.
+         *
+         * @var null|Redux_Options_Constructor
+         */
+        public ?Redux_Options_Constructor $options_class = null;
+
+        /**
+         * Pointer to the Redux_Required class
+         *
+         * @var null|Redux_Required
+         */
+        public ?Redux_Required $required_class = null;
+
+        /**
+         * Pointer to the Redux_Output class.
+         *
+         * @var null|Redux_Output
+         */
+        public ?Redux_Output $output_class = null;
+
+        /**
+         * Pointer to the Redux_Page_Render class.
+         *
+         * @var null|Redux_Page_Render
+         */
+        public ?Redux_Page_Render $render_class = null;
+
+        /**
+         * Pointer to the Redux_Enqueue class.
+         *
+         * @var null|Redux_Enqueue
+         */
+        public ?Redux_Enqueue $enqueue_class = null;
+
+        /**
+         * Pointer to the Redux_Transients class.
+         *
+         * @var null|Redux_Transients
+         */
+        public ?Redux_Transients $transient_class = null;
+
+        /**
+         * Pointer to the Redux_wordPress_Data class.
+         *
+         * @var null|Redux_WordPress_Data
+         */
+        public ?Redux_WordPress_Data $wordpress_data = null;
+
+        /**
+         * Pointer to the Redux_Validation class.
+         *
+         * @var null|Redux_Validation
+         */
+        public ?Redux_Validation $validate_class = null;
+
+        /**
+         * Pointer to the Redux_Sanitize class.
+         *
+         * @var null|Redux_Sanitize
+         */
+        public ?Redux_Sanitize $sanitize_class = null;
+
+        /**
+         * Pointer to the Redux_Args class.
+         *
+         * @var null|Redux_Args
+         */
+        public ?Redux_Args $args_class = null;
+
+        /**
+         * Array of active transients used by Redux.
+         *
+         * @var null|mixed
+         */
+        public $transients = array();
+
+        /**
+         * Array of localized repeater data.
+         *
+         * @var null|array
+         */
+        public ?array $repeater_data = array();
+
+        /**
+         * Array of localized data.
+         *
+         * @var null|array
+         */
+        public ?array $localize_data = array();
+
+        /**
+         * Array of checked transients used by Redux.
+         *
+         * @var null|mixed
+         */
+        public $transients_check = array();
+
+        /**
+         * Never save to DB flag for metaboxes.
+         *
+         * @var bool
+         */
+        public bool $never_save_to_db;
+
+        /**
+         * File system object used for I/O file operations.  Done the WordPress way.
+         *
+         * @var null|object
+         *
+         * @deprecated 4.5.1
+         */
+        public ?object $filesystem;
+
+        /**
+         * Deprecated shim for v3 templates.
+         *
+         * @var null|array
+         *
+         * @deprecated 4.0.0
+         */
+        public ?array $hidden_perm_sections = array();
+
+        /**
+         * Deprecated shim for v3 as plugin check.
+         *
+         * @var bool
+         *
+         * @deprecated 4.0.0
+         */
+        public static bool $_as_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Deprecated shim for v3 as plugin check.
+         *
+         * @var bool
+         *
+         * @deprecated 4.0.0
+         */
+        public static bool $_is_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+
+        /**
+         * Cloning is forbidden.
+         *
+         * @since 4.0.0
+         */
+        public function __clone() {
+            _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
+        }
+
+        /**
+         * Un-serializing instances of this class are forbidden.
+         *
+         * @since 4.0.0
+         */
+        public function __wakeup() {
+            _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin’ eh?', 'redux-framework' ), '4.0' );
+        }
+
+        /**
+         * Add a deprecating notice for all the old themes that still use this method..
+         *
+         * @param object $filesystem Filesystem object.
+         *
+         * @since 4.0.0
+         */
+        private function deprecated_filesystem( $filesystem ) {
+            //_deprecated_function( esc_html__( 'The global variable "$filesystem" of the ReduxFramework object', 'redux-framework' ), '4.5.1', 'Redux_Core::$filesystem' );
+
+            return $filesystem;
+        }
+
+        /**
+         * Class Constructor. Defines the args for the theme options class
+         *
+         * @param array $sections Panel sections.
+         * @param array $args     Class constructor arguments.
+         *
+         * @throws ReflectionException Exception.
+         * @since       1.0.0
+         */
+        public function __construct( array $sections = array(), array $args = array() ) {
+            global $pagenow;
+
+            if ( Redux_Core::is_heartbeat() ) {
+                return;
+            }
+
+            $args['load_on_cron'] = $args['load_on_cron'] ?? false;
+
+            if ( false === $args['load_on_cron'] && 'wp-cron.php' === $pagenow ) {
+                return;
+            }
+
+            if ( empty( $args ) || ( empty( $args['opt_name'] ) ) ) {
+                return;
+            }
+
+            if ( ! isset( Redux::$init[ $args['opt_name'] ] ) ) {
+                // Let's go back to the Redux API instead of having it run directly.
+                Redux_Functions_Ex::record_caller( $args['opt_name'] );
+                Redux::set_args( $args['opt_name'], $args );
+                if ( ! empty( $sections ) ) {
+                    Redux::set_sections( $args['opt_name'], $sections );
+                }
+                $sections = Redux::construct_sections( $args['opt_name'] );
+                $args     = Redux::construct_args( $args['opt_name'] );
+                Redux::set_defaults( $args['opt_name'] );
+                Redux::$init[ $args['opt_name'] ] = 1;
+            }
+
+            $args             = new Redux_Args( $this, $args );
+            $this->args_class = $args;
+            $this->args       = $args->get;
+
+            Redux_Core::core_construct( $this );
+
+            new Redux_Admin_Notices( $this );
+
+            if ( ! empty( $this->args['opt_name'] ) ) {
+                new Redux_Instances( $this );
+
+                Redux_Core::$filesystem = Redux_Filesystem::get_instance( $this );
+
+                $this->filesystem = $this->deprecated_filesystem( Redux_Core::$filesystem );
+
+                /**
+                 * Filter 'redux/options/{opt_name}/sections'
+                 *
+                 * @param  array $sections field option sections
+                 */
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                $this->sections = apply_filters( "redux/options/{$this->args['opt_name']}/sections", $sections );
+
+                /**
+                 * Construct hook
+                 * action 'redux/construct'
+                 *
+                 * @param object $this ReduxFramework
+                 */
+
+                // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                do_action( 'redux/construct', $this );
+
+                // Internationalization.
+                new Redux_I18n( $this, __FILE__ );
+
+                $this->required_class  = new Redux_Required( $this );
+                $this->transient_class = new Redux_Transients( $this );
+                $this->wordpress_data  = new Redux_WordPress_Data( $this );
+                $this->validate_class  = new Redux_Validation( $this );
+                $this->sanitize_class  = new Redux_Sanitize( $this );
+
+                // Register extra extensions.
+                new Redux_Extensions( $this );
+
+                // Grab database values.
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+                $this->options_class->get();
+
+                $this->output_class  = new Redux_Output( $this );
+                $this->render_class  = new Redux_Page_Render( $this );
+                $this->enqueue_class = new Redux_Enqueue( $this );
+
+                new Redux_AJAX_Save( $this );
+                new Redux_AJAX_Typography( $this );
+                new Redux_AJAX_Select2( $this );
+            }
+
+            /**
+             * Loaded hook
+             * action 'redux/loaded'
+             *
+             * @param  object $this ReduxFramework
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            do_action( 'redux/loaded', $this );
+        }
+
+        /**
+         * Begin backward compatibility shims for Redux v3 configs and extensions.
+         */
+
+        /**
+         * SHIM: _register_settings
+         *
+         * @deprecated 4.0.0
+         */
+        public function _register_settings() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->register()' );
+
+            $this->options_class->register();
+        }
+
+        /**
+         * SHIM: _field_input
+         *
+         * @param array        $field Field array.
+         * @param string|array $v     Field values.
+         *
+         * @deprecated 4.0.0
+         */
+        public function _field_input( array $field, $v = null ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->field_input( $field, $value )' );
+
+            $this->render_class->field_input( $field, $v );
+        }
+
+        /**
+         * SHIM: field_default_values
+         *
+         * @param array $field Field array.
+         *
+         * @deprecated 4.0.0
+         */
+        public function field_default_values( array $field ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_defaults_class->field_default_values( $opt_name, $field )' );
+
+            $this->options_defaults_class->field_default_values( '', $field );
+        }
+
+        /**
+         * SHIM: set_options
+         *
+         * @param string|array $value Option values.
+         *
+         * @deprecated 4.0.0
+         */
+        public function set_options( $value ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->set( $value )' );
+
+            $this->options_class->set( $value );
+        }
+
+        /**
+         * SHIM: get_options
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_options() {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get()' );
+
+            $this->options_class->get();
+        }
+
+        /**
+         * SHIM: _default_values
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function _default_values() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->default_values()' );
+
+            return $this->default_values();
+        }
+
+        /**
+         * Get default values.
+         *
+         * @return array
+         */
+        public function default_values() {
+            if ( ! isset( $this->options_class ) ) {
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+            }
+
+            return $this->options_class->default_values();
+        }
+
+        /**
+         * SHIM: check_dependencies
+         *
+         * @param array $field Field array.
+         *
+         * @deprecated 4.0.0
+         */
+        public function check_dependencies( array $field ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'required_class->check_dependencies( $field )' );
+
+            $this->required_class->check_dependencies( $field );
+        }
+
+        /**
+         * SHIM: _enqueue_output
+         *
+         * @throws ReflectionException Exception.
+         *
+         * @deprecated 4.0.0
+         */
+        public function _enqueue_output() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'output_class->enqueue()' );
+
+            if ( empty( $this->output_class ) ) {
+                $obj          = new ReduxFramework( $this->sections, $this->args );
+                $obj->options = $this->options;
+                $obj->output_class->enqueue();
+                $this->outputCSS = $obj->outputCSS; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+            } else {
+                $this->output_class->enqueue();
+            }
+        }
+
+        /**
+         * SHIM: _enqueue
+         *
+         * @deprecated 4.0.0
+         */
+        public function _enqueue() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'enqueue_class->init()' );
+
+            $this->enqueue_class->init();
+        }
+
+        /**
+         * _enqueue replacement.
+         *
+         * @return void
+         */
+        public function init_enqueue() {
+            $this->enqueue_class->init();
+        }
+
+        /**
+         * SHIM: generate_panel
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         *
+         * @deprecated 4.0.0
+         */
+        public function generate_panel() {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->generate_panel()' );
+
+            $this->render_class->generate_panel();
+        }
+
+        /**
+         * SHIM: get_default_values
+         *
+         * @param string $key       Key value.
+         * @param bool   $array_key Flag to determine array status.
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_default_values( $key, $array_key = false ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
+
+            if ( ! isset( $this->options_class ) ) {
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+            }
+
+            return $this->options_class->get_default_value( $key, $array_key );
+        }
+
+        /**
+         * SHIM: get_default_value
+         *
+         * @param string $key       Key value.
+         * @param bool   $array_key Flag to determine array status.
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_default_value( $key, $array_key = false ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'options_class->get_default_value( $key, $array_key )' );
+
+            if ( ! isset( $this->options_class ) ) {
+                $this->options_defaults_class = new Redux_Options_Defaults();
+                $this->options_class          = new Redux_Options_Constructor( $this );
+            }
+
+            return $this->options_class->get_default_value( $key, $array_key );
+        }
+
+        /**
+         * SHIM: get_wordpress_data
+         *
+         * @param bool         $type data type.
+         * @param array        $args args to pass to WordPress API.
+         * @param string|array $current_value Current value.
+         *
+         * @return array|mixed|string|void
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_wordpress_data( $type = false, $args = array(), $current_value = null ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'wordpress_data->get( $type, $args, $opt_name, $value )' );
+
+            return $this->wordpress_data->get( $type, $args, $this->args['opt_name'], $current_value );
+        }
+
+        /**
+         * SHIM: _validate_values
+         *
+         * @param array $plugin_options Current panel options.
+         * @param array $options        Options to validate.
+         * @param array $sections       Sections array.
+         *
+         * @return array
+         *
+         * @deprecated 4.0.0
+         */
+        public function _validate_values( $plugin_options, $options, $sections ) { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+            _deprecated_function( __FUNCTION__, '4.0.0', 'validate_class->validate( $plugin_options, $options, $sections )' );
+
+            if ( ! isset( $this->validate_class ) ) {
+                $this->validate_class = new Redux_Validation( $this );
+            }
+
+            return $this->validate_class->validate( $plugin_options, $options, $sections );
+        }
+
+        /**
+         * SHIM: set_transients
+         *
+         * @return void
+         *
+         * @deprecated 4.0.0
+         */
+        public function set_transients() {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'Please update the extension that uses this deprecated function.' );
+        }
+
+        /**
+         * SHIM: section_menu
+         *
+         * @param int    $k        Array Key.
+         * @param array  $section  Section array.
+         * @param string $suffix   Unique string.
+         * @param array  $sections Section array.
+         *
+         * @return string
+         *
+         * @deprecated 4.0.0
+         */
+        public function section_menu( $k, $section, $suffix = '', $sections = array() ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->section_menu( $index, $section, $suffix, $sections )' );
+
+            return $this->render_class->section_menu( $k, $section, $suffix, $sections );
+        }
+
+        /**
+         * SHIM: get_header_html
+         *
+         * @param array $field Field array.
+         *
+         * @return string
+         *
+         * @deprecated 4.0.0
+         */
+        public function get_header_html( $field ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'render_class->get_header_html( $field )' );
+
+            return $this->render_class->get_header_html( $field );
+        }
+
+        /**
+         * SHIM: current_user_can
+         *
+         * @param string $permission User permission.
+         *
+         * @return bool
+         *
+         * @deprecated 4.0.0
+         */
+        public function current_user_can( $permission ) {
+            _deprecated_function( __FUNCTION__, '4.0.0', 'Redux_Helpers::current_user_can' );
+
+            return Redux_Helpers::current_user_can( $permission );
+        }
+
+        /**
+         * End backward compatibility shims for Redux v3 configs and extensions.
+         */
+
+        /**
+         * Pointer to the ReduxFramework instance.
+         *
+         * @return ReduxFramework|null
+         */
+        public function get_instance(): ?ReduxFramework {
+            return self::$instance;
+        }
+
+        /**
+         * →get(); This is used to return and option value from the option array
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       string $opt_name The option name to return.
+         * @param       mixed  $defaults (null) The value to return if an option isn't set.
+         *
+         * @return      mixed
+         */
+        public function get( string $opt_name, $defaults = null ) {
+            return ( ! empty( $this->options[ $opt_name ] ) ) ? $this->options[ $opt_name ] : $this->options_class->get_default( $opt_name, $defaults );
+        }
+
+        /**
+         * →set(); This is used to set an arbitrary option in the option array
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       string $opt_name The name of the option being added.
+         * @param       mixed  $values   The value of the option being added.
+         *
+         * @return      void
+         */
+        public function set( string $opt_name = '', $values = array() ) {
+            if ( ! empty( $opt_name ) && is_array( $values ) ) {
+                $this->options[ $opt_name ] = $values;
+                $this->options_class->set( $values );
+            }
+        }
+    }
+
+    ReduxFramework::init();
+
+    /**
+     * Action 'redux/init'
+     */
+    do_action( 'redux/init' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName
 }

redux-core/inc/classes/class-redux-validation.php

Indentation +237 added lines, -237 removed lines

@@ -11,241 +11,241 @@
 
 if ( ! class_exists( 'Redux_Validation', false ) ) {
 
-	/**
-	 * Class Redux_Validation
-	 */
-	class Redux_Validation extends Redux_Class {
-
-		/**
-		 * Validate values from options form (used in settings api validate function)
-		 * calls the custom validation class for the field so authors can override with custom classes
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 *
-		 * @param       array $plugin_options Plugin Options.
-		 * @param       array $options        Options.
-		 * @param       array $sections       Sections array.
-		 *
-		 * @return      array $plugin_options
-		 */
-		public function validate( array $plugin_options, array $options, array $sections ): array {
-			$core = $this->core();
-
-			if (null === $core) {
-				return $plugin_options;
-			}
-
-			foreach ( $sections as $k => $section ) {
-				if ( isset( $section['fields'] ) ) {
-					foreach ( $section['fields'] as $fkey => $field ) {
-						if ( is_array( $field ) ) {
-							$field['section_id'] = $k;
-						}
-
-						if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
-							if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
-								$plugin_options[ $field['id'] ] = 0;
-							}
-						}
-
-						// Part of Dovy's serialize typography effort.  Preserved here in case it becomes a thing. - kp.
-						/**
-						 * If ( isset ( $field['type'] ) && $field['type'] == 'typography' ) {
-						 *      if ( ! is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-						 *          $plugin_options[ $field['id'] ] = json_decode( $plugin_options[ $field['id'] ], true );
-						 *      }
-						 * }
-						 */
-
-						if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
-							$plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
-						}
-
-						// Make sure 'validate' field is set.
-						if ( isset( $field['validate'] ) ) {
-
-							// Can we make this an array of validations?
-							$val_arr = array();
-
-							if ( is_array( $field['validate'] ) ) {
-								$val_arr = $field['validate'];
-							} else {
-								$val_arr[] = $field['validate'];
-							}
-
-							foreach ( $val_arr as $idx => $val ) {
-								// shim for old *_not_empty validations.
-								if ( 'email_not_empty' === $val || 'numeric_not_empty' === $val ) {
-									$val = 'not_empty';
-								}
-
-								// Make sure 'validate field' is set to 'not_empty'.
-								$is_not_empty = false;
-
-								if ( 'not_empty' === $val ) {
-									// Set the flag.
-									$is_not_empty = true;
-								}
-
-								// Check for empty id value.
-								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
-
-									// If we are looking for an empty value, in the case of 'not_empty'
-									// then we need to keep processing.
-									if ( ! $is_not_empty ) {
-
-										// Empty id and not checking for 'not_empty'.  Bail out...
-										if ( ! isset( $field['validate_callback'] ) ) {
-											continue;
-										}
-									}
-								}
-
-								// Force validate of custom field types.
-								if ( isset( $field['type'] ) && ! isset( $val ) && ! isset( $field['validate_callback'] ) ) {
-									if ( 'color' === $field['type'] || 'color_gradient' === $field['type'] ) {
-										$val = 'color';
-									} elseif ( 'date' === $field['type'] ) {
-										$val = 'date';
-									}
-								}
-
-								// No need.  Spectrum self validates.
-								if ( 'color_rgba' === $field['type'] ) {
-									continue;
-								}
-
-								// Shim out old color rgba validators.
-								if ( 'color_rgba' === $val || 'colorrgba' === $val ) {
-									$val = 'color';
-								}
-
-								$validate = 'Redux_Validation_' . $val;
-
-								if ( ! class_exists( $validate ) ) {
-									$file = str_replace( '_', '-', $val );
-
-									/**
-									 * Filter 'redux/validate/{opt_name}/class/{field.validate}'
-									 *
-									 * @param string $validate   validation class file path
-									 */
-
-									// phpcs:ignore WordPress.NamingConventions.ValidHookName
-									$class_file = apply_filters( "redux/validate/{$core->args['opt_name']}/class/$val", Redux_Core::$dir . "inc/validation/$val/class-redux-validation-$file.php", $validate );
-
-									if ( $class_file ) {
-										if ( file_exists( $class_file ) ) {
-											require_once $class_file;
-										}
-									}
-								}
-
-								if ( class_exists( $validate ) ) {
-									if ( empty( $options[ $field['id'] ] ) ) {
-										$options[ $field['id'] ] = '';
-									}
-
-									if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-										foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
-											$before = null;
-											$after  = null;
-
-											if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
-													$before = $plugin_options[ $field['id'] ][ $key ];
-												} else {
-													$before = trim( $plugin_options[ $field['id'] ][ $key ] );
-												}
-											}
-
-											if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												$after = $options[ $field['id'] ][ $key ];
-											}
-
-											$validation = new $validate( $core, $field, $before, $after );
-
-											if ( ! empty( $validation->value ) || '0' === $validation->value ) {
-												$plugin_options[ $field['id'] ][ $key ] = $validation->value;
-											} else {
-												unset( $plugin_options[ $field['id'] ][ $key ] );
-											}
-
-											if ( ! empty( $validation->error ) ) {
-												$core->errors[] = $validation->error;
-											}
-
-											if ( ! empty( $validation->warning ) ) {
-												$core->warnings[] = $validation->warning;
-											}
-
-											if ( ! empty( $validation->sanitize ) ) {
-												$core->sanitize[] = $validation->sanitize;
-											}
-										}
-									} else {
-										if ( isset( $plugin_options[ $field['id'] ] ) ) {
-											if ( is_array( $plugin_options[ $field['id'] ] ) ) {
-												$pofi = $plugin_options[ $field['id'] ];
-											} else {
-												$pofi = trim( $plugin_options[ $field['id'] ] );
-											}
-										} else {
-											$pofi = null;
-										}
-
-										$validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
-										$plugin_options[ $field['id'] ] = $validation->value;
-
-										if ( ! empty( $validation->error ) ) {
-											$core->errors[] = $validation->error;
-										}
-
-										if ( ! empty( $validation->warning ) ) {
-											$core->warnings[] = $validation->warning;
-										}
-
-										if ( ! empty( $validation->sanitize ) ) {
-											$core->sanitize[] = $validation->sanitize;
-										}
-									}
-
-									break;
-								}
-							}
-						}
-
-						if ( isset( $field['validate_callback'] ) && ( is_callable( $field['validate_callback'] ) || ( is_string( $field['validate_callback'] ) && function_exists( $field['validate_callback'] ) ) ) ) {
-							$callback = $field['validate_callback'];
-							unset( $field['validate_callback'] );
-
-							$plugin_option = $plugin_options[ $field['id'] ] ?? null;
-							$option        = $options[ $field['id'] ] ?? null;
-
-							if ( null !== $plugin_option ) {
-								$callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
-
-								$plugin_options[ $field['id'] ] = $callbackvalues['value'];
-
-								if ( isset( $callbackvalues['error'] ) ) {
-									$core->errors[] = $callbackvalues['error'];
-								}
-
-								if ( isset( $callbackvalues['warning'] ) ) {
-									$core->warnings[] = $callbackvalues['warning'];
-								}
-
-								if ( isset( $callbackvalues['sanitize'] ) ) {
-									$core->sanitize[] = $callbackvalues['sanitize'];
-								}
-							}
-						}
-					}
-				}
-			}
-
-			return $plugin_options;
-		}
-	}
+    /**
+     * Class Redux_Validation
+     */
+    class Redux_Validation extends Redux_Class {
+
+        /**
+         * Validate values from options form (used in settings api validate function)
+         * calls the custom validation class for the field so authors can override with custom classes
+         *
+         * @since       1.0.0
+         * @access      public
+         *
+         * @param       array $plugin_options Plugin Options.
+         * @param       array $options        Options.
+         * @param       array $sections       Sections array.
+         *
+         * @return      array $plugin_options
+         */
+        public function validate( array $plugin_options, array $options, array $sections ): array {
+            $core = $this->core();
+
+            if (null === $core) {
+                return $plugin_options;
+            }
+
+            foreach ( $sections as $k => $section ) {
+                if ( isset( $section['fields'] ) ) {
+                    foreach ( $section['fields'] as $fkey => $field ) {
+                        if ( is_array( $field ) ) {
+                            $field['section_id'] = $k;
+                        }
+
+                        if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
+                            if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
+                                $plugin_options[ $field['id'] ] = 0;
+                            }
+                        }
+
+                        // Part of Dovy's serialize typography effort.  Preserved here in case it becomes a thing. - kp.
+                        /**
+                         * If ( isset ( $field['type'] ) && $field['type'] == 'typography' ) {
+                         *      if ( ! is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
+                         *          $plugin_options[ $field['id'] ] = json_decode( $plugin_options[ $field['id'] ], true );
+                         *      }
+                         * }
+                         */
+
+                        if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
+                            $plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
+                        }
+
+                        // Make sure 'validate' field is set.
+                        if ( isset( $field['validate'] ) ) {
+
+                            // Can we make this an array of validations?
+                            $val_arr = array();
+
+                            if ( is_array( $field['validate'] ) ) {
+                                $val_arr = $field['validate'];
+                            } else {
+                                $val_arr[] = $field['validate'];
+                            }
+
+                            foreach ( $val_arr as $idx => $val ) {
+                                // shim for old *_not_empty validations.
+                                if ( 'email_not_empty' === $val || 'numeric_not_empty' === $val ) {
+                                    $val = 'not_empty';
+                                }
+
+                                // Make sure 'validate field' is set to 'not_empty'.
+                                $is_not_empty = false;
+
+                                if ( 'not_empty' === $val ) {
+                                    // Set the flag.
+                                    $is_not_empty = true;
+                                }
+
+                                // Check for empty id value.
+                                if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+
+                                    // If we are looking for an empty value, in the case of 'not_empty'
+                                    // then we need to keep processing.
+                                    if ( ! $is_not_empty ) {
+
+                                        // Empty id and not checking for 'not_empty'.  Bail out...
+                                        if ( ! isset( $field['validate_callback'] ) ) {
+                                            continue;
+                                        }
+                                    }
+                                }
+
+                                // Force validate of custom field types.
+                                if ( isset( $field['type'] ) && ! isset( $val ) && ! isset( $field['validate_callback'] ) ) {
+                                    if ( 'color' === $field['type'] || 'color_gradient' === $field['type'] ) {
+                                        $val = 'color';
+                                    } elseif ( 'date' === $field['type'] ) {
+                                        $val = 'date';
+                                    }
+                                }
+
+                                // No need.  Spectrum self validates.
+                                if ( 'color_rgba' === $field['type'] ) {
+                                    continue;
+                                }
+
+                                // Shim out old color rgba validators.
+                                if ( 'color_rgba' === $val || 'colorrgba' === $val ) {
+                                    $val = 'color';
+                                }
+
+                                $validate = 'Redux_Validation_' . $val;
+
+                                if ( ! class_exists( $validate ) ) {
+                                    $file = str_replace( '_', '-', $val );
+
+                                    /**
+                                     * Filter 'redux/validate/{opt_name}/class/{field.validate}'
+                                     *
+                                     * @param string $validate   validation class file path
+                                     */
+
+                                    // phpcs:ignore WordPress.NamingConventions.ValidHookName
+                                    $class_file = apply_filters( "redux/validate/{$core->args['opt_name']}/class/$val", Redux_Core::$dir . "inc/validation/$val/class-redux-validation-$file.php", $validate );
+
+                                    if ( $class_file ) {
+                                        if ( file_exists( $class_file ) ) {
+                                            require_once $class_file;
+                                        }
+                                    }
+                                }
+
+                                if ( class_exists( $validate ) ) {
+                                    if ( empty( $options[ $field['id'] ] ) ) {
+                                        $options[ $field['id'] ] = '';
+                                    }
+
+                                    if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
+                                        foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+                                            $before = null;
+                                            $after  = null;
+
+                                            if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                    $before = $plugin_options[ $field['id'] ][ $key ];
+                                                } else {
+                                                    $before = trim( $plugin_options[ $field['id'] ][ $key ] );
+                                                }
+                                            }
+
+                                            if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
+                                                $after = $options[ $field['id'] ][ $key ];
+                                            }
+
+                                            $validation = new $validate( $core, $field, $before, $after );
+
+                                            if ( ! empty( $validation->value ) || '0' === $validation->value ) {
+                                                $plugin_options[ $field['id'] ][ $key ] = $validation->value;
+                                            } else {
+                                                unset( $plugin_options[ $field['id'] ][ $key ] );
+                                            }
+
+                                            if ( ! empty( $validation->error ) ) {
+                                                $core->errors[] = $validation->error;
+                                            }
+
+                                            if ( ! empty( $validation->warning ) ) {
+                                                $core->warnings[] = $validation->warning;
+                                            }
+
+                                            if ( ! empty( $validation->sanitize ) ) {
+                                                $core->sanitize[] = $validation->sanitize;
+                                            }
+                                        }
+                                    } else {
+                                        if ( isset( $plugin_options[ $field['id'] ] ) ) {
+                                            if ( is_array( $plugin_options[ $field['id'] ] ) ) {
+                                                $pofi = $plugin_options[ $field['id'] ];
+                                            } else {
+                                                $pofi = trim( $plugin_options[ $field['id'] ] );
+                                            }
+                                        } else {
+                                            $pofi = null;
+                                        }
+
+                                        $validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
+                                        $plugin_options[ $field['id'] ] = $validation->value;
+
+                                        if ( ! empty( $validation->error ) ) {
+                                            $core->errors[] = $validation->error;
+                                        }
+
+                                        if ( ! empty( $validation->warning ) ) {
+                                            $core->warnings[] = $validation->warning;
+                                        }
+
+                                        if ( ! empty( $validation->sanitize ) ) {
+                                            $core->sanitize[] = $validation->sanitize;
+                                        }
+                                    }
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        if ( isset( $field['validate_callback'] ) && ( is_callable( $field['validate_callback'] ) || ( is_string( $field['validate_callback'] ) && function_exists( $field['validate_callback'] ) ) ) ) {
+                            $callback = $field['validate_callback'];
+                            unset( $field['validate_callback'] );
+
+                            $plugin_option = $plugin_options[ $field['id'] ] ?? null;
+                            $option        = $options[ $field['id'] ] ?? null;
+
+                            if ( null !== $plugin_option ) {
+                                $callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
+
+                                $plugin_options[ $field['id'] ] = $callbackvalues['value'];
+
+                                if ( isset( $callbackvalues['error'] ) ) {
+                                    $core->errors[] = $callbackvalues['error'];
+                                }
+
+                                if ( isset( $callbackvalues['warning'] ) ) {
+                                    $core->warnings[] = $callbackvalues['warning'];
+                                }
+
+                                if ( isset( $callbackvalues['sanitize'] ) ) {
+                                    $core->sanitize[] = $callbackvalues['sanitize'];
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return $plugin_options;
+        }
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -32,7 +32,7 @@ 
 		public function validate( array $plugin_options, array $options, array $sections ): array {
 			$core = $this->core();
 
-			if (null === $core) {
+			if ( null === $core ) {
 				return $plugin_options;
 			}
 
@@ -44,8 +44,8 @@ 
 						}
 
 						if ( isset( $field['type'] ) && ( 'checkbox' === $field['type'] || 'checkbox_hide_below' === $field['type'] || 'checkbox_hide_all' === $field['type'] ) ) {
-							if ( ! isset( $plugin_options[ $field['id'] ] ) ) {
-								$plugin_options[ $field['id'] ] = 0;
+							if ( ! isset( $plugin_options[$field['id']] ) ) {
+								$plugin_options[$field['id']] = 0;
 							}
 						}
 
@@ -58,8 +58,8 @@ 
 						 * }
 						 */
 
-						if ( isset( $core->extensions[ $field['type'] ] ) && method_exists( $core->extensions[ $field['type'] ], '_validate_values' ) ) {
-							$plugin_options = $core->extensions[ $field['type'] ]->_validate_values( $plugin_options, $field, $sections );
+						if ( isset( $core->extensions[$field['type']] ) && method_exists( $core->extensions[$field['type']], '_validate_values' ) ) {
+							$plugin_options = $core->extensions[$field['type']]->_validate_values( $plugin_options, $field, $sections );
 						}
 
 						// Make sure 'validate' field is set.
@@ -89,7 +89,7 @@ 
 								}
 
 								// Check for empty id value.
-								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[ $field['id'] ] ) || ( '' === $plugin_options[ $field['id'] ] ) ) {
+								if ( ! isset( $field['id'] ) || ! isset( $plugin_options[$field['id']] ) || ( '' === $plugin_options[$field['id']] ) ) {
 
 									// If we are looking for an empty value, in the case of 'not_empty'
 									// then we need to keep processing.
@@ -143,33 +143,33 @@ 
 								}
 
 								if ( class_exists( $validate ) ) {
-									if ( empty( $options[ $field['id'] ] ) ) {
-										$options[ $field['id'] ] = '';
+									if ( empty( $options[$field['id']] ) ) {
+										$options[$field['id']] = '';
 									}
 
-									if ( isset( $plugin_options[ $field['id'] ] ) && is_array( $plugin_options[ $field['id'] ] ) && ! empty( $plugin_options[ $field['id'] ] ) ) {
-										foreach ( $plugin_options[ $field['id'] ] as $key => $value ) {
+									if ( isset( $plugin_options[$field['id']] ) && is_array( $plugin_options[$field['id']] ) && ! empty( $plugin_options[$field['id']] ) ) {
+										foreach ( $plugin_options[$field['id']] as $key => $value ) {
 											$before = null;
 											$after  = null;
 
-											if ( isset( $plugin_options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												if ( is_array( $plugin_options[ $field['id'] ][ $key ] ) ) {
-													$before = $plugin_options[ $field['id'] ][ $key ];
+											if ( isset( $plugin_options[$field['id']][$key] ) && ( ! empty( $plugin_options[$field['id']][$key] ) || '0' === $plugin_options[$field['id']][$key] ) ) {
+												if ( is_array( $plugin_options[$field['id']][$key] ) ) {
+													$before = $plugin_options[$field['id']][$key];
 												} else {
-													$before = trim( $plugin_options[ $field['id'] ][ $key ] );
+													$before = trim( $plugin_options[$field['id']][$key] );
 												}
 											}
 
-											if ( isset( $options[ $field['id'] ][ $key ] ) && ( ! empty( $plugin_options[ $field['id'] ][ $key ] ) || '0' === $plugin_options[ $field['id'] ][ $key ] ) ) {
-												$after = $options[ $field['id'] ][ $key ];
+											if ( isset( $options[$field['id']][$key] ) && ( ! empty( $plugin_options[$field['id']][$key] ) || '0' === $plugin_options[$field['id']][$key] ) ) {
+												$after = $options[$field['id']][$key];
 											}
 
 											$validation = new $validate( $core, $field, $before, $after );
 
 											if ( ! empty( $validation->value ) || '0' === $validation->value ) {
-												$plugin_options[ $field['id'] ][ $key ] = $validation->value;
+												$plugin_options[$field['id']][$key] = $validation->value;
 											} else {
-												unset( $plugin_options[ $field['id'] ][ $key ] );
+												unset( $plugin_options[$field['id']][$key] );
 											}
 
 											if ( ! empty( $validation->error ) ) {
@@ -185,18 +185,18 @@ 
 											}
 										}
 									} else {
-										if ( isset( $plugin_options[ $field['id'] ] ) ) {
-											if ( is_array( $plugin_options[ $field['id'] ] ) ) {
-												$pofi = $plugin_options[ $field['id'] ];
+										if ( isset( $plugin_options[$field['id']] ) ) {
+											if ( is_array( $plugin_options[$field['id']] ) ) {
+												$pofi = $plugin_options[$field['id']];
 											} else {
-												$pofi = trim( $plugin_options[ $field['id'] ] );
+												$pofi = trim( $plugin_options[$field['id']] );
 											}
 										} else {
 											$pofi = null;
 										}
 
-										$validation                     = new $validate( $core, $field, $pofi, $options[ $field['id'] ] );
-										$plugin_options[ $field['id'] ] = $validation->value;
+										$validation                     = new $validate( $core, $field, $pofi, $options[$field['id']] );
+										$plugin_options[$field['id']] = $validation->value;
 
 										if ( ! empty( $validation->error ) ) {
 											$core->errors[] = $validation->error;
@@ -220,13 +220,13 @@ 
 							$callback = $field['validate_callback'];
 							unset( $field['validate_callback'] );
 
-							$plugin_option = $plugin_options[ $field['id'] ] ?? null;
-							$option        = $options[ $field['id'] ] ?? null;
+							$plugin_option = $plugin_options[$field['id']] ?? null;
+							$option        = $options[$field['id']] ?? null;
 
 							if ( null !== $plugin_option ) {
 								$callbackvalues = call_user_func( $callback, $field, $plugin_option, $option );
 
-								$plugin_options[ $field['id'] ] = $callbackvalues['value'];
+								$plugin_options[$field['id']] = $callbackvalues['value'];
 
 								if ( isset( $callbackvalues['error'] ) ) {
 									$core->errors[] = $callbackvalues['error'];