reduxframework / redux-framework

redux-core/framework.php

Spacing +6 added lines, -6 removed lines

@@ -452,7 +452,7 @@ 
 		 *
 		 * @deprecated 4.0.0
 		 */
-		public static bool $_as_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+		public static bool $_as_plugin = false; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
 		/**
 		 * Deprecated shim for v3 as plugin check.
@@ -461,7 +461,7 @@ 
 		 *
 		 * @deprecated 4.0.0
 		 */
-		public static bool $_is_plugin = false;  // phpcs:ignore PSR2.Classes.PropertyDeclaration
+		public static bool $_is_plugin = false; // phpcs:ignore PSR2.Classes.PropertyDeclaration
 
 		/**
 		 * Cloning is forbidden.
@@ -507,7 +507,7 @@ 
 				return;
 			}
 
-			if ( ! isset( Redux::$init[ $args['opt_name'] ] ) ) {
+			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 );
@@ -517,7 +517,7 @@ 
 				$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;
+				Redux::$init[$args['opt_name']] = 1;
 			}
 
 			$args             = new Redux_Args( $this, $args );
@@ -913,7 +913,7 @@ 
 		 * @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 );
+			return ( ! empty( $this->options[$opt_name] ) ) ? $this->options[$opt_name] : $this->options_class->get_default( $opt_name, $defaults );
 		}
 
 		/**
@@ -929,7 +929,7 @@ 
 		 */
 		public function set( string $opt_name = '', $values = array() ) {
 			if ( ! empty( $opt_name ) && is_array( $values ) ) {
-				$this->options[ $opt_name ] = $values;
+				$this->options[$opt_name] = $values;
 				$this->options_class->set( $values );
 			}
 		}

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/fields/ace_editor/class-redux-ace-editor.php

Indentation +71 added lines, -71 removed lines

@@ -13,45 +13,45 @@ 
 // Don't duplicate me!
 if ( ! class_exists( 'Redux_Ace_Editor', false ) ) {
 
-	/**
-	 * Class Redux_Ace_Editor
-	 */
-	class Redux_Ace_Editor extends Redux_Field {
+    /**
+     * Class Redux_Ace_Editor
+     */
+    class Redux_Ace_Editor extends Redux_Field {
 
-		/**
-		 * Field Render Function.
-		 * Takes the vars and outputs the HTML for the field in the settings
-		 *
-		 * @since ReduxFramework 1.0.0
-		 */
-		public function render() {
-			if ( is_array( $this->value ) ) {
-				$this->value = '';
-			} else {
-				$this->value = trim( $this->value );
-			}
+        /**
+         * Field Render Function.
+         * Takes the vars and outputs the HTML for the field in the settings
+         *
+         * @since ReduxFramework 1.0.0
+         */
+        public function render() {
+            if ( is_array( $this->value ) ) {
+                $this->value = '';
+            } else {
+                $this->value = trim( $this->value );
+            }
 
-			if ( ! empty( $this->field['options'] ) ) {
-				$this->field['args'] = $this->field['options'];
-				unset( $this->field['options'] );
-			}
+            if ( ! empty( $this->field['options'] ) ) {
+                $this->field['args'] = $this->field['options'];
+                unset( $this->field['options'] );
+            }
 
-			if ( ! isset( $this->field['mode'] ) ) {
-				$this->field['mode'] = 'javascript';
-			}
-			if ( ! isset( $this->field['theme'] ) ) {
-				$this->field['theme'] = 'monokai';
-			}
+            if ( ! isset( $this->field['mode'] ) ) {
+                $this->field['mode'] = 'javascript';
+            }
+            if ( ! isset( $this->field['theme'] ) ) {
+                $this->field['theme'] = 'monokai';
+            }
 
-			$params = array(
-				'minLines' => 10,
-				'maxLines' => 30,
-			);
+            $params = array(
+                'minLines' => 10,
+                'maxLines' => 30,
+            );
 
-			if ( isset( $this->field['args'] ) && ! empty( $this->field['args'] ) && is_array( $this->field['args'] ) ) {
-				$params = wp_parse_args( $this->field['args'], $params );
-			}
-			?>
+            if ( isset( $this->field['args'] ) && ! empty( $this->field['args'] ) && is_array( $this->field['args'] ) ) {
+                $params = wp_parse_args( $this->field['args'], $params );
+            }
+            ?>
 			<div class="ace-wrapper">
 				<input
 					type="hidden"
@@ -70,46 +70,46 @@ 
 					class="ace-editor-area"><?php echo esc_html( $this->value ); ?></pre>
 			</div>
 			<?php
-		}
+        }
 
-		/**
-		 * Enqueue Function.
-		 * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
-		 *
-		 * @since       1.0.0
-		 * @access      public
-		 * @return      void
-		 */
-		public function enqueue() {
-			if ( $this->parent->args['dev_mode'] ) {
-				wp_enqueue_style(
-					'redux-field-ace-editor',
-					Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor.css',
-					array(),
-					$this->timestamp
-				);
-			}
+        /**
+         * Enqueue Function.
+         * If this field requires any scripts, or css define this function and register/enqueue the scripts/css
+         *
+         * @since       1.0.0
+         * @access      public
+         * @return      void
+         */
+        public function enqueue() {
+            if ( $this->parent->args['dev_mode'] ) {
+                wp_enqueue_style(
+                    'redux-field-ace-editor',
+                    Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor.css',
+                    array(),
+                    $this->timestamp
+                );
+            }
 
-			if ( ! wp_script_is( 'ace-editor-js' ) ) {
-				wp_enqueue_script(
-					'ace-editor-js',
-					// phpcs:ignore Generic.Strings.UnnecessaryStringConcat
-					apply_filters( 'redux/' . $this->parent->args['opt_name'] . 'fields/ace/script', '//' . 'cdnjs' . '.cloudflare' . '.com/ajax/libs/ace/1.23.0/ace.min.js' ),
-					array( 'jquery' ),
-					'1.23.0',
-					true
-				);
-			}
+            if ( ! wp_script_is( 'ace-editor-js' ) ) {
+                wp_enqueue_script(
+                    'ace-editor-js',
+                    // phpcs:ignore Generic.Strings.UnnecessaryStringConcat
+                    apply_filters( 'redux/' . $this->parent->args['opt_name'] . 'fields/ace/script', '//' . 'cdnjs' . '.cloudflare' . '.com/ajax/libs/ace/1.23.0/ace.min.js' ),
+                    array( 'jquery' ),
+                    '1.23.0',
+                    true
+                );
+            }
 
-			wp_enqueue_script(
-				'redux-field-ace-editor',
-				Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor' . Redux_Functions::is_min() . '.js',
-				array( 'jquery', 'ace-editor-js', 'redux-js' ),
-				$this->timestamp,
-				true
-			);
-		}
-	}
+            wp_enqueue_script(
+                'redux-field-ace-editor',
+                Redux_Core::$url . 'inc/fields/ace_editor/redux-ace-editor' . Redux_Functions::is_min() . '.js',
+                array( 'jquery', 'ace-editor-js', 'redux-js' ),
+                $this->timestamp,
+                true
+            );
+        }
+    }
 }
 
 class_alias( 'Redux_Ace_Editor', 'ReduxFramework_Ace_Editor' );

redux-core/inc/welcome/class-redux-welcome.php

Indentation +150 added lines, -150 removed lines

@@ -8,111 +8,111 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'Redux_Welcome', false ) ) {
 
-	/**
-	 * Class Redux_Welcome
-	 */
-	class Redux_Welcome {
-
-		/**
-		 * Min capacity.
-		 *
-		 * @var string The capability users should have to view the page
-		 */
-		public string $minimum_capability = 'manage_options';
-
-		/**
-		 * Display version.
-		 *
-		 * @var string
-		 */
-		public string $display_version = '';
-
-		/**
-		 * Is loaded.
-		 *
-		 * @var bool
-		 */
-		public bool $redux_loaded = false;
-
-		/**
-		 * Get things started
-		 *
-		 * @since 1.4
-		 */
-		public function __construct() {
-			// Load the welcome page even if a Redux panel isn't running.
-			add_action( 'init', array( $this, 'init' ), 999 );
-		}
-
-		/**
-		 * Class init.
-		 */
-		public function init() {
-			if ( $this->redux_loaded ) {
-				return;
-			}
-
-			$this->redux_loaded = true;
-			add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-
-			if ( isset( $_GET['page'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				if ( 'redux-' === substr( sanitize_text_field( wp_unslash( $_GET['page'] ) ), 0, 6 ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-					$version               = explode( '.', Redux_Core::$version );
-					$this->display_version = $version[0] . '.' . $version[1];
-					add_filter( 'admin_footer_text', array( $this, 'change_wp_footer' ) );
-					add_action( 'admin_head', array( $this, 'admin_head' ) );
-				}
-			}
-		}
-
-		/**
-		 * Do Redirect.
-		 */
-		public function do_redirect() {
-			if ( ! defined( 'WP_CLI' ) ) {
-				wp_safe_redirect( esc_url( admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) ) ) );
-				exit();
-			}
-		}
-
-		/**
-		 * Change Footer.
-		 */
-		public function change_wp_footer() {
-			echo esc_html__( 'If you like', 'redux-framework' ) . ' <strong>Redux</strong> ' . esc_html__( 'please leave us a', 'redux-framework' ) . ' <a href="https://wordpress.org/support/view/plugin-reviews/redux-framework?filter=5#postform" target="_blank" class="redux-rating-link" data-rated="Thanks :)">&#9733;&#9733;&#9733;&#9733;&#9733;</a> ' . esc_html__( 'rating. A huge thank you in advance!', 'redux-framework' );
-		}
-
-
-
-		/**
-		 * Register the Dashboard Pages which are later hidden but these pages
-		 * are used to render the What's Redux pages.
-		 *
-		 * @access public
-		 * @since  1.4
-		 * @return void
-		 */
-		public function admin_menus() {
-			$page = 'add_options_page';
-
-			// About Page.
-			$page( esc_html__( 'What is Redux Framework?', 'redux-framework' ), esc_html__( 'Redux', 'redux-framework' ), $this->minimum_capability, 'redux-framework', array( $this, 'about_screen' ) );
-		}
-
-		/**
-		 * Hide Individual Dashboard Pages
-		 *
-		 * @access public
-		 * @since  1.4
-		 * @return void
-		 */
-		public function admin_head() {
-			?>
+    /**
+     * Class Redux_Welcome
+     */
+    class Redux_Welcome {
+
+        /**
+         * Min capacity.
+         *
+         * @var string The capability users should have to view the page
+         */
+        public string $minimum_capability = 'manage_options';
+
+        /**
+         * Display version.
+         *
+         * @var string
+         */
+        public string $display_version = '';
+
+        /**
+         * Is loaded.
+         *
+         * @var bool
+         */
+        public bool $redux_loaded = false;
+
+        /**
+         * Get things started
+         *
+         * @since 1.4
+         */
+        public function __construct() {
+            // Load the welcome page even if a Redux panel isn't running.
+            add_action( 'init', array( $this, 'init' ), 999 );
+        }
+
+        /**
+         * Class init.
+         */
+        public function init() {
+            if ( $this->redux_loaded ) {
+                return;
+            }
+
+            $this->redux_loaded = true;
+            add_action( 'admin_menu', array( $this, 'admin_menus' ) );
+
+            if ( isset( $_GET['page'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                if ( 'redux-' === substr( sanitize_text_field( wp_unslash( $_GET['page'] ) ), 0, 6 ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                    $version               = explode( '.', Redux_Core::$version );
+                    $this->display_version = $version[0] . '.' . $version[1];
+                    add_filter( 'admin_footer_text', array( $this, 'change_wp_footer' ) );
+                    add_action( 'admin_head', array( $this, 'admin_head' ) );
+                }
+            }
+        }
+
+        /**
+         * Do Redirect.
+         */
+        public function do_redirect() {
+            if ( ! defined( 'WP_CLI' ) ) {
+                wp_safe_redirect( esc_url( admin_url( add_query_arg( array( 'page' => 'redux-framework' ), 'options-general.php' ) ) ) );
+                exit();
+            }
+        }
+
+        /**
+         * Change Footer.
+         */
+        public function change_wp_footer() {
+            echo esc_html__( 'If you like', 'redux-framework' ) . ' <strong>Redux</strong> ' . esc_html__( 'please leave us a', 'redux-framework' ) . ' <a href="https://wordpress.org/support/view/plugin-reviews/redux-framework?filter=5#postform" target="_blank" class="redux-rating-link" data-rated="Thanks :)">&#9733;&#9733;&#9733;&#9733;&#9733;</a> ' . esc_html__( 'rating. A huge thank you in advance!', 'redux-framework' );
+        }
+
+
+
+        /**
+         * Register the Dashboard Pages which are later hidden but these pages
+         * are used to render the What's Redux pages.
+         *
+         * @access public
+         * @since  1.4
+         * @return void
+         */
+        public function admin_menus() {
+            $page = 'add_options_page';
+
+            // About Page.
+            $page( esc_html__( 'What is Redux Framework?', 'redux-framework' ), esc_html__( 'Redux', 'redux-framework' ), $this->minimum_capability, 'redux-framework', array( $this, 'about_screen' ) );
+        }
+
+        /**
+         * Hide Individual Dashboard Pages
+         *
+         * @access public
+         * @since  1.4
+         * @return void
+         */
+        public function admin_head() {
+            ?>
 			<link
 				rel='stylesheet' id='elusive-icons' <?php // phpcs:ignore WordPress.WP.EnqueuedResources ?>
 				href='<?php echo esc_url( Redux_Core::$url ); ?>assets/css/vendor/elusive-icons.css'
@@ -133,19 +133,19 @@ 
 				}
 			</style>
 			<?php
-		}
-
-		/**
-		 * Navigation tabs
-		 *
-		 * @access public
-		 * @since  1.9
-		 * @return void
-		 */
-		public function tabs() {
-			$selected = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : 'redux-framework'; // phpcs:ignore WordPress.Security.NonceVerification
-
-			?>
+        }
+
+        /**
+         * Navigation tabs
+         *
+         * @access public
+         * @since  1.9
+         * @return void
+         */
+        public function tabs() {
+            $selected = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : 'redux-framework'; // phpcs:ignore WordPress.Security.NonceVerification
+
+            ?>
 			<h2 class="nav-tab-wrapper">
 				<a
 					class="nav-tab <?php echo( 'redux-framework' === $selected ? 'nav-tab-active' : '' ); ?>"
@@ -154,27 +154,27 @@ 
 				</a>
 			</h2>
 			<?php
-		}
-
-		/**
-		 * Render About Screen
-		 *
-		 * @access public
-		 * @since  1.4
-		 * @return void
-		 */
-		public function about_screen() {
-			// Stupid hack for WordPress alerts and warnings.
-			echo '<div class="wrap" style="height:0;overflow:hidden;"><h2></h2></div>';
-
-			require_once 'views/about.php';
-		}
-
-		/**
-		 * Action.
-		 */
-		public function actions() {
-			?>
+        }
+
+        /**
+         * Render About Screen
+         *
+         * @access public
+         * @since  1.4
+         * @return void
+         */
+        public function about_screen() {
+            // Stupid hack for WordPress alerts and warnings.
+            echo '<div class="wrap" style="height:0;overflow:hidden;"><h2></h2></div>';
+
+            require_once 'views/about.php';
+        }
+
+        /**
+         * Action.
+         */
+        public function actions() {
+            ?>
 			<p class="redux-actions">
 				<a href="https://devs.redux.io/" class="docs button button-primary">Docs</a>
 				<a
@@ -189,30 +189,30 @@ 
 					data-via="ReduxFramework" data-size="large" data-hashtags="Redux">Tweet</a>
 				<?php
 
-				$options = Redux_Helpers::get_plugin_options();
-				$nonce   = wp_create_nonce( 'redux_framework_demo' );
+                $options = Redux_Helpers::get_plugin_options();
+                $nonce   = wp_create_nonce( 'redux_framework_demo' );
 
-				$query_args = array(
-					'page'                   => 'redux-framework',
-					'redux-framework-plugin' => 'demo',
-					'nonce'                  => $nonce,
-				);
+                $query_args = array(
+                    'page'                   => 'redux-framework',
+                    'redux-framework-plugin' => 'demo',
+                    'nonce'                  => $nonce,
+                );
 
-				if ( $options['demo'] ) {
-					?>
+                if ( $options['demo'] ) {
+                    ?>
 					<a
 						href="<?php echo esc_url( admin_url( add_query_arg( $query_args, 'options-general.php' ) ) ); ?>"
 						class=" button-text button-demo"><?php echo esc_html__( 'Disable Panel Demo', 'redux-framework' ); ?></a>
 					<?php
-				} else {
-					?>
+                } else {
+                    ?>
 					<a
 						href="<?php echo esc_url( admin_url( add_query_arg( $query_args, 'options-general.php' ) ) ); ?>"
 						class=" button-text button-demo active"><?php echo esc_html__( 'Enable Panel Demo', 'redux-framework' ); ?></a>
 					<?php
-				}
+                }
 
-				?>
+                ?>
 				<script>
 					!function( d, s, id ) {
 						let js;
@@ -229,6 +229,6 @@ 
 				</script>
 			</p>
 			<?php
-		}
-	}
+        }
+    }
 }

redux-core/inc/themecheck/checks/class-redux-embedded.php

Indentation +54 added lines, -54 removed lines

@@ -14,67 +14,67 @@
  */
 class Redux_Embedded implements themecheck {
 
-	/**
-	 * Error array.
-	 *
-	 * @var array
-	 */
-	protected array $error = array();
+    /**
+     * Error array.
+     *
+     * @var array
+     */
+    protected array $error = array();
 
-	/**
-	 * Run checker.
-	 *
-	 * @param array $php_files - Files to check.
-	 * @param array $css_files - Files to check.
-	 * @param array $other_files - Files to check.
-	 *
-	 * @return bool
-	 */
-	public function check( $php_files, $css_files, $other_files ): bool {
+    /**
+     * Run checker.
+     *
+     * @param array $php_files - Files to check.
+     * @param array $css_files - Files to check.
+     * @param array $other_files - Files to check.
+     *
+     * @return bool
+     */
+    public function check( $php_files, $css_files, $other_files ): bool {
 
-		$ret   = true;
-		$check = Redux_ThemeCheck::get_instance();
-		$redux = $check::get_redux_details( $php_files );
+        $ret   = true;
+        $check = Redux_ThemeCheck::get_instance();
+        $redux = $check::get_redux_details( $php_files );
 
-		if ( $redux ) {
-			checkcount();
+        if ( $redux ) {
+            checkcount();
 
-			if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
-				$ret           = false;
-			} else {
-				// TODO Granular WP.org tests!!!
-				// Check for Tracking.
-				$tracking = $redux['dir'] . 'inc/tracking.php';
-				if ( file_exists( $tracking ) ) {
-					$this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
-					$ret           = false;
-				}
+            if ( ! isset( $_POST['redux_wporg'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'If you are submitting to WordPress.org Theme Repository, it is', 'redux-framework' ) . ' <strong>' . esc_html__( 'strongly', 'redux-framework' ) . '</strong> ' . esc_html__( 'suggested that you read', 'redux-framework' ) . ' <a href="%s" target="_blank">' . esc_html__( 'this document', 'redux-framework' ) . '</a>, ' . esc_html__( 'or your theme will be rejected because of Redux.', 'redux-framework' ), 'https://docsv3.redux.io/core/wordpress-org-submissions/' ) . '</div>';
+                $ret           = false;
+            } else {
+                // TODO Granular WP.org tests!!!
+                // Check for Tracking.
+                $tracking = $redux['dir'] . 'inc/tracking.php';
+                if ( file_exists( $tracking ) ) {
+                    $this->error[] = '<div class="redux-error">' . sprintf( '<span class="tc-lead tc-required">' . esc_html__( 'REQUIRED', 'redux-framework' ) . '</span>: ' . esc_html__( 'You MUST delete', 'redux-framework' ) . ' <strong> %s </strong>, ' . esc_html__( 'or your theme will be rejected by WP.org theme submission because of Redux.', 'redux-framework' ), $tracking ) . '</div>';
+                    $ret           = false;
+                }
 
-				// Embedded CDN package
-				// use_cdn
-				// Arguments.
-				$args          = '<ol>';
-				$args         .= "<li><code>'save_defaults' => false</code></li>";
-				$args         .= "<li><code>'use_cdn' => false</code></li>";
-				$args         .= "<li><code>'customizer_only' => true</code> Non-Customizer Based Panels are Prohibited within WP.org Themes</li>";
-				$args         .= "<li><code>'database' => 'theme_mods'</code> (' . esc_html__( 'Optional', 'redux-framework' ) . ')</li>";
-				$args         .= '</ol>';
-				$this->error[] = '<div class="redux-error"><span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'The following arguments MUST be used for WP.org submissions, or you will be rejected because of your Redux configuration.', 'redux-framework' ) . $args . '</div>';
-			}
-		}
+                // Embedded CDN package
+                // use_cdn
+                // Arguments.
+                $args          = '<ol>';
+                $args         .= "<li><code>'save_defaults' => false</code></li>";
+                $args         .= "<li><code>'use_cdn' => false</code></li>";
+                $args         .= "<li><code>'customizer_only' => true</code> Non-Customizer Based Panels are Prohibited within WP.org Themes</li>";
+                $args         .= "<li><code>'database' => 'theme_mods'</code> (' . esc_html__( 'Optional', 'redux-framework' ) . ')</li>";
+                $args         .= '</ol>';
+                $this->error[] = '<div class="redux-error"><span class="tc-lead tc-recommended">' . esc_html__( 'RECOMMENDED', 'redux-framework' ) . '</span>: ' . esc_html__( 'The following arguments MUST be used for WP.org submissions, or you will be rejected because of your Redux configuration.', 'redux-framework' ) . $args . '</div>';
+            }
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
-	/**
-	 * Return error array.
-	 *
-	 * @return array
-	 */
-	public function getError(): array {
-		return $this->error;
-	}
+    /**
+     * Return error array.
+     *
+     * @return array
+     */
+    public function getError(): array {
+        return $this->error;
+    }
 }
 
 $themechecks[] = new Redux_Embedded();

redux-core/inc/lib/redux-instances.php

Indentation +4 added lines, -4 removed lines

@@ -17,9 +17,9 @@ 
  * @return ReduxFramework                ReduxFramework
  */
 function get_redux_instance( string $opt_name ): ReduxFramework {
-	_deprecated_function( __FUNCTION__, '4.0', 'Redux::instance($opt_name)' );
+    _deprecated_function( __FUNCTION__, '4.0', 'Redux::instance($opt_name)' );
 
-	return Redux::instance( $opt_name );
+    return Redux::instance( $opt_name );
 }
 
 /**
@@ -30,7 +30,7 @@ 
  * @return array        format ['opt_name' => $ReduxFramework]
  */
 function get_all_redux_instances(): array {
-	_deprecated_function( __FUNCTION__, '4.0', 'Redux::all_instances()' );
+    _deprecated_function( __FUNCTION__, '4.0', 'Redux::all_instances()' );
 
-	return Redux::all_instances();
+    return Redux::all_instances();
 }

redux-core/inc/lib/elusive-icons.php

Indentation +300 added lines, -300 removed lines

@@ -16,304 +16,304 @@
  * @return array
  */
 function redux_get_font_icons(): array {
-	return array(
-		'el el-address-book-alt',
-		'el el-address-book',
-		'el el-adjust-alt',
-		'el el-adjust',
-		'el el-adult',
-		'el el-align-center',
-		'el el-align-justify',
-		'el el-align-left',
-		'el el-align-right',
-		'el el-arrow-down',
-		'el el-arrow-left',
-		'el el-arrow-right',
-		'el el-arrow-up',
-		'el el-asl',
-		'el el-asterisk',
-		'el el-backward',
-		'el el-ban-circle',
-		'el el-barcode',
-		'el el-behance',
-		'el el-bell',
-		'el el-blind',
-		'el el-blogger',
-		'el el-bold',
-		'el el-book',
-		'el el-bookmark-empty',
-		'el el-bookmark',
-		'el el-braille',
-		'el el-briefcase',
-		'el el-broom',
-		'el el-brush',
-		'el el-bulb',
-		'el el-bullhorn',
-		'el el-calendar-sign',
-		'el el-calendar',
-		'el el-camera',
-		'el el-car',
-		'el el-caret-down',
-		'el el-caret-left',
-		'el el-caret-right',
-		'el el-caret-up',
-		'el el-cc',
-		'el el-certificate',
-		'el el-check-empty',
-		'el el-check',
-		'el el-chevron-down',
-		'el el-chevron-left',
-		'el el-chevron-right',
-		'el el-chevron-up',
-		'el el-child',
-		'el el-circle-arrow-down',
-		'el el-circle-arrow-left',
-		'el el-circle-arrow-right',
-		'el el-circle-arrow-up',
-		'el el-cloud-alt',
-		'el el-cloud',
-		'el el-cog-alt',
-		'el el-cog',
-		'el el-cogs',
-		'el el-comment-alt',
-		'el el-comment',
-		'el el-compass-alt',
-		'el el-compass',
-		'el el-credit-card',
-		'el el-css',
-		'el el-dashboard',
-		'el el-delicious',
-		'el el-deviantart',
-		'el el-digg',
-		'el el-download-alt',
-		'el el-download',
-		'el el-dribbble',
-		'el el-edit',
-		'el el-eject',
-		'el el-envelope-alt',
-		'el el-envelope',
-		'el el-error-alt',
-		'el el-error',
-		'el el-eur',
-		'el el-exclamation-sign',
-		'el el-eye-close',
-		'el el-eye-open',
-		'el el-facebook',
-		'el el-facetime-video',
-		'el el-fast-backward',
-		'el el-fast-forward',
-		'el el-female',
-		'el el-file-alt',
-		'el el-file-edit-alt',
-		'el el-file-edit',
-		'el el-file-new-alt',
-		'el el-file-new',
-		'el el-file',
-		'el el-film',
-		'el el-filter',
-		'el el-fire',
-		'el el-flag-alt',
-		'el el-flag',
-		'el el-flickr',
-		'el el-folder-close',
-		'el el-folder-open',
-		'el el-folder-sign',
-		'el el-folder',
-		'el el-font',
-		'el el-fontsize',
-		'el el-fork',
-		'el el-forward-alt',
-		'el el-forward',
-		'el el-foursquare',
-		'el el-friendfeed-rect',
-		'el el-friendfeed',
-		'el el-fullscreen',
-		'el el-gbp',
-		'el el-gift',
-		'el el-github-text',
-		'el el-github',
-		'el el-glass',
-		'el el-glasses',
-		'el el-globe-alt',
-		'el el-globe',
-		'el el-googleplus',
-		'el el-graph-alt',
-		'el el-graph',
-		'el el-group-alt',
-		'el el-group',
-		'el el-guidedog',
-		'el el-hand-down',
-		'el el-hand-left',
-		'el el-hand-right',
-		'el el-hand-up',
-		'el el-hdd',
-		'el el-headphones',
-		'el el-hearing-impaired',
-		'el el-heart-alt',
-		'el el-heart-empty',
-		'el el-heart',
-		'el el-home-alt',
-		'el el-home',
-		'el el-hourglass',
-		'el el-idea-alt',
-		'el el-idea',
-		'el el-inbox-alt',
-		'el el-inbox-box',
-		'el el-inbox',
-		'el el-indent-left',
-		'el el-indent-right',
-		'el el-info-circle',
-		'el el-instagram',
-		'el el-iphone-home',
-		'el el-italic',
-		'el el-key',
-		'el el-laptop-alt',
-		'el el-laptop',
-		'el el-lastfm',
-		'el el-leaf',
-		'el el-lines',
-		'el el-link',
-		'el el-linkedin',
-		'el el-list-alt',
-		'el el-list',
-		'el el-livejournal',
-		'el el-lock-alt',
-		'el el-lock',
-		'el el-magic',
-		'el el-magnet',
-		'el el-male',
-		'el el-map-marker-alt',
-		'el el-map-marker',
-		'el el-mic-alt',
-		'el el-mic',
-		'el el-minus-sign',
-		'el el-minus',
-		'el el-move',
-		'el el-music',
-		'el el-myspace',
-		'el el-network',
-		'el el-off',
-		'el el-ok-circle',
-		'el el-ok-sign',
-		'el el-ok',
-		'el el-opensource',
-		'el el-paper-clip-alt',
-		'el el-paper-clip',
-		'el el-path',
-		'el el-pause-alt',
-		'el el-pause',
-		'el el-pencil-alt',
-		'el el-pencil',
-		'el el-person',
-		'el el-phone-alt',
-		'el el-phone',
-		'el el-photo-alt',
-		'el el-photo',
-		'el el-picasa',
-		'el el-picture',
-		'el el-plane',
-		'el el-play-alt',
-		'el el-play-circle',
-		'el el-play',
-		'el el-plus-sign',
-		'el el-plus',
-		'el el-podcast',
-		'el el-print',
-		'el el-puzzle',
-		'el el-qrcode',
-		'el el-question-sign',
-		'el el-question',
-		'el el-quote-alt',
-		'el el-quotes',
-		'el el-random',
-		'el el-record',
-		'el el-reddit',
-		'el el-refresh',
-		'el el-remove-circle',
-		'el el-remove-sign',
-		'el el-remove',
-		'el el-repeat-alt',
-		'el el-repeat',
-		'el el-resize-full',
-		'el el-resize-horizontal',
-		'el el-resize-small',
-		'el el-resize-vertical',
-		'el el-return-key',
-		'el el-retweet',
-		'el el-reverse-alt',
-		'el el-road',
-		'el el-rss',
-		'el el-scissors',
-		'el el-screen-alt',
-		'el el-screen',
-		'el el-screenshot',
-		'el el-search-alt',
-		'el el-search',
-		'el el-share-alt',
-		'el el-share',
-		'el el-shopping-cart-sign',
-		'el el-shopping-cart',
-		'el el-signal',
-		'el el-skype',
-		'el el-slideshare',
-		'el el-smiley-alt',
-		'el el-smiley',
-		'el el-soundcloud',
-		'el el-speaker',
-		'el el-spotify',
-		'el el-stackoverflow',
-		'el el-star-alt',
-		'el el-star-empty',
-		'el el-star',
-		'el el-step-backward',
-		'el el-step-forward',
-		'el el-stop-alt',
-		'el el-stop',
-		'el el-stumbleupon',
-		'el el-tag',
-		'el el-tags',
-		'el el-tasks',
-		'el el-text-height',
-		'el el-text-width',
-		'el el-th-large',
-		'el el-th-list',
-		'el el-th',
-		'el el-thumbs-down',
-		'el el-thumbs-up',
-		'el el-time-alt',
-		'el el-time',
-		'el el-tint',
-		'el el-torso',
-		'el el-trash-alt',
-		'el el-trash',
-		'el el-tumblr',
-		'el el-twitter',
-		'el el-universal-access',
-		'el el-unlock-alt',
-		'el el-unlock',
-		'el el-upload',
-		'el el-usd',
-		'el el-user',
-		'el el-viadeo',
-		'el el-video-alt',
-		'el el-video-chat',
-		'el el-video',
-		'el el-view-mode',
-		'el el-vimeo',
-		'el el-vkontakte',
-		'el el-volume-down',
-		'el el-volume-off',
-		'el el-volume-up',
-		'el el-w3c',
-		'el el-warning-sign',
-		'el el-website-alt',
-		'el el-website',
-		'el el-wheelchair',
-		'el el-wordpress',
-		'el el-wrench-alt',
-		'el el-wrench',
-		'el el-youtube',
-		'el el-zoom-in',
-		'el el-zoom-out',
-	);
+    return array(
+        'el el-address-book-alt',
+        'el el-address-book',
+        'el el-adjust-alt',
+        'el el-adjust',
+        'el el-adult',
+        'el el-align-center',
+        'el el-align-justify',
+        'el el-align-left',
+        'el el-align-right',
+        'el el-arrow-down',
+        'el el-arrow-left',
+        'el el-arrow-right',
+        'el el-arrow-up',
+        'el el-asl',
+        'el el-asterisk',
+        'el el-backward',
+        'el el-ban-circle',
+        'el el-barcode',
+        'el el-behance',
+        'el el-bell',
+        'el el-blind',
+        'el el-blogger',
+        'el el-bold',
+        'el el-book',
+        'el el-bookmark-empty',
+        'el el-bookmark',
+        'el el-braille',
+        'el el-briefcase',
+        'el el-broom',
+        'el el-brush',
+        'el el-bulb',
+        'el el-bullhorn',
+        'el el-calendar-sign',
+        'el el-calendar',
+        'el el-camera',
+        'el el-car',
+        'el el-caret-down',
+        'el el-caret-left',
+        'el el-caret-right',
+        'el el-caret-up',
+        'el el-cc',
+        'el el-certificate',
+        'el el-check-empty',
+        'el el-check',
+        'el el-chevron-down',
+        'el el-chevron-left',
+        'el el-chevron-right',
+        'el el-chevron-up',
+        'el el-child',
+        'el el-circle-arrow-down',
+        'el el-circle-arrow-left',
+        'el el-circle-arrow-right',
+        'el el-circle-arrow-up',
+        'el el-cloud-alt',
+        'el el-cloud',
+        'el el-cog-alt',
+        'el el-cog',
+        'el el-cogs',
+        'el el-comment-alt',
+        'el el-comment',
+        'el el-compass-alt',
+        'el el-compass',
+        'el el-credit-card',
+        'el el-css',
+        'el el-dashboard',
+        'el el-delicious',
+        'el el-deviantart',
+        'el el-digg',
+        'el el-download-alt',
+        'el el-download',
+        'el el-dribbble',
+        'el el-edit',
+        'el el-eject',
+        'el el-envelope-alt',
+        'el el-envelope',
+        'el el-error-alt',
+        'el el-error',
+        'el el-eur',
+        'el el-exclamation-sign',
+        'el el-eye-close',
+        'el el-eye-open',
+        'el el-facebook',
+        'el el-facetime-video',
+        'el el-fast-backward',
+        'el el-fast-forward',
+        'el el-female',
+        'el el-file-alt',
+        'el el-file-edit-alt',
+        'el el-file-edit',
+        'el el-file-new-alt',
+        'el el-file-new',
+        'el el-file',
+        'el el-film',
+        'el el-filter',
+        'el el-fire',
+        'el el-flag-alt',
+        'el el-flag',
+        'el el-flickr',
+        'el el-folder-close',
+        'el el-folder-open',
+        'el el-folder-sign',
+        'el el-folder',
+        'el el-font',
+        'el el-fontsize',
+        'el el-fork',
+        'el el-forward-alt',
+        'el el-forward',
+        'el el-foursquare',
+        'el el-friendfeed-rect',
+        'el el-friendfeed',
+        'el el-fullscreen',
+        'el el-gbp',
+        'el el-gift',
+        'el el-github-text',
+        'el el-github',
+        'el el-glass',
+        'el el-glasses',
+        'el el-globe-alt',
+        'el el-globe',
+        'el el-googleplus',
+        'el el-graph-alt',
+        'el el-graph',
+        'el el-group-alt',
+        'el el-group',
+        'el el-guidedog',
+        'el el-hand-down',
+        'el el-hand-left',
+        'el el-hand-right',
+        'el el-hand-up',
+        'el el-hdd',
+        'el el-headphones',
+        'el el-hearing-impaired',
+        'el el-heart-alt',
+        'el el-heart-empty',
+        'el el-heart',
+        'el el-home-alt',
+        'el el-home',
+        'el el-hourglass',
+        'el el-idea-alt',
+        'el el-idea',
+        'el el-inbox-alt',
+        'el el-inbox-box',
+        'el el-inbox',
+        'el el-indent-left',
+        'el el-indent-right',
+        'el el-info-circle',
+        'el el-instagram',
+        'el el-iphone-home',
+        'el el-italic',
+        'el el-key',
+        'el el-laptop-alt',
+        'el el-laptop',
+        'el el-lastfm',
+        'el el-leaf',
+        'el el-lines',
+        'el el-link',
+        'el el-linkedin',
+        'el el-list-alt',
+        'el el-list',
+        'el el-livejournal',
+        'el el-lock-alt',
+        'el el-lock',
+        'el el-magic',
+        'el el-magnet',
+        'el el-male',
+        'el el-map-marker-alt',
+        'el el-map-marker',
+        'el el-mic-alt',
+        'el el-mic',
+        'el el-minus-sign',
+        'el el-minus',
+        'el el-move',
+        'el el-music',
+        'el el-myspace',
+        'el el-network',
+        'el el-off',
+        'el el-ok-circle',
+        'el el-ok-sign',
+        'el el-ok',
+        'el el-opensource',
+        'el el-paper-clip-alt',
+        'el el-paper-clip',
+        'el el-path',
+        'el el-pause-alt',
+        'el el-pause',
+        'el el-pencil-alt',
+        'el el-pencil',
+        'el el-person',
+        'el el-phone-alt',
+        'el el-phone',
+        'el el-photo-alt',
+        'el el-photo',
+        'el el-picasa',
+        'el el-picture',
+        'el el-plane',
+        'el el-play-alt',
+        'el el-play-circle',
+        'el el-play',
+        'el el-plus-sign',
+        'el el-plus',
+        'el el-podcast',
+        'el el-print',
+        'el el-puzzle',
+        'el el-qrcode',
+        'el el-question-sign',
+        'el el-question',
+        'el el-quote-alt',
+        'el el-quotes',
+        'el el-random',
+        'el el-record',
+        'el el-reddit',
+        'el el-refresh',
+        'el el-remove-circle',
+        'el el-remove-sign',
+        'el el-remove',
+        'el el-repeat-alt',
+        'el el-repeat',
+        'el el-resize-full',
+        'el el-resize-horizontal',
+        'el el-resize-small',
+        'el el-resize-vertical',
+        'el el-return-key',
+        'el el-retweet',
+        'el el-reverse-alt',
+        'el el-road',
+        'el el-rss',
+        'el el-scissors',
+        'el el-screen-alt',
+        'el el-screen',
+        'el el-screenshot',
+        'el el-search-alt',
+        'el el-search',
+        'el el-share-alt',
+        'el el-share',
+        'el el-shopping-cart-sign',
+        'el el-shopping-cart',
+        'el el-signal',
+        'el el-skype',
+        'el el-slideshare',
+        'el el-smiley-alt',
+        'el el-smiley',
+        'el el-soundcloud',
+        'el el-speaker',
+        'el el-spotify',
+        'el el-stackoverflow',
+        'el el-star-alt',
+        'el el-star-empty',
+        'el el-star',
+        'el el-step-backward',
+        'el el-step-forward',
+        'el el-stop-alt',
+        'el el-stop',
+        'el el-stumbleupon',
+        'el el-tag',
+        'el el-tags',
+        'el el-tasks',
+        'el el-text-height',
+        'el el-text-width',
+        'el el-th-large',
+        'el el-th-list',
+        'el el-th',
+        'el el-thumbs-down',
+        'el el-thumbs-up',
+        'el el-time-alt',
+        'el el-time',
+        'el el-tint',
+        'el el-torso',
+        'el el-trash-alt',
+        'el el-trash',
+        'el el-tumblr',
+        'el el-twitter',
+        'el el-universal-access',
+        'el el-unlock-alt',
+        'el el-unlock',
+        'el el-upload',
+        'el el-usd',
+        'el el-user',
+        'el el-viadeo',
+        'el el-video-alt',
+        'el el-video-chat',
+        'el el-video',
+        'el el-view-mode',
+        'el el-vimeo',
+        'el el-vkontakte',
+        'el el-volume-down',
+        'el el-volume-off',
+        'el el-volume-up',
+        'el el-w3c',
+        'el el-warning-sign',
+        'el el-website-alt',
+        'el el-website',
+        'el el-wheelchair',
+        'el el-wordpress',
+        'el el-wrench-alt',
+        'el el-wrench',
+        'el el-youtube',
+        'el el-zoom-in',
+        'el el-zoom-out',
+    );
 }

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

Indentation +67 added lines, -67 removed lines

@@ -11,81 +11,81 @@
  * @package altis/core
  */
 class Redux_Autoloader {
-	const NS_SEPARATOR = '\\';
+    const NS_SEPARATOR = '\\';
 
-	/**
-	 * Prefix to validate against.
-	 *
-	 * @var string
-	 */
-	protected string $prefix;
+    /**
+     * Prefix to validate against.
+     *
+     * @var string
+     */
+    protected string $prefix;
 
-	/**
-	 * String length of the prefix.
-	 *
-	 * @var int
-	 */
-	protected int $prefix_length;
+    /**
+     * String length of the prefix.
+     *
+     * @var int
+     */
+    protected int $prefix_length;
 
-	/**
-	 * Path to validate.
-	 *
-	 * @var string
-	 */
-	protected string $path;
+    /**
+     * Path to validate.
+     *
+     * @var string
+     */
+    protected string $path;
 
-	/**
-	 * Autoloader constructor.
-	 *
-	 * @param string $prefix Prefix to validate against.
-	 * @param string $path Path to validate.
-	 */
-	public function __construct( string $prefix, string $path ) {
-		$this->prefix        = $prefix;
-		$this->prefix_length = strlen( $prefix );
-		$this->path          = trailingslashit( $path );
-	}
+    /**
+     * Autoloader constructor.
+     *
+     * @param string $prefix Prefix to validate against.
+     * @param string $path Path to validate.
+     */
+    public function __construct( string $prefix, string $path ) {
+        $this->prefix        = $prefix;
+        $this->prefix_length = strlen( $prefix );
+        $this->path          = trailingslashit( $path );
+    }
 
-	/**
-	 * Load a class file if it matches our criteria.
-	 *
-	 * @param string $classname Class to test and/or load.
-	 */
-	public function load( string $classname ) {
-		if ( strpos( $classname, 'Redux' ) === false ) {
-			return;
-		}
+    /**
+     * Load a class file if it matches our criteria.
+     *
+     * @param string $classname Class to test and/or load.
+     */
+    public function load( string $classname ) {
+        if ( strpos( $classname, 'Redux' ) === false ) {
+            return;
+        }
 
-		// Strip prefix from the start (ala PSR-4).
-		$classname = substr( $classname, $this->prefix_length + 1 );
-		if ( function_exists( 'mb_strtolower' ) && function_exists( 'mb_detect_encoding' ) ) {
-			$classname = mb_strtolower( $classname, mb_detect_encoding( $classname ) );
-		} else {
-			$classname = strtolower( $classname );
-		}
+        // Strip prefix from the start (ala PSR-4).
+        $classname = substr( $classname, $this->prefix_length + 1 );
+        if ( function_exists( 'mb_strtolower' ) && function_exists( 'mb_detect_encoding' ) ) {
+            $classname = mb_strtolower( $classname, mb_detect_encoding( $classname ) );
+        } else {
+            $classname = strtolower( $classname );
+        }
 
-		$file = '';
-		// Split on namespace separator.
-		$last_ns_pos = strripos( $classname, self::NS_SEPARATOR );
-		if ( false !== $last_ns_pos ) {
-			$namespace = substr( $classname, 0, $last_ns_pos );
-			$classname = substr( $classname, $last_ns_pos + 1 );
-			$file      = str_replace( self::NS_SEPARATOR, DIRECTORY_SEPARATOR, $namespace ) . DIRECTORY_SEPARATOR;
-		}
-		$file_prefix = $file;
-		$file        = $file_prefix . 'class-' . str_replace( '_', '-', $classname ) . '.php';
+        $file = '';
+        // Split on namespace separator.
+        $last_ns_pos = strripos( $classname, self::NS_SEPARATOR );
+        if ( false !== $last_ns_pos ) {
+            $namespace = substr( $classname, 0, $last_ns_pos );
+            $classname = substr( $classname, $last_ns_pos + 1 );
+            $file      = str_replace( self::NS_SEPARATOR, DIRECTORY_SEPARATOR, $namespace ) . DIRECTORY_SEPARATOR;
+        }
+        $file_prefix = $file;
+        $file        = $file_prefix . 'class-' . str_replace( '_', '-', $classname ) . '.php';
 
-		$path = $this->path . $file;
+        $path = $this->path . $file;
 
-		if ( file_exists( $path ) ) {
-			require_once $path;
-		} else {
-			$file = $file_prefix . 'class-redux-' . str_replace( '_', '-', $classname ) . '.php';
-			$path = $this->path . $file;
+        if ( file_exists( $path ) ) {
+            require_once $path;
+        } else {
+            $file = $file_prefix . 'class-redux-' . str_replace( '_', '-', $classname ) . '.php';
+            $path = $this->path . $file;
 
-			if ( file_exists( $path ) ) {
-				require_once $path;
-			}
-		}
-	}
+            if ( file_exists( $path ) ) {
+                require_once $path;
+            }
+        }
+    }
 }

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

Indentation +384 added lines, -384 removed lines

@@ -11,388 +11,388 @@
 
 if ( ! class_exists( 'Redux_Args', false ) ) {
 
-	/**
-	 * Class Redux_Args
-	 */
-	class Redux_Args {
-
-		/**
-		 * Returns entire arguments array.
-		 *
-		 * @var array|mixed
-		 */
-		public $get = array();
-
-		/**
-		 * ReduxFramework object.
-		 *
-		 * @var ReduxFramework|null
-		 */
-		private ?ReduxFramework $parent;
-
-		/**
-		 * Switch to omit social icons if dev_mode is set to true and Redux defaults are used.
-		 *
-		 * @var bool
-		 */
-		public bool $omit_icons = false;
-
-		/**
-		 * Switch to omit support menu items if dev_mode is set to true and redux defaults are used.
-		 *
-		 * @var bool
-		 */
-		public bool $omit_items = false;
-
-		/**
-		 * Flag to force dev_mod to true if in localhost or WP_DEBUG is set to true.
-		 *
-		 * @var bool
-		 */
-		public bool $dev_mode_forced = false;
-
-		/**
-		 * Redux_Args constructor.
-		 *
-		 * @param ReduxFramework $redux ReduxFramework object.
-		 * @param array          $args  Global arguments array.
-		 */
-		public function __construct( ReduxFramework $redux, array $args ) {
-			$this->parent = $redux;
-
-			$default = array(
-				'opt_name'                         => '',
-				'last_tab'                         => '',
-				'menu_icon'                        => '',
-				'menu_title'                       => '',
-				'page_title'                       => '',
-				'page_slug'                        => '',
-				'page_permissions'                 => 'manage_options',
-				'menu_type'                        => 'menu',
-				'page_parent'                      => 'themes.php',
-				'page_priority'                    => null,
-				'allow_sub_menu'                   => true,
-				'save_defaults'                    => true,
-				'footer_credit'                    => '',
-				'async_typography'                 => false,
-				'disable_google_fonts_link'        => false,
-				'class'                            => '',
-				'admin_bar'                        => true,
-				'admin_bar_priority'               => 999,
-				'admin_bar_icon'                   => '',
-				'help_tabs'                        => array(),
-				'help_sidebar'                     => '',
-				'database'                         => '',
-				'customizer'                       => false,
-				'global_variable'                  => '',
-				'output'                           => true,
-				'output_variables_prefix'          => '--',
-				'compiler_output_variables_prefix' => '$',
-				'compiler'                         => true,
-				'output_tag'                       => true,
-				'output_location'                  => array( 'frontend' ),
-				'transient_time'                   => '',
-				'default_show'                     => false,
-				'default_mark'                     => '',
-				'disable_save_warn'                => false,
-				'open_expanded'                    => false,
-				'hide_expand'                      => false,
-				'network_admin'                    => false,
-				'network_sites'                    => true,
-				'hide_reset'                       => false,
-				'hide_save'                        => false,
-				'hints'                            => array(
-					'icon'          => 'el el-question-sign',
-					'icon_position' => 'right',
-					'icon_color'    => 'lightgray',
-					'icon_size'     => 'normal',
-					'tip_style'     => array(
-						'color'   => 'light',
-						'shadow'  => true,
-						'rounded' => false,
-						'style'   => '',
-					),
-					'tip_position'  => array(
-						'my' => 'top_left',
-						'at' => 'bottom_right',
-					),
-					'tip_effect'    => array(
-						'show' => array(
-							'effect'   => 'slide',
-							'duration' => '500',
-							'event'    => 'mouseover',
-						),
-						'hide' => array(
-							'effect'   => 'fade',
-							'duration' => '500',
-							'event'    => 'click mouseleave',
-						),
-					),
-				),
-				'font_weights'                     => array(
-					array(
-						'id'   => '400',
-						'name' => __( 'Regular 400', 'redux-framework' ),
-					),
-					array(
-						'id'   => '400italic',
-						'name' => __( 'Regular 400 Italic', 'redux-framework' ),
-					),
-					array(
-						'id'   => '700',
-						'name' => __( 'Bold 700', 'redux-framework' ),
-					),
-					array(
-						'id'   => '700italic',
-						'name' => __( 'Bold 700 Italic', 'redux-framework' ),
-					),
-				),
-				'show_import_export'               => true,
-				'show_options_object'              => true,
-				'dev_mode'                         => true,
-				'templates_path'                   => '',
-				'ajax_save'                        => true,
-				'use_cdn'                          => true,
-				'cdn_check_time'                   => 1440,
-				'options_api'                      => true,
-				'allow_tracking'                   => true,
-				'admin_theme'                      => 'wp',
-				'elusive_frontend'                 => false,
-				'fontawesome_frontend'             => false,
-				'flyout_submenus'                  => true,
-				'font_display'                     => 'swap', // block|swap|fallback|optional.
-				'load_on_cron'                     => false,
-				'search'                           => false,
-			);
-
-			$args = Redux_Functions::parse_args( $args, $default );
-
-			$args = $this->args( $args );
-
-			$args = $this->default_cleanup( $args );
-
-			if ( ! in_array( $args['font_display'], array( 'block', 'swap', 'fallback', 'optional' ), true ) ) {
-				$args['font_display'] = 'swap';
-			}
-
-			if ( isset( $args['async_typography'] ) && $args['async_typography'] ) {
-				$args['async_typography'] = false;
-			}
-
-			$this->get = $args;
-
-			$this->parent->args = $args;
-
-			if ( 'redux_extensions_demo' !== $args['opt_name'] && 'redux_demo' !== $args['opt_name'] ) {
-				$this->change_demo_defaults( $args );
-			}
-		}
-
-		/**
-		 * Builds and sanitizes a global args array.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return array
-		 */
-		private function args( array $args ): array {
-			$args = $this->no_errors_please( $args );
-
-			$this->parent->old_opt_name = $args['opt_name'];
-
-			$args = $this->filters( $args );
-
-			if ( ! function_exists( 'wp_rand' ) ) {
-				require_once ABSPATH . '/wp-includes/pluggable.php';
-			}
-
-			if ( $args['opt_name'] === $this->parent->old_opt_name ) {
-				$this->parent->old_opt_name = null;
-				unset( $this->parent->old_opt_name );
-			}
-
-			// Do not save the defaults if we're on a live preview!
-			if ( 'customize' === $GLOBALS['pagenow'] && isset( $_GET['customize_theme'] ) && ! empty( $_GET['customize_theme'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-				$args['save_defaults'] = false;
-			}
-
-			return $this->shim( $args );
-		}
-
-		/**
-		 * Apply filters to arg data.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return mixed|void
-		 */
-		private function filters( array $args ) {
-			/**
-			 * Filter 'redux/args/{opt_name}'
-			 *
-			 * @param     array     $args ReduxFramework configuration
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			$args = apply_filters( "redux/args/{$args['opt_name']}", $args );
-
-			/**
-			 * Filter 'redux/options/{opt_name}/args'
-			 *
-			 * @param     array     $args ReduxFramework configuration
-			 */
-
-			// phpcs:ignore WordPress.NamingConventions.ValidHookName
-			return apply_filters( "redux/options/{$args['opt_name']}/args", $args );
-		}
-
-		/**
-		 * Sanitize args that should not be empty.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return array
-		 */
-		private function no_errors_please( array $args ): array {
-			if ( empty( $args['transient_time'] ) ) {
-				$args['transient_time'] = 60 * MINUTE_IN_SECONDS;
-			}
-
-			if ( empty( $args['footer_credit'] ) ) {
-
-				$footer_text = sprintf(
-				/* translators: 1: Redux, 2: Link to plugin review */
-					__( 'Enjoyed %1$s? Please leave us a %2$s rating. We really appreciate your support!', 'redux-framework' ),
-					'<strong>' . __( 'Redux', 'redux-framework' ) . '</strong>',
-					'<a href="https://wordpress.org/support/plugin/redux-framework/reviews/?filter=5/#new-post" target="_blank">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
-				);
-				$args['footer_credit'] = '<span id="footer-thankyou">' . $footer_text . '</span>';
-			}
-
-			if ( empty( $args['menu_title'] ) ) {
-				$args['menu_title'] = esc_html__( 'Options', 'redux-framework' );
-			}
-
-			if ( empty( $args['page_title'] ) ) {
-				$args['page_title'] = esc_html__( 'Options', 'redux-framework' );
-			}
-
-			// Auto creates the page_slug appropriately.
-			if ( empty( $args['page_slug'] ) ) {
-				if ( ! empty( $args['display_name'] ) ) {
-					$args['page_slug'] = sanitize_html_class( $args['display_name'] );
-				} elseif ( ! empty( $args['page_title'] ) ) {
-					$args['page_slug'] = sanitize_html_class( $args['page_title'] );
-				} elseif ( ! empty( $args['menu_title'] ) ) {
-					$args['page_slug'] = sanitize_html_class( $args['menu_title'] );
-				} else {
-					$args['page_slug'] = str_replace( '-', '_', $args['opt_name'] );
-				}
-			}
-
-			return $args;
-		}
-
-		/**
-		 * Shims for much older v3 configs.
-		 *
-		 * @param     array $args Global args.
-		 *
-		 * @return array
-		 */
-		private function shim( array $args ): array {
-			/**
-			 * SHIM SECTION
-			 * Old variables and ways of doing things that need correcting.  ;)
-			 * */
-			// Variable name change.
-			if ( ! empty( $args['page_cap'] ) ) {
-				$args['page_permissions'] = $args['page_cap'];
-				unset( $args['page_cap'] );
-			}
-
-			if ( ! empty( $args['page_position'] ) ) {
-				$args['page_priority'] = $args['page_position'];
-				unset( $args['page_position'] );
-			}
-
-			if ( ! empty( $args['page_type'] ) ) {
-				$args['menu_type'] = $args['page_type'];
-				unset( $args['page_type'] );
-			}
-
-			return $args;
-		}
-
-		/**
-		 * Verify to see if dev has bothered to change admin bar links and share icons from demo data to their own.
-		 *
-		 * @param array $args Global args.
-		 */
-		private function change_demo_defaults( array $args ) {
-			if ( $args['dev_mode'] || true === Redux_Helpers::is_local_host() ) {
-				if ( ! empty( $args['admin_bar_links'] ) ) {
-					foreach ( $args['admin_bar_links'] as $arr ) {
-						if ( is_array( $arr ) && ! empty( $arr ) ) {
-							foreach ( $arr as $y ) {
-								if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
-									$this->omit_items = true;
-									break;
-								}
-							}
-						}
-					}
-				}
-
-				if ( ! empty( $args['share_icons'] ) ) {
-					foreach ( $args['share_icons'] as $arr ) {
-						if ( is_array( $arr ) && ! empty( $arr ) ) {
-							foreach ( $arr as $y ) {
-								if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
-									$this->omit_icons = true;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		/**
-		 * Fix other arg criteria that sometimes gets hosed up.
-		 *
-		 * @param array $args Global args.
-		 *
-		 * @return array
-		 * @noinspection PhpStrictComparisonWithOperandsOfDifferentTypesInspection
-		 */
-		private function default_cleanup( array $args ): array {
-
-			// Fix the global variable name.
-			if ( '' === $args['global_variable'] && false !== $args['global_variable'] ) {
-				$args['global_variable'] = str_replace( '-', '_', $args['opt_name'] );
-			}
-
-			if ( isset( $args['customizer_only'] ) && $args['customizer_only'] ) {
-				$args['menu_type']      = 'hidden';
-				$args['customizer']     = true;
-				$args['admin_bar']      = false;
-				$args['allow_sub_menu'] = false;
-			}
-
-			// Check if the Airplane Mode plugin is installed.
-			if ( class_exists( 'Airplane_Mode_Core' ) ) {
-				$airplane = Airplane_Mode_Core::getInstance();
-				if ( method_exists( $airplane, 'enabled' ) ) {
-					if ( $airplane->enabled() ) {
-						$args['use_cdn'] = false;
-					}
-				} elseif ( 'on' === $airplane->check_status() ) {
-					$args['use_cdn'] = false;
-				}
-			}
-
-			return $args;
-		}
-	}
+    /**
+     * Class Redux_Args
+     */
+    class Redux_Args {
+
+        /**
+         * Returns entire arguments array.
+         *
+         * @var array|mixed
+         */
+        public $get = array();
+
+        /**
+         * ReduxFramework object.
+         *
+         * @var ReduxFramework|null
+         */
+        private ?ReduxFramework $parent;
+
+        /**
+         * Switch to omit social icons if dev_mode is set to true and Redux defaults are used.
+         *
+         * @var bool
+         */
+        public bool $omit_icons = false;
+
+        /**
+         * Switch to omit support menu items if dev_mode is set to true and redux defaults are used.
+         *
+         * @var bool
+         */
+        public bool $omit_items = false;
+
+        /**
+         * Flag to force dev_mod to true if in localhost or WP_DEBUG is set to true.
+         *
+         * @var bool
+         */
+        public bool $dev_mode_forced = false;
+
+        /**
+         * Redux_Args constructor.
+         *
+         * @param ReduxFramework $redux ReduxFramework object.
+         * @param array          $args  Global arguments array.
+         */
+        public function __construct( ReduxFramework $redux, array $args ) {
+            $this->parent = $redux;
+
+            $default = array(
+                'opt_name'                         => '',
+                'last_tab'                         => '',
+                'menu_icon'                        => '',
+                'menu_title'                       => '',
+                'page_title'                       => '',
+                'page_slug'                        => '',
+                'page_permissions'                 => 'manage_options',
+                'menu_type'                        => 'menu',
+                'page_parent'                      => 'themes.php',
+                'page_priority'                    => null,
+                'allow_sub_menu'                   => true,
+                'save_defaults'                    => true,
+                'footer_credit'                    => '',
+                'async_typography'                 => false,
+                'disable_google_fonts_link'        => false,
+                'class'                            => '',
+                'admin_bar'                        => true,
+                'admin_bar_priority'               => 999,
+                'admin_bar_icon'                   => '',
+                'help_tabs'                        => array(),
+                'help_sidebar'                     => '',
+                'database'                         => '',
+                'customizer'                       => false,
+                'global_variable'                  => '',
+                'output'                           => true,
+                'output_variables_prefix'          => '--',
+                'compiler_output_variables_prefix' => '$',
+                'compiler'                         => true,
+                'output_tag'                       => true,
+                'output_location'                  => array( 'frontend' ),
+                'transient_time'                   => '',
+                'default_show'                     => false,
+                'default_mark'                     => '',
+                'disable_save_warn'                => false,
+                'open_expanded'                    => false,
+                'hide_expand'                      => false,
+                'network_admin'                    => false,
+                'network_sites'                    => true,
+                'hide_reset'                       => false,
+                'hide_save'                        => false,
+                'hints'                            => array(
+                    'icon'          => 'el el-question-sign',
+                    'icon_position' => 'right',
+                    'icon_color'    => 'lightgray',
+                    'icon_size'     => 'normal',
+                    'tip_style'     => array(
+                        'color'   => 'light',
+                        'shadow'  => true,
+                        'rounded' => false,
+                        'style'   => '',
+                    ),
+                    'tip_position'  => array(
+                        'my' => 'top_left',
+                        'at' => 'bottom_right',
+                    ),
+                    'tip_effect'    => array(
+                        'show' => array(
+                            'effect'   => 'slide',
+                            'duration' => '500',
+                            'event'    => 'mouseover',
+                        ),
+                        'hide' => array(
+                            'effect'   => 'fade',
+                            'duration' => '500',
+                            'event'    => 'click mouseleave',
+                        ),
+                    ),
+                ),
+                'font_weights'                     => array(
+                    array(
+                        'id'   => '400',
+                        'name' => __( 'Regular 400', 'redux-framework' ),
+                    ),
+                    array(
+                        'id'   => '400italic',
+                        'name' => __( 'Regular 400 Italic', 'redux-framework' ),
+                    ),
+                    array(
+                        'id'   => '700',
+                        'name' => __( 'Bold 700', 'redux-framework' ),
+                    ),
+                    array(
+                        'id'   => '700italic',
+                        'name' => __( 'Bold 700 Italic', 'redux-framework' ),
+                    ),
+                ),
+                'show_import_export'               => true,
+                'show_options_object'              => true,
+                'dev_mode'                         => true,
+                'templates_path'                   => '',
+                'ajax_save'                        => true,
+                'use_cdn'                          => true,
+                'cdn_check_time'                   => 1440,
+                'options_api'                      => true,
+                'allow_tracking'                   => true,
+                'admin_theme'                      => 'wp',
+                'elusive_frontend'                 => false,
+                'fontawesome_frontend'             => false,
+                'flyout_submenus'                  => true,
+                'font_display'                     => 'swap', // block|swap|fallback|optional.
+                'load_on_cron'                     => false,
+                'search'                           => false,
+            );
+
+            $args = Redux_Functions::parse_args( $args, $default );
+
+            $args = $this->args( $args );
+
+            $args = $this->default_cleanup( $args );
+
+            if ( ! in_array( $args['font_display'], array( 'block', 'swap', 'fallback', 'optional' ), true ) ) {
+                $args['font_display'] = 'swap';
+            }
+
+            if ( isset( $args['async_typography'] ) && $args['async_typography'] ) {
+                $args['async_typography'] = false;
+            }
+
+            $this->get = $args;
+
+            $this->parent->args = $args;
+
+            if ( 'redux_extensions_demo' !== $args['opt_name'] && 'redux_demo' !== $args['opt_name'] ) {
+                $this->change_demo_defaults( $args );
+            }
+        }
+
+        /**
+         * Builds and sanitizes a global args array.
+         *
+         * @param     array $args Global args.
+         *
+         * @return array
+         */
+        private function args( array $args ): array {
+            $args = $this->no_errors_please( $args );
+
+            $this->parent->old_opt_name = $args['opt_name'];
+
+            $args = $this->filters( $args );
+
+            if ( ! function_exists( 'wp_rand' ) ) {
+                require_once ABSPATH . '/wp-includes/pluggable.php';
+            }
+
+            if ( $args['opt_name'] === $this->parent->old_opt_name ) {
+                $this->parent->old_opt_name = null;
+                unset( $this->parent->old_opt_name );
+            }
+
+            // Do not save the defaults if we're on a live preview!
+            if ( 'customize' === $GLOBALS['pagenow'] && isset( $_GET['customize_theme'] ) && ! empty( $_GET['customize_theme'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+                $args['save_defaults'] = false;
+            }
+
+            return $this->shim( $args );
+        }
+
+        /**
+         * Apply filters to arg data.
+         *
+         * @param     array $args Global args.
+         *
+         * @return mixed|void
+         */
+        private function filters( array $args ) {
+            /**
+             * Filter 'redux/args/{opt_name}'
+             *
+             * @param     array     $args ReduxFramework configuration
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            $args = apply_filters( "redux/args/{$args['opt_name']}", $args );
+
+            /**
+             * Filter 'redux/options/{opt_name}/args'
+             *
+             * @param     array     $args ReduxFramework configuration
+             */
+
+            // phpcs:ignore WordPress.NamingConventions.ValidHookName
+            return apply_filters( "redux/options/{$args['opt_name']}/args", $args );
+        }
+
+        /**
+         * Sanitize args that should not be empty.
+         *
+         * @param     array $args Global args.
+         *
+         * @return array
+         */
+        private function no_errors_please( array $args ): array {
+            if ( empty( $args['transient_time'] ) ) {
+                $args['transient_time'] = 60 * MINUTE_IN_SECONDS;
+            }
+
+            if ( empty( $args['footer_credit'] ) ) {
+
+                $footer_text = sprintf(
+                /* translators: 1: Redux, 2: Link to plugin review */
+                    __( 'Enjoyed %1$s? Please leave us a %2$s rating. We really appreciate your support!', 'redux-framework' ),
+                    '<strong>' . __( 'Redux', 'redux-framework' ) . '</strong>',
+                    '<a href="https://wordpress.org/support/plugin/redux-framework/reviews/?filter=5/#new-post" target="_blank">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
+                );
+                $args['footer_credit'] = '<span id="footer-thankyou">' . $footer_text . '</span>';
+            }
+
+            if ( empty( $args['menu_title'] ) ) {
+                $args['menu_title'] = esc_html__( 'Options', 'redux-framework' );
+            }
+
+            if ( empty( $args['page_title'] ) ) {
+                $args['page_title'] = esc_html__( 'Options', 'redux-framework' );
+            }
+
+            // Auto creates the page_slug appropriately.
+            if ( empty( $args['page_slug'] ) ) {
+                if ( ! empty( $args['display_name'] ) ) {
+                    $args['page_slug'] = sanitize_html_class( $args['display_name'] );
+                } elseif ( ! empty( $args['page_title'] ) ) {
+                    $args['page_slug'] = sanitize_html_class( $args['page_title'] );
+                } elseif ( ! empty( $args['menu_title'] ) ) {
+                    $args['page_slug'] = sanitize_html_class( $args['menu_title'] );
+                } else {
+                    $args['page_slug'] = str_replace( '-', '_', $args['opt_name'] );
+                }
+            }
+
+            return $args;
+        }
+
+        /**
+         * Shims for much older v3 configs.
+         *
+         * @param     array $args Global args.
+         *
+         * @return array
+         */
+        private function shim( array $args ): array {
+            /**
+             * SHIM SECTION
+             * Old variables and ways of doing things that need correcting.  ;)
+             * */
+            // Variable name change.
+            if ( ! empty( $args['page_cap'] ) ) {
+                $args['page_permissions'] = $args['page_cap'];
+                unset( $args['page_cap'] );
+            }
+
+            if ( ! empty( $args['page_position'] ) ) {
+                $args['page_priority'] = $args['page_position'];
+                unset( $args['page_position'] );
+            }
+
+            if ( ! empty( $args['page_type'] ) ) {
+                $args['menu_type'] = $args['page_type'];
+                unset( $args['page_type'] );
+            }
+
+            return $args;
+        }
+
+        /**
+         * Verify to see if dev has bothered to change admin bar links and share icons from demo data to their own.
+         *
+         * @param array $args Global args.
+         */
+        private function change_demo_defaults( array $args ) {
+            if ( $args['dev_mode'] || true === Redux_Helpers::is_local_host() ) {
+                if ( ! empty( $args['admin_bar_links'] ) ) {
+                    foreach ( $args['admin_bar_links'] as $arr ) {
+                        if ( is_array( $arr ) && ! empty( $arr ) ) {
+                            foreach ( $arr as $y ) {
+                                if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
+                                    $this->omit_items = true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if ( ! empty( $args['share_icons'] ) ) {
+                    foreach ( $args['share_icons'] as $arr ) {
+                        if ( is_array( $arr ) && ! empty( $arr ) ) {
+                            foreach ( $arr as $y ) {
+                                if ( strpos( Redux_Core::strtolower( $y ), 'redux' ) !== false ) {
+                                    $this->omit_icons = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Fix other arg criteria that sometimes gets hosed up.
+         *
+         * @param array $args Global args.
+         *
+         * @return array
+         * @noinspection PhpStrictComparisonWithOperandsOfDifferentTypesInspection
+         */
+        private function default_cleanup( array $args ): array {
+
+            // Fix the global variable name.
+            if ( '' === $args['global_variable'] && false !== $args['global_variable'] ) {
+                $args['global_variable'] = str_replace( '-', '_', $args['opt_name'] );
+            }
+
+            if ( isset( $args['customizer_only'] ) && $args['customizer_only'] ) {
+                $args['menu_type']      = 'hidden';
+                $args['customizer']     = true;
+                $args['admin_bar']      = false;
+                $args['allow_sub_menu'] = false;
+            }
+
+            // Check if the Airplane Mode plugin is installed.
+            if ( class_exists( 'Airplane_Mode_Core' ) ) {
+                $airplane = Airplane_Mode_Core::getInstance();
+                if ( method_exists( $airplane, 'enabled' ) ) {
+                    if ( $airplane->enabled() ) {
+                        $args['use_cdn'] = false;
+                    }
+                } elseif ( 'on' === $airplane->check_status() ) {
+                    $args['use_cdn'] = false;
+                }
+            }
+
+            return $args;
+        }
+    }
 }

redux-core/inc/validation/unique_slug/class-redux-validation-unique-slug.php

Indentation +78 added lines, -78 removed lines

@@ -12,82 +12,82 @@
 
 if ( ! class_exists( 'Redux_Validation_Unique_Slug', false ) ) {
 
-	/**
-	 * Class Redux_Validation_Unique_Slug
-	 */
-	class Redux_Validation_Unique_Slug extends Redux_Validate {
-
-		/**
-		 * Field Validation Function.
-		 * Takes the vars and validates them
-		 *
-		 * @since ReduxFramework 3.0.0
-		 */
-		public function validate() {
-			global $wpdb, $wp_rewrite;
-
-			$this->field['msg']              = $this->field['msg'] ?? esc_html__( 'That URL slug is in use, please choose another.', 'redux-framework' );
-			$this->field['flush_permalinks'] = $this->field['flush_permalinks'] ?? false;
-
-			$slug = $this->value;
-
-			$post_name_check = '';
-
-			$feeds = $wp_rewrite->feeds;
-			if ( ! is_array( $feeds ) ) {
-				$feeds = array();
-			}
-
-			// Post slugs must be unique across all posts.
-			$result = wp_cache_get( 'redux-post-name' );
-			if ( false === $result ) {
-				// phpcs:ignore WordPress.DB.DirectDatabaseQuery
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $slug ) );
-
-				wp_cache_set( 'redux-post-name', $post_name_check );
-			}
-
-			/**
-			 * Filter whether the post slug would be bad as a flat slug.
-			 *
-			 * @since 3.1.0
-			 *
-			 * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
-			 * @param string $slug      The post slug.
-			 * @param string $post_type Post type.
-			 */
-			if ( $post_name_check || in_array( $slug, $feeds, true ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
-				$suffix = 2;
-
-				do {
-					$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-
-					$result = wp_cache_get( 'redux-alt-post-name' );
-					if ( false === $result ) {
-						// phpcs:ignore WordPress.DB.DirectDatabaseQuery
-						$post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $alt_post_name ) );
-
-						wp_cache_set( 'redux-alt-post-name', $result );
-					}
-
-					++$suffix;
-				} while ( $post_name_check );
-
-				$slug                   = $alt_post_name;
-				$this->value            = ( isset( $this->current ) ) ? $this->current : '';
-				$this->field['msg']     = sprintf( $this->field['msg'], $slug );
-				$this->field['current'] = $this->value;
-				$this->error            = $this->field;
-			} elseif ( isset( $this->field['flush_permalinks'] ) && true === $this->field['flush_permalinks'] ) {
-				add_action( 'init', array( $this, 'flush_permalinks' ), 99 );
-			}
-		}
-
-		/**
-		 * Flush WordPress permalinks.
-		 */
-		public function flush_permalinks() {
-			flush_rewrite_rules();
-		}
-	}
+    /**
+     * Class Redux_Validation_Unique_Slug
+     */
+    class Redux_Validation_Unique_Slug extends Redux_Validate {
+
+        /**
+         * Field Validation Function.
+         * Takes the vars and validates them
+         *
+         * @since ReduxFramework 3.0.0
+         */
+        public function validate() {
+            global $wpdb, $wp_rewrite;
+
+            $this->field['msg']              = $this->field['msg'] ?? esc_html__( 'That URL slug is in use, please choose another.', 'redux-framework' );
+            $this->field['flush_permalinks'] = $this->field['flush_permalinks'] ?? false;
+
+            $slug = $this->value;
+
+            $post_name_check = '';
+
+            $feeds = $wp_rewrite->feeds;
+            if ( ! is_array( $feeds ) ) {
+                $feeds = array();
+            }
+
+            // Post slugs must be unique across all posts.
+            $result = wp_cache_get( 'redux-post-name' );
+            if ( false === $result ) {
+                // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                $post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $slug ) );
+
+                wp_cache_set( 'redux-post-name', $post_name_check );
+            }
+
+            /**
+             * Filter whether the post slug would be bad as a flat slug.
+             *
+             * @since 3.1.0
+             *
+             * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
+             * @param string $slug      The post slug.
+             * @param string $post_type Post type.
+             */
+            if ( $post_name_check || in_array( $slug, $feeds, true ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
+                $suffix = 2;
+
+                do {
+                    $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+
+                    $result = wp_cache_get( 'redux-alt-post-name' );
+                    if ( false === $result ) {
+                        // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                        $post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s LIMIT 1", $alt_post_name ) );
+
+                        wp_cache_set( 'redux-alt-post-name', $result );
+                    }
+
+                    ++$suffix;
+                } while ( $post_name_check );
+
+                $slug                   = $alt_post_name;
+                $this->value            = ( isset( $this->current ) ) ? $this->current : '';
+                $this->field['msg']     = sprintf( $this->field['msg'], $slug );
+                $this->field['current'] = $this->value;
+                $this->error            = $this->field;
+            } elseif ( isset( $this->field['flush_permalinks'] ) && true === $this->field['flush_permalinks'] ) {
+                add_action( 'init', array( $this, 'flush_permalinks' ), 99 );
+            }
+        }
+
+        /**
+         * Flush WordPress permalinks.
+         */
+        public function flush_permalinks() {
+            flush_rewrite_rules();
+        }
+    }
 }