Excel export type tweaks

plugins/exportTypes/Excel/Excel.class.php

@@ -1,7 +1,11 @@
 <?php
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;	
+
+require_once("vendor/autoload.php");
+
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
+
 /**
  * @package ExportTypes
  */
@@ -18,9 +22,6 @@ class Excel extends ExportTypePlugin {
 
 
 	function generate($generator) {
-		require("vendor/autoload.php");
-		require_once("PhpOffice/PhpSpreadsheet/Spreadsheet.php");
-
 		$data = $generator->generateExportData();
 		$this->chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 		$this->charArray = str_split($this->chars, 1);
@@ -46,7 +47,7 @@ function generate($generator) {
 				$objPHPExcel->getActiveSheet()->setCellValue($col, $data["rowData"][$i][$j]);
 			}
 		}
-		
+
 		// we'll need to check if the compression option is turned on. And then execute this code - unullmass
 
 		//$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'xlsx');

plugins/exportTypes/Excel/README.md

@@ -1,6 +1,6 @@
 ## Excel Export Type
 
-This Export Type generates the random data in Excel format. It uses the `PHPExcel` library to handle the 
+This Export Type generates the random data in Excel format. It uses the `PHPOffice/PHPSpreadsheet` library to handle the 
 actual file generation.
 
 It's super-simple, and doesn't offer any additional settings to control any aspects of the generated Excel file.