back out PHP 7.4 specific syntax. Too soon, apparently. ver bump 4.1.29

kprovance · kprovance · commit 15a864cf6a3d · 2021-06-29T19:21:31.000-04:00
Signed-off-by: Kevin Provance &lt;kevin.provance@gmail.com&gt;
diff --git a/.distignore b/.distignore
@@ -1,9 +1,33 @@
 /.wordpress-org
 /.git
-/.config
-/.idea
 /.github
 /node_modules
+/.tx
+/.github
+/bin
+/codestyles
+/tests
 
 .distignore
 .gitignore
+.travis.yml
+ISSUE_TEMPLATE
+CONTRIBUTING.md
+package-lock.json
+.editorconfig
+.eslintignore
+.eslintrc.json
+.gitattributes
+.jscsrc
+.jshintignore
+.jshintrc
+.stylelintignore
+.stylelintrc.json
+.svgrrc
+composer.json
+gulpfile.js
+jsconfig.json
+package-lock.json
+package.json
+ruleset.xml
+yarn.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Redux Changelog
 
+## 4.1.29
+* Fixed: All PHP 7.4 specific syntax backed out.  It caused older versions of PHP to report fatal errors.
+* Fixed: Index error in the image_select field.
+
 ## 4.1.28
 * Fixed: #217 - Redux templates loading on post types with no block editor.
 * Fixed: #158 - Redux theme checks no longer prevent theme check plugin from functioning.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "reduxframework/redux-framework",
-	"version": "4.1.28",
+	"version": "4.1.29",
 	"authors": [
 		{
 			"name": "Redux.io",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "main": "gulpfile.js",
   "name": "redux",
   "author": "Redux.io",
-  "version": "4.1.28",
+  "version": "4.1.29",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: gutenberg, blocks, gutenberg blocks, editor, block, page builder, block ed
 Requires at least: 4.0
 Requires PHP: 7.1
 Tested up to: 5.7.3
-Stable tag: 4.1.28
+Stable tag: 4.1.29
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
 
@@ -152,6 +152,10 @@ If you want, you can use the [Gutenberg](https://wordpress.org/plugins/gutenberg
 
 == Changelog ==
 
+== 4.1.29 ==
+* Fixed: All PHP 7.4 specific syntax backed out.  It caused older versions of PHP to report fatal errors.
+* Fixed: Index error in the image_select field.
+
 == 4.1.28 ==
 * Fixed: #217 - Redux templates loading on post types with no block editor.
 * Fixed: #158 - Redux theme checks no longer prevent theme check plugin from functioning.
diff --git a/redux-core/framework.php b/redux-core/framework.php
@@ -23,7 +23,7 @@
 
 require_once dirname( __FILE__ ) . '/class-redux-core.php';
 
-Redux_Core::$version    = '4.1.28';
+Redux_Core::$version    = '4.1.29';
 Redux_Core::$redux_path = dirname( __FILE__ );
 Redux_Core::instance();
 
diff --git a/redux-core/inc/extensions/customizer/class-redux-extension-customizer.php b/redux-core/inc/extensions/customizer/class-redux-extension-customizer.php
@@ -33,14 +33,14 @@ class Redux_Extension_Customizer extends Redux_Extension_Abstract {
 		 *
 		 * @var string
 		 */
-		public string $field_name = 'customizer';
+		public $field_name = 'customizer';
 
 		/**
 		 * Set the friendly name of the extension.  This is for display purposes.  No underscores or dashes are required.
 		 *
 		 * @var string
 		 */
-		public string $extension_name = 'Customizer';
+		public $extension_name = 'Customizer';
 
 		/**
 		 * Set the minumum required version of Redux here (optional).
@@ -50,28 +50,28 @@ class Redux_Extension_Customizer extends Redux_Extension_Abstract {
 		 *
 		 * @var string
 		 */
-		private string $minimum_redux_version = '4.0.0';
+		private $minimum_redux_version = '4.0.0';
 
 		/**
 		 * Original options.
 		 *
 		 * @var array
 		 */
-		private array $orig_options = array();
+		private $orig_options = array();
 
 		/**
 		 * Post values.
 		 *
 		 * @var array
 		 */
-		private static array $post_values = array();
+		private static $post_values = array();
 
 		/**
 		 * Options array.
 		 *
 		 * @var array
 		 */
-		public array $options = array();
+		public $options = array();
 
 		/**
 		 * Redux_Extension_my_extension constructor.
diff --git a/redux-core/inc/extensions/import_export/class-redux-extension-import-export.php b/redux-core/inc/extensions/import_export/class-redux-extension-import-export.php
@@ -31,7 +31,7 @@ class Redux_Extension_Import_Export extends Redux_Extension_Abstract {
 		 *
 		 * @var bool
 		 */
-		public bool $is_field = false;
+		public $is_field = false;
 
 		/**
 		 * Class Constructor. Defines the args for the extions class
diff --git a/redux-core/inc/extensions/options_object/class-redux-extension-options-object.php b/redux-core/inc/extensions/options_object/class-redux-extension-options-object.php
@@ -33,14 +33,14 @@ class Redux_Extension_Options_Object extends Redux_Extension_Abstract {
 		 *
 		 * @var string
 		 */
-		private string $field_name = 'options_object';
+		private $field_name = 'options_object';
 
 		/**
 		 * Is field bit.
 		 *
 		 * @var bool
 		 */
-		public bool $is_field = false;
+		public $is_field = false;
 
 		/**
 		 * Class Constructor. Defines the args for the extions class
diff --git a/redux-core/inc/fields/media/class-redux-media.php b/redux-core/inc/fields/media/class-redux-media.php
@@ -24,7 +24,7 @@ class Redux_Media extends Redux_Field {
 		 *
 		 * @var bool $filters_enabled .
 		 */
-		private bool $filters_enabled = false;
+		private $filters_enabled = false;
 
 		/**
 		 * Set field and value defaults.
diff --git a/redux-core/inc/fields/slider/class-redux-slider.php b/redux-core/inc/fields/slider/class-redux-slider.php
@@ -23,28 +23,28 @@ class Redux_Slider extends Redux_Field {
 		 *
 		 * @var int
 		 */
-		private int $display_none = 0;
+		private $display_none = 0;
 
 		/**
 		 * Label value readout.
 		 *
 		 * @var int
 		 */
-		private int $display_label = 1;
+		private $display_label = 1;
 
 		/**
 		 * Text value readout.
 		 *
 		 * @var int
 		 */
-		private int $display_text = 2;
+		private $display_text = 2;
 
 		/**
 		 * Select box value readout.
 		 *
 		 * @var int
 		 */
-		private int $display_select = 3;
+		private $display_select = 3;
 
 		/**
 		 * Set field and value defaults.
diff --git a/redux-core/inc/fields/typography/class-redux-typography.php b/redux-core/inc/fields/typography/class-redux-typography.php
@@ -22,14 +22,14 @@ class Redux_Typography extends Redux_Field {
 		 *
 		 * @var array
 		 */
-		private array $typography_preview = array();
+		private $typography_preview = array();
 
 		/**
 		 *  Standard font array.
 		 *
 		 * @var array $std_fonts
 		 */
-		private array $std_fonts = array(
+		private $std_fonts = array(
 			'Arial, Helvetica, sans-serif'            => 'Arial, Helvetica, sans-serif',
 			'\'Arial Black\', Gadget, sans-serif'     => '\'Arial Black\', Gadget, sans-serif',
 			'\'Bookman Old Style\', serif'            => '\'Bookman Old Style\', serif',
@@ -54,7 +54,7 @@ class Redux_Typography extends Redux_Field {
 		 *
 		 * @var bool $user_fonts
 		 */
-		private bool $user_fonts = true;
+		private $user_fonts = true;
 
 		/**
 		 * Redux_Field constructor.
diff --git a/redux-core/inc/themecheck/class-redux-themecheck.php b/redux-core/inc/themecheck/class-redux-themecheck.php
@@ -23,7 +23,7 @@ class Redux_ThemeCheck {
 		 * @since   1.0.0
 		 * @var     string
 		 */
-		protected string $version = '1.0.0';
+		protected $version = '1.0.0';
 
 		/**
 		 * Instance of this class.
diff --git a/redux-framework.php b/redux-framework.php
@@ -10,7 +10,7 @@
  * Description:     Build better sites in WordPress fast
  * Author:          Redux.io, Extendify
  * Author URI:      http://redux.io
- * Version:         4.1.28
+ * Version:         4.1.29
  * Text Domain:     redux-framework
  * License:         GPLv3 or later
  * License URI:     http://www.gnu.org/licenses/gpl-3.0.txt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "reduxframework/redux-framework",`
`3`		`- "version": "4.1.28",`
	`3`	`+ "version": "4.1.29",`
`4`	`4`	`"authors": [`
`5`	`5`	`{`
`6`	`6`	`"name": "Redux.io",`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class Redux_Extension_Import_Export extends Redux_Extension_Abstract {`
`31`	`31`	`*`
`32`	`32`	`* @var bool`
`33`	`33`	`*/`
`34`		`- public bool $is_field = false;`
	`34`	`+ public $is_field = false;`
`35`	`35`
`36`	`36`	`/**`
`37`	`37`	`* Class Constructor. Defines the args for the extions class`