PHPOffice / PhpSpreadsheet

Examples/16csv.php

Indentation +3 added lines, -3 removed lines

@@ -45,9 +45,9 @@
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'CSV')->setDelimiter(',')
-                                                                  ->setEnclosure('"')
-                                                                  ->setSheetIndex(0)
-                                                                  ->save(str_replace('.php', '.csv', __FILE__));
+                                                                    ->setEnclosure('"')
+                                                                    ->setSheetIndex(0)
+                                                                    ->save(str_replace('.php', '.csv', __FILE__));
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
 echo date('H:i:s') , " File written to " , str_replace('.php', '.csv', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;

Spacing +19 added lines, -19 removed lines

@@ -31,7 +31,7 @@ 
 ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
 date_default_timezone_set('Europe/London');
 
@@ -41,7 +41,7 @@ 
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';
 
 
-echo date('H:i:s') , " Write to CSV format" , EOL;
+echo date('H:i:s'), " Write to CSV format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'CSV')->setDelimiter(',')
@@ -50,13 +50,13 @@ 
                                                                   ->save(str_replace('.php', '.csv', __FILE__));
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
-echo date('H:i:s') , " File written to " , str_replace('.php', '.csv', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.csv', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
-echo date('H:i:s') , " Read from CSV format" , EOL;
+echo date('H:i:s'), " Read from CSV format", EOL;
 $callStartTime = microtime(true);
 $objReader = \PHPExcel\IOFactory::createReader('CSV')->setDelimiter(',')
                                                     ->setEnclosure('"')
@@ -65,25 +65,25 @@ 
 
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
-echo 'Call time to reload Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo 'Call time to reload Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
+echo date('H:i:s'), " Write to Excel2007 format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter2007 = \PHPExcel\IOFactory::createWriter($objPHPExcelFromCSV, 'Excel2007');
 $objWriter2007->save(str_replace('.php', '.xlsx', __FILE__));
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
-echo date('H:i:s') , " Write to CSV format" , EOL;
+echo date('H:i:s'), " Write to CSV format", EOL;
 $callStartTime = microtime(true);
 
 $objWriterCSV = \PHPExcel\IOFactory::createWriter($objPHPExcelFromCSV, 'CSV');
@@ -91,15 +91,15 @@ 
 $objWriterCSV->save(str_replace('.php', '_excel.csv', __FILE__));
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
-echo date('H:i:s') , " File written to " , str_replace('.php', '_excel.csv', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '_excel.csv', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
 // Echo memory peak usage
-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
 
 // Echo done
-echo date('H:i:s') , " Done writing files" , EOL;
-echo 'Files have been created in ' , getcwd() , EOL;
+echo date('H:i:s'), " Done writing files", EOL;
+echo 'Files have been created in ', getcwd(), EOL;

Examples/OOCalcReader.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 /** \PHPExcel\IOFactory */

 require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php';

 

-echo date('H:i:s') , " Load from OOCalc file" , PHP_EOL;

+echo date('H:i:s'), " Load from OOCalc file", PHP_EOL;

 $callStartTime = microtime(true);

 

 $objReader = \PHPExcel\IOFactory::createReader('OOCalc');

@@ -42,20 +42,20 @@ 
 

 $callEndTime = microtime(true);

 $callTime = $callEndTime - $callStartTime;

-echo 'Call time to read Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , PHP_EOL;

+echo 'Call time to read Workbook was ', sprintf('%.4f', $callTime), " seconds", PHP_EOL;

 // Echo memory usage

-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , PHP_EOL;

+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", PHP_EOL;

 

 

-echo date('H:i:s') , " Write to Excel2007 format" , PHP_EOL;

+echo date('H:i:s'), " Write to Excel2007 format", PHP_EOL;

 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');

 $objWriter->save(str_replace('.php', '.xlsx', __FILE__));

-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', __FILE__) , PHP_EOL;

+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', __FILE__), PHP_EOL;

 

 

 // Echo memory peak usage

-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , PHP_EOL;

+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", PHP_EOL;

 

 // Echo done

-echo date('H:i:s') , " Done writing file" , PHP_EOL;

+echo date('H:i:s'), " Done writing file", PHP_EOL;

 

Examples/11documentsecurity.php

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
 ini_set('display_errors', TRUE);
 ini_set('display_startup_errors', TRUE);
 
-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
 date_default_timezone_set('Europe/London');
 
@@ -39,11 +39,11 @@ 
 
 
 // Create new PHPExcel object
-echo date('H:i:s') , " Create new PHPExcel object" , EOL;
+echo date('H:i:s'), " Create new PHPExcel object", EOL;
 $objPHPExcel = new \PHPExcel\Spreadsheet();
 
 // Set document properties
-echo date('H:i:s') , " Set document properties" , EOL;
+echo date('H:i:s'), " Set document properties", EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
 							 ->setLastModifiedBy("Maarten Balliauw")
 							 ->setTitle("Office 2007 XLSX Test Document")
@@ -54,7 +54,7 @@ 
 
 
 // Add some data
-echo date('H:i:s') , " Add some data" , EOL;
+echo date('H:i:s'), " Add some data", EOL;
 $objPHPExcel->setActiveSheetIndex(0);
 $objPHPExcel->getActiveSheet()->setCellValue('A1', 'Hello');
 $objPHPExcel->getActiveSheet()->setCellValue('B2', 'world!');
@@ -62,19 +62,19 @@ 
 $objPHPExcel->getActiveSheet()->setCellValue('D2', 'world!');
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPHPExcel->getActiveSheet()->setTitle('Simple');
 
 
 // Set document security
-echo date('H:i:s') , " Set document security" , EOL;
+echo date('H:i:s'), " Set document security", EOL;
 $objPHPExcel->getSecurity()->setLockWindows(true);
 $objPHPExcel->getSecurity()->setLockStructure(true);
 $objPHPExcel->getSecurity()->setWorkbookPassword("PHPExcel");
 
 
 // Set sheet security
-echo date('H:i:s') , " Set sheet security" , EOL;
+echo date('H:i:s'), " Set sheet security", EOL;
 $objPHPExcel->getActiveSheet()->getProtection()->setPassword('PHPExcel');
 $objPHPExcel->getActiveSheet()->getProtection()->setSheet(true); // This should be enabled in order to enable any of the following!
 $objPHPExcel->getActiveSheet()->getProtection()->setSort(true);
@@ -87,7 +87,7 @@ 
 
 
 // Save Excel 2007 file
-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
+echo date('H:i:s'), " Write to Excel2007 format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
@@ -95,15 +95,15 @@ 
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
 
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
 // Echo memory peak usage
-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
 
 // Echo done
-echo date('H:i:s') , " Done writing file" , EOL;
-echo 'File has been created in ' , getcwd() , EOL;
+echo date('H:i:s'), " Done writing file", EOL;
+echo 'File has been created in ', getcwd(), EOL;

Indentation +6 added lines, -6 removed lines

@@ -45,12 +45,12 @@
 // Set document properties
 echo date('H:i:s') , " Set document properties" , EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
-							 ->setLastModifiedBy("Maarten Balliauw")
-							 ->setTitle("Office 2007 XLSX Test Document")
-							 ->setSubject("Office 2007 XLSX Test Document")
-							 ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
-							 ->setKeywords("office 2007 openxml php")
-							 ->setCategory("Test result file");
+                                ->setLastModifiedBy("Maarten Balliauw")
+                                ->setTitle("Office 2007 XLSX Test Document")
+                                ->setSubject("Office 2007 XLSX Test Document")
+                                ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
+                                ->setKeywords("office 2007 openxml php")
+                                ->setCategory("Test result file");
 
 
 // Add some data

Examples/31docproperties_write.php

Indentation +15 added lines, -15 removed lines

@@ -57,9 +57,9 @@ 
 

 echo date('H:i:s') , " Adjust properties" , EOL;

 $objPHPExcel->getProperties()->setTitle("Office 2007 XLSX Test Document")

-							 ->setSubject("Office 2007 XLSX Test Document")

-							 ->setDescription("Test XLSX document, generated using PHPExcel")

-							 ->setKeywords("office 2007 openxml php");

+                                ->setSubject("Office 2007 XLSX Test Document")

+                                ->setDescription("Test XLSX document, generated using PHPExcel")

+                                ->setKeywords("office 2007 openxml php");

 

 

 // Save Excel 2007 file

@@ -84,10 +84,10 @@ 
 echo 'Core Properties:' , EOL;

 echo '    Created by - ' , $objPHPExcel->getProperties()->getCreator() , EOL;

 echo '    Created on - ' , date('d-M-Y',$objPHPExcel->getProperties()->getCreated()) , ' at ' ,

-                       date('H:i:s',$objPHPExcel->getProperties()->getCreated()) , EOL;

+                        date('H:i:s',$objPHPExcel->getProperties()->getCreated()) , EOL;

 echo '    Last Modified by - ' , $objPHPExcel->getProperties()->getLastModifiedBy() , EOL;

 echo '    Last Modified on - ' , date('d-M-Y',$objPHPExcel->getProperties()->getModified()) , ' at ' ,

-                             date('H:i:s',$objPHPExcel->getProperties()->getModified()) , EOL;

+                                date('H:i:s',$objPHPExcel->getProperties()->getModified()) , EOL;

 echo '    Title - ' , $objPHPExcel->getProperties()->getTitle() , EOL;

 echo '    Subject - ' , $objPHPExcel->getProperties()->getSubject() , EOL;

 echo '    Description - ' , $objPHPExcel->getProperties()->getDescription() , EOL;

@@ -103,16 +103,16 @@ 
 echo 'Custom Properties:' , EOL;

 $customProperties = $objPHPExcel->getProperties()->getCustomProperties();

 foreach($customProperties as $customProperty) {

-	$propertyValue = $objPHPExcel->getProperties()->getCustomPropertyValue($customProperty);

-	$propertyType = $objPHPExcel->getProperties()->getCustomPropertyType($customProperty);

-	echo '    ' , $customProperty , ' - (' , $propertyType , ') - ';

-	if ($propertyType == \PHPExcel\Document\Properties::PROPERTY_TYPE_DATE) {

-		echo date('d-M-Y H:i:s',$propertyValue) , EOL;

-	} elseif ($propertyType == \PHPExcel\Document\Properties::PROPERTY_TYPE_BOOLEAN) {

-		echo (($propertyValue) ? 'TRUE' : 'FALSE') , EOL;

-	} else {

-		echo $propertyValue , EOL;

-	}

+    $propertyValue = $objPHPExcel->getProperties()->getCustomPropertyValue($customProperty);

+    $propertyType = $objPHPExcel->getProperties()->getCustomPropertyType($customProperty);

+    echo '    ' , $customProperty , ' - (' , $propertyType , ') - ';

+    if ($propertyType == \PHPExcel\Document\Properties::PROPERTY_TYPE_DATE) {

+        echo date('d-M-Y H:i:s',$propertyValue) , EOL;

+    } elseif ($propertyType == \PHPExcel\Document\Properties::PROPERTY_TYPE_BOOLEAN) {

+        echo (($propertyValue) ? 'TRUE' : 'FALSE') , EOL;

+    } else {

+        echo $propertyValue , EOL;

+    }

 }

 

 // Echo memory peak usage

Spacing +32 added lines, -32 removed lines

@@ -30,7 +30,7 @@ 
 ini_set('display_errors', TRUE);

 ini_set('display_startup_errors', TRUE);

 

-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');

+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');

 

 date_default_timezone_set('Europe/London');

 

@@ -42,7 +42,7 @@ 
 $inputFileName = 'templates/31docproperties.xlsx';

 

 

-echo date('H:i:s') , " Load Tests from $inputFileType file" , EOL;

+echo date('H:i:s'), " Load Tests from $inputFileType file", EOL;

 $callStartTime = microtime(true);

 

 $objPHPExcelReader = \PHPExcel\IOFactory::createReader($inputFileType);

@@ -50,12 +50,12 @@ 
 

 $callEndTime = microtime(true);

 $callTime = $callEndTime - $callStartTime;

-echo 'Call time to read Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;

+echo 'Call time to read Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;

 // Echo memory usage

-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;

+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;

 

 

-echo date('H:i:s') , " Adjust properties" , EOL;

+echo date('H:i:s'), " Adjust properties", EOL;

 $objPHPExcel->getProperties()->setTitle("Office 2007 XLSX Test Document")

 							 ->setSubject("Office 2007 XLSX Test Document")

 							 ->setDescription("Test XLSX document, generated using PHPExcel")

@@ -63,57 +63,57 @@ 
 

 

 // Save Excel 2007 file

-echo date('H:i:s') , " Write to Excel2007 format" , EOL;

+echo date('H:i:s'), " Write to Excel2007 format", EOL;

 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');

 $objWriter->save(str_replace('.php', '.xlsx', __FILE__));

-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;

+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;

 

 

 // Echo memory peak usage

-echo date('H:i:s') , " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB" , EOL;

+echo date('H:i:s'), " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB", EOL;

 

 

 echo EOL;

 // Reread File

-echo date('H:i:s') , " Reread Excel2007 file" , EOL;

+echo date('H:i:s'), " Reread Excel2007 file", EOL;

 $objPHPExcelRead = \PHPExcel\IOFactory::load(str_replace('.php', '.xlsx', __FILE__));

 

 // Set properties

-echo date('H:i:s') , " Get properties" , EOL;

+echo date('H:i:s'), " Get properties", EOL;

 

-echo 'Core Properties:' , EOL;

-echo '    Created by - ' , $objPHPExcel->getProperties()->getCreator() , EOL;

-echo '    Created on - ' , date('d-M-Y',$objPHPExcel->getProperties()->getCreated()) , ' at ' ,

-                       date('H:i:s',$objPHPExcel->getProperties()->getCreated()) , EOL;

-echo '    Last Modified by - ' , $objPHPExcel->getProperties()->getLastModifiedBy() , EOL;

-echo '    Last Modified on - ' , date('d-M-Y',$objPHPExcel->getProperties()->getModified()) , ' at ' ,

-                             date('H:i:s',$objPHPExcel->getProperties()->getModified()) , EOL;

-echo '    Title - ' , $objPHPExcel->getProperties()->getTitle() , EOL;

-echo '    Subject - ' , $objPHPExcel->getProperties()->getSubject() , EOL;

-echo '    Description - ' , $objPHPExcel->getProperties()->getDescription() , EOL;

-echo '    Keywords: - ' , $objPHPExcel->getProperties()->getKeywords() , EOL;

+echo 'Core Properties:', EOL;

+echo '    Created by - ', $objPHPExcel->getProperties()->getCreator(), EOL;

+echo '    Created on - ', date('d-M-Y', $objPHPExcel->getProperties()->getCreated()), ' at ',

+                       date('H:i:s', $objPHPExcel->getProperties()->getCreated()), EOL;

+echo '    Last Modified by - ', $objPHPExcel->getProperties()->getLastModifiedBy(), EOL;

+echo '    Last Modified on - ', date('d-M-Y', $objPHPExcel->getProperties()->getModified()), ' at ',

+                             date('H:i:s', $objPHPExcel->getProperties()->getModified()), EOL;

+echo '    Title - ', $objPHPExcel->getProperties()->getTitle(), EOL;

+echo '    Subject - ', $objPHPExcel->getProperties()->getSubject(), EOL;

+echo '    Description - ', $objPHPExcel->getProperties()->getDescription(), EOL;

+echo '    Keywords: - ', $objPHPExcel->getProperties()->getKeywords(), EOL;

 

 

-echo 'Extended (Application) Properties:' , EOL;

-echo '    Category - ' , $objPHPExcel->getProperties()->getCategory() , EOL;

-echo '    Company - ' , $objPHPExcel->getProperties()->getCompany() , EOL;

-echo '    Manager - ' , $objPHPExcel->getProperties()->getManager() , EOL;

+echo 'Extended (Application) Properties:', EOL;

+echo '    Category - ', $objPHPExcel->getProperties()->getCategory(), EOL;

+echo '    Company - ', $objPHPExcel->getProperties()->getCompany(), EOL;

+echo '    Manager - ', $objPHPExcel->getProperties()->getManager(), EOL;

 

 

-echo 'Custom Properties:' , EOL;

+echo 'Custom Properties:', EOL;

 $customProperties = $objPHPExcel->getProperties()->getCustomProperties();

-foreach($customProperties as $customProperty) {

+foreach ($customProperties as $customProperty) {

 	$propertyValue = $objPHPExcel->getProperties()->getCustomPropertyValue($customProperty);

 	$propertyType = $objPHPExcel->getProperties()->getCustomPropertyType($customProperty);

-	echo '    ' , $customProperty , ' - (' , $propertyType , ') - ';

+	echo '    ', $customProperty, ' - (', $propertyType, ') - ';

 	if ($propertyType == \PHPExcel\Document\Properties::PROPERTY_TYPE_DATE) {

-		echo date('d-M-Y H:i:s',$propertyValue) , EOL;

+		echo date('d-M-Y H:i:s', $propertyValue), EOL;

 	} elseif ($propertyType == \PHPExcel\Document\Properties::PROPERTY_TYPE_BOOLEAN) {

-		echo (($propertyValue) ? 'TRUE' : 'FALSE') , EOL;

+		echo (($propertyValue) ? 'TRUE' : 'FALSE'), EOL;

 	} else {

-		echo $propertyValue , EOL;

+		echo $propertyValue, EOL;

 	}

 }

 

 // Echo memory peak usage

-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) . " MB" , EOL;

+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024) . " MB", EOL;

Examples/11documentsecurity-xls.php

Indentation +6 added lines, -6 removed lines

@@ -45,12 +45,12 @@
 // Set document properties
 echo date('H:i:s') , " Set document properties" , EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
-							 ->setLastModifiedBy("Maarten Balliauw")
-							 ->setTitle("Office 2007 XLSX Test Document")
-							 ->setSubject("Office 2007 XLSX Test Document")
-							 ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
-							 ->setKeywords("office 2007 openxml php")
-							 ->setCategory("Test result file");
+                                ->setLastModifiedBy("Maarten Balliauw")
+                                ->setTitle("Office 2007 XLSX Test Document")
+                                ->setSubject("Office 2007 XLSX Test Document")
+                                ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
+                                ->setKeywords("office 2007 openxml php")
+                                ->setCategory("Test result file");
 
 
 // Add some data

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
 ini_set('display_errors', TRUE);
 ini_set('display_startup_errors', TRUE);
 
-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
 date_default_timezone_set('Europe/London');
 
@@ -39,11 +39,11 @@ 
 
 
 // Create new PHPExcel object
-echo date('H:i:s') , " Create new PHPExcel object" , EOL;
+echo date('H:i:s'), " Create new PHPExcel object", EOL;
 $objPHPExcel = new \PHPExcel\Spreadsheet();
 
 // Set document properties
-echo date('H:i:s') , " Set document properties" , EOL;
+echo date('H:i:s'), " Set document properties", EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
 							 ->setLastModifiedBy("Maarten Balliauw")
 							 ->setTitle("Office 2007 XLSX Test Document")
@@ -54,7 +54,7 @@ 
 
 
 // Add some data
-echo date('H:i:s') , " Add some data" , EOL;
+echo date('H:i:s'), " Add some data", EOL;
 $objPHPExcel->setActiveSheetIndex(0);
 $objPHPExcel->getActiveSheet()->setCellValue('A1', 'Hello');
 $objPHPExcel->getActiveSheet()->setCellValue('B2', 'world!');
@@ -62,19 +62,19 @@ 
 $objPHPExcel->getActiveSheet()->setCellValue('D2', 'world!');
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPHPExcel->getActiveSheet()->setTitle('Simple');
 
 
 // Set document security
-echo date('H:i:s') , " Set document security" , EOL;
+echo date('H:i:s'), " Set document security", EOL;
 $objPHPExcel->getSecurity()->setLockWindows(true);
 $objPHPExcel->getSecurity()->setLockStructure(true);
 $objPHPExcel->getSecurity()->setWorkbookPassword("PHPExcel");
 
 
 // Set sheet security
-echo date('H:i:s') , " Set sheet security" , EOL;
+echo date('H:i:s'), " Set sheet security", EOL;
 $objPHPExcel->getActiveSheet()->getProtection()->setPassword('PHPExcel');
 $objPHPExcel->getActiveSheet()->getProtection()->setSheet(true); // This should be enabled in order to enable any of the following!
 $objPHPExcel->getActiveSheet()->getProtection()->setSort(true);
@@ -87,7 +87,7 @@ 
 
 
 // Save Excel 95 file
-echo date('H:i:s') , " Write to Excel5 format" , EOL;
+echo date('H:i:s'), " Write to Excel5 format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5');
@@ -95,15 +95,15 @@ 
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
 
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
 // Echo memory peak usage
-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
 
 // Echo done
-echo date('H:i:s') , " Done writing file" , EOL;
-echo 'File has been created in ' , getcwd() , EOL;
+echo date('H:i:s'), " Done writing file", EOL;
+echo 'File has been created in ', getcwd(), EOL;

Examples/10autofilter-selection-2.php

Indentation +68 added lines, -68 removed lines

@@ -44,22 +44,22 @@ 
 // Set document properties
 echo date('H:i:s').' Set document properties'.EOL;
 $objPHPExcel->getProperties()->setCreator('Maarten Balliauw')
-							 ->setLastModifiedBy('Maarten Balliauw')
-							 ->setTitle('PHPExcel Test Document')
-							 ->setSubject('PHPExcel Test Document')
-							 ->setDescription('Test document for PHPExcel, generated using PHP classes.')
-							 ->setKeywords('office PHPExcel php')
-							 ->setCategory('Test result file');
+                                ->setLastModifiedBy('Maarten Balliauw')
+                                ->setTitle('PHPExcel Test Document')
+                                ->setSubject('PHPExcel Test Document')
+                                ->setDescription('Test document for PHPExcel, generated using PHP classes.')
+                                ->setKeywords('office PHPExcel php')
+                                ->setCategory('Test result file');
 
 // Create the worksheet
 echo date('H:i:s').' Add data'.EOL;
 $objPHPExcel->setActiveSheetIndex(0);
 $objPHPExcel->getActiveSheet()->setCellValue('A1', 'Financial Year')
-                              ->setCellValue('B1', 'Financial Period')
-                              ->setCellValue('C1', 'Country')
-                              ->setCellValue('D1', 'Date')
-                              ->setCellValue('E1', 'Sales Value')
-                              ->setCellValue('F1', 'Expenditure');
+                                ->setCellValue('B1', 'Financial Period')
+                                ->setCellValue('C1', 'Country')
+                                ->setCellValue('D1', 'Date')
+                                ->setCellValue('E1', 'Sales Value')
+                                ->setCellValue('F1', 'Expenditure');
 $startYear = $endYear = $currentYear = date('Y');
 $startYear--;
 $endYear++;
@@ -67,44 +67,44 @@ 
 $years = range($startYear,$endYear);
 $periods = range(1,12);
 $countries = array(	'United States',	'UK',		'France',	'Germany',
-					'Italy',			'Spain',	'Portugal',	'Japan'
-				  );
+                    'Italy',			'Spain',	'Portugal',	'Japan'
+                    );
 
 $row = 2;
 foreach($years as $year) {
-	foreach($periods as $period) {
-		foreach($countries as $country) {
-			$endDays = date('t',mktime(0,0,0,$period,1,$year));
-			for($i = 1; $i <= $endDays; ++$i) {
-				$eDate = \PHPExcel\Shared\Date::formattedPHPToExcel(
-					$year,
-					$period,
-					$i
-				);
-				$value = rand(500,1000) * (1 + rand(-0.25,+0.25));
-				$salesValue = $invoiceValue = NULL;
-				$incomeOrExpenditure = rand(-1,1);
-				if ($incomeOrExpenditure == -1) {
-					$expenditure = rand(-500,-1000) * (1 + rand(-0.25,+0.25));
-					$income = NULL;
-				} elseif ($incomeOrExpenditure == 1) {
-					$expenditure = rand(-500,-1000) * (1 + rand(-0.25,+0.25));
-					$income = rand(500,1000) * (1 + rand(-0.25,+0.25));;
-				} else {
-					$expenditure = NULL;
-					$income = rand(500,1000) * (1 + rand(-0.25,+0.25));;
-				}
-				$dataArray = array(	$year,
-									$period,
-									$country,
-									$eDate,
-									$income,
-									$expenditure,
-								  );
-				$objPHPExcel->getActiveSheet()->fromArray($dataArray, NULL, 'A'.$row++);
-			}
-		}
-	}
+    foreach($periods as $period) {
+        foreach($countries as $country) {
+            $endDays = date('t',mktime(0,0,0,$period,1,$year));
+            for($i = 1; $i <= $endDays; ++$i) {
+                $eDate = \PHPExcel\Shared\Date::formattedPHPToExcel(
+                    $year,
+                    $period,
+                    $i
+                );
+                $value = rand(500,1000) * (1 + rand(-0.25,+0.25));
+                $salesValue = $invoiceValue = NULL;
+                $incomeOrExpenditure = rand(-1,1);
+                if ($incomeOrExpenditure == -1) {
+                    $expenditure = rand(-500,-1000) * (1 + rand(-0.25,+0.25));
+                    $income = NULL;
+                } elseif ($incomeOrExpenditure == 1) {
+                    $expenditure = rand(-500,-1000) * (1 + rand(-0.25,+0.25));
+                    $income = rand(500,1000) * (1 + rand(-0.25,+0.25));;
+                } else {
+                    $expenditure = NULL;
+                    $income = rand(500,1000) * (1 + rand(-0.25,+0.25));;
+                }
+                $dataArray = array(	$year,
+                                    $period,
+                                    $country,
+                                    $eDate,
+                                    $income,
+                                    $expenditure,
+                                    );
+                $objPHPExcel->getActiveSheet()->fromArray($dataArray, NULL, 'A'.$row++);
+            }
+        }
+    }
 }
 $row--;
 
@@ -137,37 +137,37 @@ 
 $autoFilter->getColumn('C')
     ->setFilterType(\PHPExcel\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_FILTER)
     ->createRule()
-		->setRule(
-			\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
-			'Germany'
-		);
+        ->setRule(
+            \PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
+            'Germany'
+        );
 // Filter the Date column on a filter value of the year to date
 $autoFilter->getColumn('D')
-	->setFilterType(\PHPExcel\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER)
-	->createRule()
-		->setRule(
-			\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
-			NULL,
-			\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE
-		)
-		->setRuleType(\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
+    ->setFilterType(\PHPExcel\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER)
+    ->createRule()
+        ->setRule(
+            \PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
+            NULL,
+            \PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE
+        )
+        ->setRuleType(\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
 // Display only sales values that are between 400 and 600
 $autoFilter->getColumn('E')
     ->setFilterType(\PHPExcel\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER)
     ->createRule()
-		->setRule(
-			\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
-			400
-		)
-		->setRuleType(\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
+        ->setRule(
+            \PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
+            400
+        )
+        ->setRuleType(\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
 $autoFilter->getColumn('E')
     ->setJoin(\PHPExcel\Worksheet\AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND)
     ->createRule()
-		->setRule(
-			\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
-			600
-		)
-		->setRuleType(\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
+        ->setRule(
+            \PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
+            600
+        )
+        ->setRuleType(\PHPExcel\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
 
 
 // Set active sheet index to the first sheet, so Excel opens this as the first sheet

Spacing +37 added lines, -37 removed lines

@@ -31,18 +31,18 @@ 
 ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
 /** Include PHPExcel */
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';
 
 
 // Create new PHPExcel object
-echo date('H:i:s').' Create new PHPExcel object'.EOL;
+echo date('H:i:s') . ' Create new PHPExcel object' . EOL;
 $objPHPExcel = new \PHPExcel\Spreadsheet();
 
 // Set document properties
-echo date('H:i:s').' Set document properties'.EOL;
+echo date('H:i:s') . ' Set document properties' . EOL;
 $objPHPExcel->getProperties()->setCreator('Maarten Balliauw')
 							 ->setLastModifiedBy('Maarten Balliauw')
 							 ->setTitle('PHPExcel Test Document')
@@ -52,7 +52,7 @@ 
 							 ->setCategory('Test result file');
 
 // Create the worksheet
-echo date('H:i:s').' Add data'.EOL;
+echo date('H:i:s') . ' Add data' . EOL;
 $objPHPExcel->setActiveSheetIndex(0);
 $objPHPExcel->getActiveSheet()->setCellValue('A1', 'Financial Year')
                               ->setCellValue('B1', 'Financial Period')
@@ -64,44 +64,44 @@ 
 $startYear--;
 $endYear++;
 
-$years = range($startYear,$endYear);
-$periods = range(1,12);
-$countries = array(	'United States',	'UK',		'France',	'Germany',
-					'Italy',			'Spain',	'Portugal',	'Japan'
+$years = range($startYear, $endYear);
+$periods = range(1, 12);
+$countries = array('United States', 'UK', 'France', 'Germany',
+					'Italy', 'Spain', 'Portugal', 'Japan'
 				  );
 
 $row = 2;
-foreach($years as $year) {
-	foreach($periods as $period) {
-		foreach($countries as $country) {
-			$endDays = date('t',mktime(0,0,0,$period,1,$year));
-			for($i = 1; $i <= $endDays; ++$i) {
+foreach ($years as $year) {
+	foreach ($periods as $period) {
+		foreach ($countries as $country) {
+			$endDays = date('t', mktime(0, 0, 0, $period, 1, $year));
+			for ($i = 1; $i <= $endDays; ++$i) {
 				$eDate = \PHPExcel\Shared\Date::formattedPHPToExcel(
 					$year,
 					$period,
 					$i
 				);
-				$value = rand(500,1000) * (1 + rand(-0.25,+0.25));
+				$value = rand(500, 1000) * (1 + rand(-0.25, +0.25));
 				$salesValue = $invoiceValue = NULL;
-				$incomeOrExpenditure = rand(-1,1);
+				$incomeOrExpenditure = rand(-1, 1);
 				if ($incomeOrExpenditure == -1) {
-					$expenditure = rand(-500,-1000) * (1 + rand(-0.25,+0.25));
+					$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
 					$income = NULL;
 				} elseif ($incomeOrExpenditure == 1) {
-					$expenditure = rand(-500,-1000) * (1 + rand(-0.25,+0.25));
-					$income = rand(500,1000) * (1 + rand(-0.25,+0.25));;
+					$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
+					$income = rand(500, 1000) * (1 + rand(-0.25, +0.25)); ;
 				} else {
 					$expenditure = NULL;
-					$income = rand(500,1000) * (1 + rand(-0.25,+0.25));;
+					$income = rand(500, 1000) * (1 + rand(-0.25, +0.25)); ;
 				}
-				$dataArray = array(	$year,
+				$dataArray = array($year,
 									$period,
 									$country,
 									$eDate,
 									$income,
 									$expenditure,
 								  );
-				$objPHPExcel->getActiveSheet()->fromArray($dataArray, NULL, 'A'.$row++);
+				$objPHPExcel->getActiveSheet()->fromArray($dataArray, NULL, 'A' . $row++);
 			}
 		}
 	}
@@ -110,20 +110,20 @@ 
 
 
 // Set styling
-echo date('H:i:s').' Set styling'.EOL;
+echo date('H:i:s') . ' Set styling' . EOL;
 $objPHPExcel->getActiveSheet()->getStyle('A1:F1')->getFont()->setBold(true);
 $objPHPExcel->getActiveSheet()->getStyle('A1:F1')->getAlignment()->setWrapText(TRUE);
 $objPHPExcel->getActiveSheet()->getColumnDimension('C')->setWidth(12.5);
 $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(10.5);
-$objPHPExcel->getActiveSheet()->getStyle('D2:D'.$row)->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_DATE_YYYYMMDD2);
-$objPHPExcel->getActiveSheet()->getStyle('E2:F'.$row)->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
+$objPHPExcel->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_DATE_YYYYMMDD2);
+$objPHPExcel->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
 $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(14);
 $objPHPExcel->getActiveSheet()->freezePane('A2');
 
 
 
 // Set autofilter range
-echo date('H:i:s').' Set autofilter range'.EOL;
+echo date('H:i:s') . ' Set autofilter range' . EOL;
 // Always include the complete filter range!
 // Excel does support setting only the caption
 // row, but that's not a best practise...
@@ -131,7 +131,7 @@ 
 
 // Set active filters
 $autoFilter = $objPHPExcel->getActiveSheet()->getAutoFilter();
-echo date('H:i:s').' Set active filters'.EOL;
+echo date('H:i:s') . ' Set active filters' . EOL;
 // Filter the Country column on a filter value of Germany
 //	As it's just a simple value filter, we can use FILTERTYPE_FILTER
 $autoFilter->getColumn('C')
@@ -175,7 +175,7 @@ 
 
 
 // Save Excel 2007 file
-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
+echo date('H:i:s'), " Write to Excel2007 format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
@@ -183,14 +183,14 @@ 
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
 
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
 // Save Excel 95 file
-echo date('H:i:s') , " Write to Excel5 format" , EOL;
+echo date('H:i:s'), " Write to Excel5 format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5');
@@ -198,15 +198,15 @@ 
 $callEndTime = microtime(true);
 $callTime = $callEndTime - $callStartTime;
 
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
 // Echo memory usage
-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
 
 
 // Echo memory peak usage
-echo date('H:i:s').' Peak memory usage: '.(memory_get_peak_usage(true) / 1024 / 1024).' MB'.EOL;
+echo date('H:i:s') . ' Peak memory usage: ' . (memory_get_peak_usage(true) / 1024 / 1024) . ' MB' . EOL;
 
 // Echo done
-echo date('H:i:s').' Done writing files'.EOL;
-echo 'Files have been created in ' , getcwd() , EOL;
+echo date('H:i:s') . ' Done writing files' . EOL;
+echo 'Files have been created in ', getcwd(), EOL;

Examples/01simple-download-pdf.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 //$rendererLibrary = 'tcPDF5.9';
 $rendererLibrary = 'mPDF5.4';
 //$rendererLibrary = 'domPDF0.6.0beta3';
-$rendererLibraryPath = dirname(__FILE__).'/../../../libraries/PDF/' . $rendererLibrary;
+$rendererLibraryPath = dirname(__FILE__) . '/../../../libraries/PDF/' . $rendererLibrary;
 
 
 // Create new PHPExcel object

Braces +2 added lines, -1 removed lines

@@ -31,8 +31,9 @@
 ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
-if (PHP_SAPI == 'cli')
+if (PHP_SAPI == 'cli') {
 	die('This example should only be run from a Web Browser');
+}
 
 /** Include PHPExcel */
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';

Indentation +14 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
 date_default_timezone_set('Europe/London');
 
 if (PHP_SAPI == 'cli')
-	die('This example should only be run from a Web Browser');
+    die('This example should only be run from a Web Browser');
 
 /** Include PhpSpreadsheet */
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';
@@ -53,12 +53,12 @@ 
 
 // Set document properties
 $objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
-	->setLastModifiedBy("Maarten Balliauw")
-	->setTitle("PDF Test Document")
-	->setSubject("PDF Test Document")
-	->setDescription("Test document for PDF, generated using PHP classes.")
-	->setKeywords("pdf php")
-	->setCategory("Test result file");
+    ->setLastModifiedBy("Maarten Balliauw")
+    ->setTitle("PDF Test Document")
+    ->setSubject("PDF Test Document")
+    ->setDescription("Test document for PDF, generated using PHP classes.")
+    ->setKeywords("pdf php")
+    ->setCategory("Test result file");
 
 
 // Add some data
@@ -83,13 +83,13 @@ 
 
 if (!PhpSpreadsheet\Settings::setPdfRenderer(
         $rendererName,
-		$rendererLibraryPath
-	)) {
-	die(
-		'NOTICE: Please set the $rendererName and $rendererLibraryPath values' .
-		'<br />' .
-		'at the top of this script as appropriate for your directory structure'
-	);
+        $rendererLibraryPath
+    )) {
+    die(
+        'NOTICE: Please set the $rendererName and $rendererLibraryPath values' .
+        '<br />' .
+        'at the top of this script as appropriate for your directory structure'
+    );
 }
 
 

Examples/35chartrender.php

Indentation +64 added lines, -64 removed lines

@@ -22,79 +22,79 @@
 
 
 if (!PHPExcel\Settings::setChartRenderer(
-		$rendererName,
-		$rendererLibraryPath
-	)) {
-	die(
-		'NOTICE: Please set the $rendererName and $rendererLibraryPath values' .
-		EOL .
-		'at the top of this script as appropriate for your directory structure'
-	);
+        $rendererName,
+        $rendererLibraryPath
+    )) {
+    die(
+        'NOTICE: Please set the $rendererName and $rendererLibraryPath values' .
+        EOL .
+        'at the top of this script as appropriate for your directory structure'
+    );
 }
 
 
 $inputFileType = 'Excel2007';
 $inputFileNames = 'templates/32readwrite*[0-9].xlsx';
 
-	if ((isset($argc)) && ($argc > 1)) {
-	$inputFileNames = array();
-	for($i = 1; $i < $argc; ++$i) {
-		$inputFileNames[] = dirname(__FILE__) . '/templates/' . $argv[$i];
-	}
+    if ((isset($argc)) && ($argc > 1)) {
+    $inputFileNames = array();
+    for($i = 1; $i < $argc; ++$i) {
+        $inputFileNames[] = dirname(__FILE__) . '/templates/' . $argv[$i];
+    }
 } else {
-	$inputFileNames = glob($inputFileNames);
+    $inputFileNames = glob($inputFileNames);
 }
 foreach($inputFileNames as $inputFileName) {
-	$inputFileNameShort = basename($inputFileName);
-
-	if (!file_exists($inputFileName)) {
-		echo date('H:i:s') , " File " , $inputFileNameShort , ' does not exist' , EOL;
-		continue;
-	}
-
-	echo date('H:i:s') , " Load Test from $inputFileType file " , $inputFileNameShort , EOL;
-
-	$objReader = \PHPExcel\IOFactory::createReader($inputFileType);
-	$objReader->setIncludeCharts(TRUE);
-	$objPHPExcel = $objReader->load($inputFileName);
-
-
-	echo date('H:i:s') , " Iterate worksheets looking at the charts" , EOL;
-	foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) {
-		$sheetName = $worksheet->getTitle();
-		echo 'Worksheet: ' , $sheetName , EOL;
-
-		$chartNames = $worksheet->getChartNames();
-		if(empty($chartNames)) {
-			echo '    There are no charts in this worksheet' , EOL;
-		} else {
-			natsort($chartNames);
-			foreach($chartNames as $i => $chartName) {
-				$chart = $worksheet->getChartByName($chartName);
-				if (!is_null($chart->getTitle())) {
-					$caption = '"' . implode(' ',$chart->getTitle()->getCaption()) . '"';
-				} else {
-					$caption = 'Untitled';
-				}
-				echo '    ' , $chartName , ' - ' , $caption , EOL;
-				echo str_repeat(' ',strlen($chartName)+3);
-
-				$jpegFile = '35'.str_replace('.xlsx', '.jpg', substr($inputFileNameShort,2));
-				if (file_exists($jpegFile)) {
-					unlink($jpegFile);
-				}
-				try {
-					$chart->render($jpegFile);
-				} catch (Exception $e) {
-					echo 'Error rendering chart: ',$e->getMessage();
-				}
-			}
-		}
-	}
-
-
-	$objPHPExcel->disconnectWorksheets();
-	unset($objPHPExcel);
+    $inputFileNameShort = basename($inputFileName);
+
+    if (!file_exists($inputFileName)) {
+        echo date('H:i:s') , " File " , $inputFileNameShort , ' does not exist' , EOL;
+        continue;
+    }
+
+    echo date('H:i:s') , " Load Test from $inputFileType file " , $inputFileNameShort , EOL;
+
+    $objReader = \PHPExcel\IOFactory::createReader($inputFileType);
+    $objReader->setIncludeCharts(TRUE);
+    $objPHPExcel = $objReader->load($inputFileName);
+
+
+    echo date('H:i:s') , " Iterate worksheets looking at the charts" , EOL;
+    foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) {
+        $sheetName = $worksheet->getTitle();
+        echo 'Worksheet: ' , $sheetName , EOL;
+
+        $chartNames = $worksheet->getChartNames();
+        if(empty($chartNames)) {
+            echo '    There are no charts in this worksheet' , EOL;
+        } else {
+            natsort($chartNames);
+            foreach($chartNames as $i => $chartName) {
+                $chart = $worksheet->getChartByName($chartName);
+                if (!is_null($chart->getTitle())) {
+                    $caption = '"' . implode(' ',$chart->getTitle()->getCaption()) . '"';
+                } else {
+                    $caption = 'Untitled';
+                }
+                echo '    ' , $chartName , ' - ' , $caption , EOL;
+                echo str_repeat(' ',strlen($chartName)+3);
+
+                $jpegFile = '35'.str_replace('.xlsx', '.jpg', substr($inputFileNameShort,2));
+                if (file_exists($jpegFile)) {
+                    unlink($jpegFile);
+                }
+                try {
+                    $chart->render($jpegFile);
+                } catch (Exception $e) {
+                    echo 'Error rendering chart: ',$e->getMessage();
+                }
+            }
+        }
+    }
+
+
+    $objPHPExcel->disconnectWorksheets();
+    unset($objPHPExcel);
 }
 
 // Echo memory peak usage

Spacing +18 added lines, -18 removed lines

@@ -6,7 +6,7 @@ 
 ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
 date_default_timezone_set('Europe/London');
 
@@ -38,55 +38,55 @@ 
 
 	if ((isset($argc)) && ($argc > 1)) {
 	$inputFileNames = array();
-	for($i = 1; $i < $argc; ++$i) {
+	for ($i = 1; $i < $argc; ++$i) {
 		$inputFileNames[] = dirname(__FILE__) . '/templates/' . $argv[$i];
 	}
 } else {
 	$inputFileNames = glob($inputFileNames);
 }
-foreach($inputFileNames as $inputFileName) {
+foreach ($inputFileNames as $inputFileName) {
 	$inputFileNameShort = basename($inputFileName);
 
 	if (!file_exists($inputFileName)) {
-		echo date('H:i:s') , " File " , $inputFileNameShort , ' does not exist' , EOL;
+		echo date('H:i:s'), " File ", $inputFileNameShort, ' does not exist', EOL;
 		continue;
 	}
 
-	echo date('H:i:s') , " Load Test from $inputFileType file " , $inputFileNameShort , EOL;
+	echo date('H:i:s'), " Load Test from $inputFileType file ", $inputFileNameShort, EOL;
 
 	$objReader = \PHPExcel\IOFactory::createReader($inputFileType);
 	$objReader->setIncludeCharts(TRUE);
 	$objPHPExcel = $objReader->load($inputFileName);
 
 
-	echo date('H:i:s') , " Iterate worksheets looking at the charts" , EOL;
+	echo date('H:i:s'), " Iterate worksheets looking at the charts", EOL;
 	foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) {
 		$sheetName = $worksheet->getTitle();
-		echo 'Worksheet: ' , $sheetName , EOL;
+		echo 'Worksheet: ', $sheetName, EOL;
 
 		$chartNames = $worksheet->getChartNames();
-		if(empty($chartNames)) {
-			echo '    There are no charts in this worksheet' , EOL;
+		if (empty($chartNames)) {
+			echo '    There are no charts in this worksheet', EOL;
 		} else {
 			natsort($chartNames);
-			foreach($chartNames as $i => $chartName) {
+			foreach ($chartNames as $i => $chartName) {
 				$chart = $worksheet->getChartByName($chartName);
 				if (!is_null($chart->getTitle())) {
-					$caption = '"' . implode(' ',$chart->getTitle()->getCaption()) . '"';
+					$caption = '"' . implode(' ', $chart->getTitle()->getCaption()) . '"';
 				} else {
 					$caption = 'Untitled';
 				}
-				echo '    ' , $chartName , ' - ' , $caption , EOL;
-				echo str_repeat(' ',strlen($chartName)+3);
+				echo '    ', $chartName, ' - ', $caption, EOL;
+				echo str_repeat(' ', strlen($chartName) + 3);
 
-				$jpegFile = '35'.str_replace('.xlsx', '.jpg', substr($inputFileNameShort,2));
+				$jpegFile = '35' . str_replace('.xlsx', '.jpg', substr($inputFileNameShort, 2));
 				if (file_exists($jpegFile)) {
 					unlink($jpegFile);
 				}
 				try {
 					$chart->render($jpegFile);
 				} catch (Exception $e) {
-					echo 'Error rendering chart: ',$e->getMessage();
+					echo 'Error rendering chart: ', $e->getMessage();
 				}
 			}
 		}
@@ -98,8 +98,8 @@ 
 }
 
 // Echo memory peak usage
-echo date('H:i:s') , ' Peak memory usage: ' , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), ' Peak memory usage: ', (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
 
 // Echo done
-echo date('H:i:s') , " Done rendering charts as images" , EOL;
-echo 'Image files have been created in ' , getcwd() , EOL;
+echo date('H:i:s'), " Done rendering charts as images", EOL;
+echo 'Image files have been created in ', getcwd(), EOL;

Examples/33chartcreate-pie.php

Indentation +41 added lines, -41 removed lines

@@ -43,13 +43,13 @@ 
 $objPHPExcel = new \PHPExcel\Spreadsheet();
 $objWorksheet = $objPHPExcel->getActiveSheet();
 $objWorksheet->fromArray(
-	array(
-		array('',	2010,	2011,	2012),
-		array('Q1',   12,   15,		21),
-		array('Q2',   56,   73,		86),
-		array('Q3',   52,   61,		69),
-		array('Q4',   30,   32,		0),
-	)
+    array(
+        array('',	2010,	2011,	2012),
+        array('Q1',   12,   15,		21),
+        array('Q2',   56,   73,		86),
+        array('Q3',   52,   61,		69),
+        array('Q4',   30,   32,		0),
+    )
 );
 
 
@@ -61,7 +61,7 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesLabels1 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
 );
 //	Set the X-Axis Labels
 //		Datatype
@@ -71,7 +71,7 @@ 
 //		Data values
 //		Data Marker
 $xAxisTickValues1 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4),	//	Q1 to Q4
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4),	//	Q1 to Q4
 );
 //	Set the Data values for each data series we want to plot
 //		Datatype
@@ -81,17 +81,17 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesValues1 = array(
-	new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4),
+    new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4),
 );
 
 //	Build the dataseries
 $series1 = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_PIECHART,				// plotType
-	NULL,			                                        // plotGrouping (Pie charts don't have any grouping)
-	range(0, count($dataSeriesValues1)-1),					// plotOrder
-	$dataSeriesLabels1,										// plotLabel
-	$xAxisTickValues1,										// plotCategory
-	$dataSeriesValues1										// plotValues
+    \PHPExcel\Chart\DataSeries::TYPE_PIECHART,				// plotType
+    NULL,			                                        // plotGrouping (Pie charts don't have any grouping)
+    range(0, count($dataSeriesValues1)-1),					// plotOrder
+    $dataSeriesLabels1,										// plotLabel
+    $xAxisTickValues1,										// plotCategory
+    $dataSeriesValues1										// plotValues
 );
 
 //	Set up a layout object for the Pie chart
@@ -109,14 +109,14 @@ 
 
 //	Create the chart
 $chart1 = new \PHPExcel\Chart(
-	'chart1',		// name
-	$title1,		// title
-	$legend1,		// legend
-	$plotArea1,		// plotArea
-	true,			// plotVisibleOnly
-	0,				// displayBlanksAs
-	NULL,			// xAxisLabel
-	NULL			// yAxisLabel		- Pie charts don't have a Y-Axis
+    'chart1',		// name
+    $title1,		// title
+    $legend1,		// legend
+    $plotArea1,		// plotArea
+    true,			// plotVisibleOnly
+    0,				// displayBlanksAs
+    NULL,			// xAxisLabel
+    NULL			// yAxisLabel		- Pie charts don't have a Y-Axis
 );
 
 //	Set the position where the chart should appear in the worksheet
@@ -135,7 +135,7 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesLabels2 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
 );
 //	Set the X-Axis Labels
 //		Datatype
@@ -145,7 +145,7 @@ 
 //		Data values
 //		Data Marker
 $xAxisTickValues2 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4),	//	Q1 to Q4
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4),	//	Q1 to Q4
 );
 //	Set the Data values for each data series we want to plot
 //		Datatype
@@ -155,17 +155,17 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesValues2 = array(
-	new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4),
+    new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$5', NULL, 4),
 );
 
 //	Build the dataseries
 $series2 = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_DONUTCHART,		// plotType
-	NULL,			                                // plotGrouping (Donut charts don't have any grouping)
-	range(0, count($dataSeriesValues2)-1),			// plotOrder
-	$dataSeriesLabels2,								// plotLabel
-	$xAxisTickValues2,								// plotCategory
-	$dataSeriesValues2								// plotValues
+    \PHPExcel\Chart\DataSeries::TYPE_DONUTCHART,		// plotType
+    NULL,			                                // plotGrouping (Donut charts don't have any grouping)
+    range(0, count($dataSeriesValues2)-1),			// plotOrder
+    $dataSeriesLabels2,								// plotLabel
+    $xAxisTickValues2,								// plotCategory
+    $dataSeriesValues2								// plotValues
 );
 
 //	Set up a layout object for the Pie chart
@@ -181,14 +181,14 @@ 
 
 //	Create the chart
 $chart2 = new \PHPExcel\Chart(
-	'chart2',		// name
-	$title2,		// title
-	NULL,			// legend
-	$plotArea2,		// plotArea
-	true,			// plotVisibleOnly
-	0,				// displayBlanksAs
-	NULL,			// xAxisLabel
-	NULL			// yAxisLabel		- Like Pie charts, Donut charts don't have a Y-Axis
+    'chart2',		// name
+    $title2,		// title
+    NULL,			// legend
+    $plotArea2,		// plotArea
+    true,			// plotVisibleOnly
+    0,				// displayBlanksAs
+    NULL,			// xAxisLabel
+    NULL			// yAxisLabel		- Like Pie charts, Donut charts don't have a Y-Axis
 );
 
 //	Set the position where the chart should appear in the worksheet

Spacing +39 added lines, -39 removed lines

@@ -6,7 +6,7 @@ 
 ini_set('display_startup_errors', TRUE);
 date_default_timezone_set('Europe/London');
 
-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
 
 date_default_timezone_set('Europe/London');
 
@@ -44,11 +44,11 @@ 
 $objWorksheet = $objPHPExcel->getActiveSheet();
 $objWorksheet->fromArray(
 	array(
-		array('',	2010,	2011,	2012),
-		array('Q1',   12,   15,		21),
-		array('Q2',   56,   73,		86),
-		array('Q3',   52,   61,		69),
-		array('Q4',   30,   32,		0),
+		array('', 2010, 2011, 2012),
+		array('Q1', 12, 15, 21),
+		array('Q2', 56, 73, 86),
+		array('Q3', 52, 61, 69),
+		array('Q4', 30, 32, 0),
 	)
 );
 
@@ -61,7 +61,7 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesLabels1 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), //	2011
 );
 //	Set the X-Axis Labels
 //		Datatype
@@ -71,7 +71,7 @@ 
 //		Data values
 //		Data Marker
 $xAxisTickValues1 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4),	//	Q1 to Q4
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), //	Q1 to Q4
 );
 //	Set the Data values for each data series we want to plot
 //		Datatype
@@ -86,11 +86,11 @@ 
 
 //	Build the dataseries
 $series1 = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_PIECHART,				// plotType
-	NULL,			                                        // plotGrouping (Pie charts don't have any grouping)
-	range(0, count($dataSeriesValues1)-1),					// plotOrder
-	$dataSeriesLabels1,										// plotLabel
-	$xAxisTickValues1,										// plotCategory
+	\PHPExcel\Chart\DataSeries::TYPE_PIECHART, // plotType
+	NULL, // plotGrouping (Pie charts don't have any grouping)
+	range(0, count($dataSeriesValues1) - 1), // plotOrder
+	$dataSeriesLabels1, // plotLabel
+	$xAxisTickValues1, // plotCategory
 	$dataSeriesValues1										// plotValues
 );
 
@@ -109,13 +109,13 @@ 
 
 //	Create the chart
 $chart1 = new \PHPExcel\Chart(
-	'chart1',		// name
-	$title1,		// title
-	$legend1,		// legend
-	$plotArea1,		// plotArea
-	true,			// plotVisibleOnly
-	0,				// displayBlanksAs
-	NULL,			// xAxisLabel
+	'chart1', // name
+	$title1, // title
+	$legend1, // legend
+	$plotArea1, // plotArea
+	true, // plotVisibleOnly
+	0, // displayBlanksAs
+	NULL, // xAxisLabel
 	NULL			// yAxisLabel		- Pie charts don't have a Y-Axis
 );
 
@@ -135,7 +135,7 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesLabels2 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), //	2011
 );
 //	Set the X-Axis Labels
 //		Datatype
@@ -145,7 +145,7 @@ 
 //		Data values
 //		Data Marker
 $xAxisTickValues2 = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4),	//	Q1 to Q4
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$5', NULL, 4), //	Q1 to Q4
 );
 //	Set the Data values for each data series we want to plot
 //		Datatype
@@ -160,11 +160,11 @@ 
 
 //	Build the dataseries
 $series2 = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_DONUTCHART,		// plotType
-	NULL,			                                // plotGrouping (Donut charts don't have any grouping)
-	range(0, count($dataSeriesValues2)-1),			// plotOrder
-	$dataSeriesLabels2,								// plotLabel
-	$xAxisTickValues2,								// plotCategory
+	\PHPExcel\Chart\DataSeries::TYPE_DONUTCHART, // plotType
+	NULL, // plotGrouping (Donut charts don't have any grouping)
+	range(0, count($dataSeriesValues2) - 1), // plotOrder
+	$dataSeriesLabels2, // plotLabel
+	$xAxisTickValues2, // plotCategory
 	$dataSeriesValues2								// plotValues
 );
 
@@ -181,13 +181,13 @@ 
 
 //	Create the chart
 $chart2 = new \PHPExcel\Chart(
-	'chart2',		// name
-	$title2,		// title
-	NULL,			// legend
-	$plotArea2,		// plotArea
-	true,			// plotVisibleOnly
-	0,				// displayBlanksAs
-	NULL,			// xAxisLabel
+	'chart2', // name
+	$title2, // title
+	NULL, // legend
+	$plotArea2, // plotArea
+	true, // plotVisibleOnly
+	0, // displayBlanksAs
+	NULL, // xAxisLabel
 	NULL			// yAxisLabel		- Like Pie charts, Donut charts don't have a Y-Axis
 );
 
@@ -200,16 +200,16 @@ 
 
 
 // Save Excel 2007 file
-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
+echo date('H:i:s'), " Write to Excel2007 format", EOL;
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
 $objWriter->setIncludeCharts(TRUE);
 $objWriter->save(str_replace('.php', '.xlsx', __FILE__));
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
 
 
 // Echo memory peak usage
-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
 
 // Echo done
-echo date('H:i:s') , " Done writing file" , EOL;
-echo 'File has been created in ' , getcwd() , EOL;
+echo date('H:i:s'), " Done writing file", EOL;
+echo 'File has been created in ', getcwd(), EOL;