Merge pull request #369 from contactashish13/issue-368

PHPOffice library deprecated

Author: contactashish13

classes/Visualizer/Module.php

@@ -253,24 +253,29 @@ private function _getCSV( $rows, $filename ) {
 	 * @param string $filename The name of the file to use.
 	 */
 	private function _getExcel( $rows, $filename ) {
-		// PHPExcel does not like sheet names longer than 31 characters.
+		// PHPExcel did not like sheet names longer than 31 characters and we will assume the same with PhpSpreadsheet
 		$chart      = substr( $filename, 0, 30 );
 		$filename   .= '.xlsx';
 
+		$vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
+		if ( is_readable( $vendor_file ) ) {
+			include_once( $vendor_file );
+		}
+
 		$xlsData    = '';
-		if ( class_exists( 'PHPExcel' ) ) {
-			$doc        = new PHPExcel();
+		if ( class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) ) {
+			$doc        = new PhpOffice\PhpSpreadsheet\Spreadsheet();
 			$doc->getActiveSheet()->fromArray( $rows, null, 'A1' );
 			$doc->getActiveSheet()->setTitle( sanitize_title( $chart ) );
 			$doc        = apply_filters( 'visualizer_excel_doc', $doc );
-			$writer = PHPExcel_IOFactory::createWriter( $doc, 'Excel2007' );
+			$writer = PhpOffice\PhpSpreadsheet\IOFactory::createWriter( $doc, 'Xlsx' );
 			ob_start();
 			$writer->save( 'php://output' );
 			$xlsData = ob_get_contents();
 			ob_end_clean();
 		} else {
-			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Class PHPExcel does not exist!', 'error', __FILE__, __LINE__ );
-			error_log( 'Class PHPExcel does not exist!' );
+			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, 'Class PhpOffice\PhpSpreadsheet\Spreadsheet does not exist!', 'error', __FILE__, __LINE__ );
+			error_log( 'Class PhpOffice\PhpSpreadsheet\Spreadsheet does not exist!' );
 		}
 		return array(
 			'csv'  => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ),

classes/Visualizer/Render/Sidebar.php

@@ -231,7 +231,7 @@ protected function _renderActionSettings() {
 				$disable_actions
 			);
 
-			$disabled   = ! ( class_exists( 'PHPExcel' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) );
+			$disabled   = ! self::is_excel_enabled();
 			self::_renderCheckboxItem(
 				esc_html__( 'Excel', 'visualizer' ),
 				'actions[]',
@@ -251,6 +251,18 @@ protected function _renderActionSettings() {
 		self::_renderSectionEnd();
 	}
 
+	/**
+	 * Checks if the Excel module can be enabled.
+	 */
+	private static function is_excel_enabled() {
+		$vendor_file = VISUALIZER_ABSPATH . '/vendor/autoload.php';
+		if ( is_readable( $vendor_file ) ) {
+			include_once( $vendor_file );
+		}
+
+		return class_exists( 'PhpOffice\PhpSpreadsheet\Spreadsheet' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && extension_loaded( 'fileinfo' ) && version_compare( PHP_VERSION, '5.6.0', '>' );
+	}
+
 	/**
 	 * Renders chart general settings group.
 	 *

composer.json

@@ -23,12 +23,13 @@
   "require": {
     "codeinwp/themeisle-sdk": "master",
     "xrstf/composer-php52": "^1.0.20",
-    "PHPOffice/PHPExcel": "^1.8.1",
+    "phpoffice/phpspreadsheet": "^1.6.0",
     "neitanod/forceutf8": "~2.0"
   },
   "autoload": {
     "files": [
-      "vendor/codeinwp/themeisle-sdk/load.php"
+      "vendor/codeinwp/themeisle-sdk/load.php",
+      "vendor/phpoffice/phpspreadsheet/src/Bootstrap.php"
     ]
   },
   "minimum-stability": "dev",