Merge pull request #5 from moojomoore/master

Update PHPSpreadsheet to 1.29.0

Author: manchumahara

README.txt

@@ -1,8 +1,8 @@
 === CBX PhpSpreadSheet Library ===
-Contributors: codeboxr,manchumahara
+Contributors: codeboxr,manchumahara, moojomoore
 Requires at least: 3.5
-Tested up to: 6.0.2
-Stable tag: 1.0.3
+Tested up to: 6.3.1
+Stable tag: 1.0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -20,7 +20,7 @@ Software requirements
 
 The following software is required to develop using PhpSpreadsheet:
 
- * PHP version 5.6 or newer
+ * PHP version 7.4 or newer
  * PHP extension php_zip enabled
  * PHP extension php_xml enabled
  * PHP extension php_gd2 enabled (if not compiled in)
@@ -59,6 +59,9 @@ if ( defined('CBXPHPSPREADSHEET_PLUGIN_NAME') && file_exists( CBXPHPSPREADSHEET_
 
 == Changelog ==
 
+= 1.0.4 =
+* Updated the phpspreadsheet package to latest V1.29.0
+
 = 1.0.3 =
 * Updated the phpspreadsheet package to latest V1.21.0
 

cbxphpspreadsheet.php

@@ -16,7 +16,7 @@
  * Plugin Name:       CBX PhpSpreadSheet Library
  * Plugin URI:        https://codeboxr.com/php-spreadsheet-library-wordpress-plugin/
  * Description:       A pure PHP library for reading and writing spreadsheet files https://phpspreadsheet.readthedocs.io/
- * Version:           1.0.3
+ * Version:           1.0.4
  * Author:            Codeboxr
  * Author URI:        https://github.com/PHPOffice/PhpSpreadsheet
  * License:           GPL-2.0+
@@ -31,7 +31,7 @@
 }
 
 defined( 'CBXPHPSPREADSHEET_PLUGIN_NAME' ) or define( 'CBXPHPSPREADSHEET_PLUGIN_NAME', 'cbxphpspreadsheet' );
-defined( 'CBXPHPSPREADSHEET_PLUGIN_VERSION' ) or define( 'CBXPHPSPREADSHEET_PLUGIN_VERSION', '1.0.3' );
+defined( 'CBXPHPSPREADSHEET_PLUGIN_VERSION' ) or define( 'CBXPHPSPREADSHEET_PLUGIN_VERSION', '1.0.4' );
 defined( 'CBXPHPSPREADSHEET_BASE_NAME' ) or define( 'CBXPHPSPREADSHEET_BASE_NAME', plugin_basename( __FILE__ ) );
 defined( 'CBXPHPSPREADSHEET_ROOT_PATH' ) or define( 'CBXPHPSPREADSHEET_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBXPHPSPREADSHEET_ROOT_URL' ) or define( 'CBXPHPSPREADSHEET_ROOT_URL', plugin_dir_url( __FILE__ ) );
@@ -55,7 +55,7 @@ function __construct() {
 	 */
 	public static function activation() {
 		/*$requirements = array(
-			'PHP 5.6.0' => version_compare(PHP_VERSION, '5.6.0', '>='),
+			'PHP 7.4.0' => version_compare(PHP_VERSION, '7.4.0', '>='),
 			'PHP extension XML' => extension_loaded('xml'),
 			'PHP extension xmlwriter' => extension_loaded('xmlwriter'),
 			'PHP extension mbstring' => extension_loaded('mbstring'),
@@ -71,7 +71,7 @@ public static function activation() {
 			deactivate_plugins(__FILE__);
 
 			// Throw an error in the wordpress admin console
-			$error_message = __('This plugin requires PHP version 5.6 or newer', 'cbxphpspreadsheet');
+			$error_message = __('This plugin requires PHP version 7.4 or newer', 'cbxphpspreadsheet');
 			die($error_message);
 		}
 
@@ -114,7 +114,7 @@ public static function activation() {
 	 * @return bool
 	 */
 	public static function php_version_check(){
-		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+		if (version_compare(PHP_VERSION, '7.4.0', '<')) {
 			return false;
 		}
 

languages/cbxphpspreadsheet.pot

@@ -16,7 +16,7 @@ msgstr ""
 "X-Loco-Version: 2.2.2; wp-5.2"
 
 #: cbxphpspreadsheet.php:74
-msgid "This plugin requires PHP version 5.6 or newer"
+msgid "This plugin requires PHP version 7.4 or newer"
 msgstr ""
 
 #: cbxphpspreadsheet.php:85

lib/composer.json

@@ -1,5 +1,7 @@
 {
     "require": {
-        "phpoffice/phpspreadsheet": "^1.21"
+        "phpoffice/phpspreadsheet": "^1.29",
+        "myclabs/php-enum": "^1.8",
+        "symfony/polyfill-mbstring": "^1.28"
     }
 }