Inspection of "Fix crash when reading HTML files" - PHPOffice/PhpSpreadsheet - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( e0a9f9...ba7054 )

by Adrien

created 2016-08-25 02:15 UTC

Status

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -52,12 +52,12 @@  discard block
 block discarded – undo
 // Set document properties
 echo date('H:i:s') , " Set 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");
 
 
 // Create a first sheet
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
 // Set outline levels
 echo date('H:i:s') , " Set outline levels" , EOL;
 $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setOutlineLevel(1)
-                                                       ->setVisible(false)
-                                                       ->setCollapsed(true);
+                                                        ->setVisible(false)
+                                                        ->setCollapsed(true);
 
 // Freeze panes
 echo date('H:i:s') , " Freeze panes" , EOL;
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
 
 // Add data
 for ($i = 2; $i <= 5000; $i++) {
-	$objPHPExcel->getActiveSheet()->setCellValue('A' . $i, "FName $i")
-	                              ->setCellValue('B' . $i, "LName $i")
-	                              ->setCellValue('C' . $i, "PhoneNo $i")
-	                              ->setCellValue('D' . $i, "FaxNo $i")
-	                              ->setCellValue('E' . $i, true);
+    $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, "FName $i")
+                                    ->setCellValue('B' . $i, "LName $i")
+                                    ->setCellValue('C' . $i, "PhoneNo $i")
+                                    ->setCellValue('D' . $i, "FaxNo $i")
+                                    ->setCellValue('E' . $i, true);
 }
 
 

Please login to merge, or discard this patch.

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 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,18 +39,18 @@  discard block
 block discarded – undo
 
 $cacheMethod = \PHPExcel\CachedObjectStorageFactory::CACHE_TO_SQLITE;
 if (\PHPExcel\Settings::setCacheStorageMethod($cacheMethod)) {
-    echo date('H:i:s') , " Enable Cell Caching using " , $cacheMethod , " method" , EOL;
+    echo date('H:i:s'), " Enable Cell Caching using ", $cacheMethod, " method", EOL;
 } else {
-    echo date('H:i:s') , " Unable to set Cell Caching using " , $cacheMethod , " method, reverting to memory" , EOL;
+    echo date('H:i:s'), " Unable to set Cell Caching using ", $cacheMethod, " method, reverting to memory", EOL;
 }
 
 
 // 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 properties" , EOL;
+echo date('H:i:s'), " Set properties", EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
 							 ->setLastModifiedBy("Maarten Balliauw")
 							 ->setTitle("Office 2007 XLSX Test Document")
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
 
 // Create a first sheet
-echo date('H:i:s') , " Add data" , EOL;
+echo date('H:i:s'), " Add data", EOL;
 $objPHPExcel->setActiveSheetIndex(0);
 $objPHPExcel->getActiveSheet()->setCellValue('A1', "Firstname");
 $objPHPExcel->getActiveSheet()->setCellValue('B1', "Lastname");
@@ -71,24 +71,24 @@  discard block
 block discarded – undo
 
 
 // Hide "Phone" and "fax" column
-echo date('H:i:s') , " Hide 'Phone' and 'fax' columns" , EOL;
+echo date('H:i:s'), " Hide 'Phone' and 'fax' columns", EOL;
 $objPHPExcel->getActiveSheet()->getColumnDimension('C')->setVisible(false);
 $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setVisible(false);
 
 
 // Set outline levels
-echo date('H:i:s') , " Set outline levels" , EOL;
+echo date('H:i:s'), " Set outline levels", EOL;
 $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setOutlineLevel(1)
                                                        ->setVisible(false)
                                                        ->setCollapsed(true);
 
 // Freeze panes
-echo date('H:i:s') , " Freeze panes" , EOL;
+echo date('H:i:s'), " Freeze panes", EOL;
 $objPHPExcel->getActiveSheet()->freezePane('A2');
 
 
 // Rows to repeat at top
-echo date('H:i:s') , " Rows to repeat at top" , EOL;
+echo date('H:i:s'), " Rows to repeat at top", EOL;
 $objPHPExcel->getActiveSheet()->getPageSetup()->setRowsToRepeatAtTopByStartAndEnd(1, 1);
 
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 
 
 // 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');
@@ -115,15 +115,15 @@  discard block
 block discarded – undo
 $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;

Please login to merge, or discard this patch.

Examples/01pharSimple.php 2 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -44,12 +44,12 @@
 block discarded – undo
 // 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");
 
 
 // Add some data

Please login to merge, or discard this patch.

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -31,18 +31,18 @@  discard block
 block discarded – undo
 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")
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 
 
 // Add some data
-echo date('H:i:s') , " Add some data" , EOL;
+echo date('H:i:s'), " Add some data", EOL;
 
 $html1 = '<font color="#0000ff">
 <h1 align="center">My very first example of rich text<br />generated from html markup</h1>
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
 
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPHPExcel->getActiveSheet()
     ->setTitle('Rich Text Examples');
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
 
 
 // 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');
@@ -142,14 +142,14 @@  discard block
 block discarded – undo
 $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');
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
 $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;

Please login to merge, or discard this patch.

Examples/01simple-download-xlsx.php 3 patches

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -79,10 +79,10 @@
 block discarded – undo
 header('Cache-Control: max-age=1');
 
 // If you're serving to IE over SSL, then the following may be needed
-header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified
-header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
-header ('Pragma: public'); // HTTP/1.0
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
+header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
+header('Pragma: public'); // HTTP/1.0
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5');
 $objWriter->save('php://output');

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -31,8 +31,9 @@
 block discarded – undo
 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';

Please login to merge, or discard this patch.

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
 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';
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
 
 // Set document properties
 $objPhpSpreadsheet->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

Please login to merge, or discard this patch.

Examples/33chartcreate-radar.php 2 patches

Indentation +37 added lines, -37 removed lines patch added patch discarded remove patch

@@ -43,21 +43,21 @@  discard block
 block discarded – undo
 $objPHPExcel = new \PHPExcel\Spreadsheet();
 $objWorksheet = $objPHPExcel->getActiveSheet();
 $objWorksheet->fromArray(
-	array(
-		array('',	2010,	2011,	2012),
-		array('Jan',   47,   45,		71),
-		array('Feb',   56,   73,		86),
-		array('Mar',   52,   61,		69),
-		array('Apr',   40,   52,		60),
-		array('May',   42,   55,		71),
-		array('Jun',   58,   63,		76),
-		array('Jul',   53,   61,		89),
-		array('Aug',   46,   69,		85),
-		array('Sep',   62,   75,		81),
-		array('Oct',   51,   70,		96),
-		array('Nov',   55,   66,		89),
-		array('Dec',   68,   62,		0),
-	)
+    array(
+        array('',	2010,	2011,	2012),
+        array('Jan',   47,   45,		71),
+        array('Feb',   56,   73,		86),
+        array('Mar',   52,   61,		69),
+        array('Apr',   40,   52,		60),
+        array('May',   42,   55,		71),
+        array('Jun',   58,   63,		76),
+        array('Jul',   53,   61,		89),
+        array('Aug',   46,   69,		85),
+        array('Sep',   62,   75,		81),
+        array('Oct',   51,   70,		96),
+        array('Nov',   55,   66,		89),
+        array('Dec',   68,   62,		0),
+    )
 );
 
 
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
 //		Data values
 //		Data Marker
 $dataSeriesLabels = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1),	//	2012
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1),	//	2012
 );
 //	Set the X-Axis Labels
 //		Datatype
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
 //		Data values
 //		Data Marker
 $xAxisTickValues = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12),	//	Jan to Dec
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12),	//	Jan to Dec
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12),	//	Jan to Dec
+    new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12),	//	Jan to Dec
 );
 //	Set the Data values for each data series we want to plot
 //		Datatype
@@ -91,21 +91,21 @@  discard block
 block discarded – undo
 //		Data values
 //		Data Marker
 $dataSeriesValues = array(
-	new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', NULL, 12),
-	new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', NULL, 12),
+    new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', NULL, 12),
+    new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', NULL, 12),
 );
 
 //	Build the dataseries
 $series = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_RADARCHART,	// plotType
-	NULL,											// plotGrouping (Radar charts don't have any grouping)
-	range(0, count($dataSeriesValues)-1),			// plotOrder
-	$dataSeriesLabels,								// plotLabel
-	$xAxisTickValues,								// plotCategory
-	$dataSeriesValues,								// plotValues
+    \PHPExcel\Chart\DataSeries::TYPE_RADARCHART,	// plotType
+    NULL,											// plotGrouping (Radar charts don't have any grouping)
+    range(0, count($dataSeriesValues)-1),			// plotOrder
+    $dataSeriesLabels,								// plotLabel
+    $xAxisTickValues,								// plotCategory
+    $dataSeriesValues,								// plotValues
     NULL,                                           // plotDirection
-	NULL,											// smooth line
-	\PHPExcel\Chart\DataSeries::STYLE_MARKER		// plotStyle
+    NULL,											// smooth line
+    \PHPExcel\Chart\DataSeries::STYLE_MARKER		// plotStyle
 );
 
 //	Set up a layout object for the Pie chart
@@ -121,14 +121,14 @@  discard block
 block discarded – undo
 
 //	Create the chart
 $chart = new \PHPExcel\Chart(
-	'chart1',		// name
-	$title,			// title
-	$legend,		// legend
-	$plotArea,		// plotArea
-	true,			// plotVisibleOnly
-	0,				// displayBlanksAs
-	NULL,			// xAxisLabel
-	NULL			// yAxisLabel		- Radar charts don't have a Y-Axis
+    'chart1',		// name
+    $title,			// title
+    $legend,		// legend
+    $plotArea,		// plotArea
+    true,			// plotVisibleOnly
+    0,				// displayBlanksAs
+    NULL,			// xAxisLabel
+    NULL			// yAxisLabel		- Radar charts don't have a Y-Axis
 );
 
 //	Set the position where the chart should appear in the worksheet

Please login to merge, or discard this patch.

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
 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,19 +44,19 @@  discard block
 block discarded – undo
 $objWorksheet = $objPHPExcel->getActiveSheet();
 $objWorksheet->fromArray(
 	array(
-		array('',	2010,	2011,	2012),
-		array('Jan',   47,   45,		71),
-		array('Feb',   56,   73,		86),
-		array('Mar',   52,   61,		69),
-		array('Apr',   40,   52,		60),
-		array('May',   42,   55,		71),
-		array('Jun',   58,   63,		76),
-		array('Jul',   53,   61,		89),
-		array('Aug',   46,   69,		85),
-		array('Sep',   62,   75,		81),
-		array('Oct',   51,   70,		96),
-		array('Nov',   55,   66,		89),
-		array('Dec',   68,   62,		0),
+		array('', 2010, 2011, 2012),
+		array('Jan', 47, 45, 71),
+		array('Feb', 56, 73, 86),
+		array('Mar', 52, 61, 69),
+		array('Apr', 40, 52, 60),
+		array('May', 42, 55, 71),
+		array('Jun', 58, 63, 76),
+		array('Jul', 53, 61, 89),
+		array('Aug', 46, 69, 85),
+		array('Sep', 62, 75, 81),
+		array('Oct', 51, 70, 96),
+		array('Nov', 55, 66, 89),
+		array('Dec', 68, 62, 0),
 	)
 );
 
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
 //		Data values
 //		Data Marker
 $dataSeriesLabels = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1),	//	2011
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1),	//	2012
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), //	2011
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), //	2012
 );
 //	Set the X-Axis Labels
 //		Datatype
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
 //		Data values
 //		Data Marker
 $xAxisTickValues = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12),	//	Jan to Dec
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12),	//	Jan to Dec
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), //	Jan to Dec
+	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), //	Jan to Dec
 );
 //	Set the Data values for each data series we want to plot
 //		Datatype
@@ -97,14 +97,14 @@  discard block
 block discarded – undo
 
 //	Build the dataseries
 $series = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_RADARCHART,	// plotType
-	NULL,											// plotGrouping (Radar charts don't have any grouping)
-	range(0, count($dataSeriesValues)-1),			// plotOrder
-	$dataSeriesLabels,								// plotLabel
-	$xAxisTickValues,								// plotCategory
-	$dataSeriesValues,								// plotValues
-    NULL,                                           // plotDirection
-	NULL,											// smooth line
+	\PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
+	NULL, // plotGrouping (Radar charts don't have any grouping)
+	range(0, count($dataSeriesValues) - 1), // plotOrder
+	$dataSeriesLabels, // plotLabel
+	$xAxisTickValues, // plotCategory
+	$dataSeriesValues, // plotValues
+    NULL, // plotDirection
+	NULL, // smooth line
 	\PHPExcel\Chart\DataSeries::STYLE_MARKER		// plotStyle
 );
 
@@ -121,13 +121,13 @@  discard block
 block discarded – undo
 
 //	Create the chart
 $chart = new \PHPExcel\Chart(
-	'chart1',		// name
-	$title,			// title
-	$legend,		// legend
-	$plotArea,		// plotArea
-	true,			// plotVisibleOnly
-	0,				// displayBlanksAs
-	NULL,			// xAxisLabel
+	'chart1', // name
+	$title, // title
+	$legend, // legend
+	$plotArea, // plotArea
+	true, // plotVisibleOnly
+	0, // displayBlanksAs
+	NULL, // xAxisLabel
 	NULL			// yAxisLabel		- Radar charts don't have a Y-Axis
 );
 
@@ -140,16 +140,16 @@  discard block
 block discarded – undo
 
 
 // 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;

Please login to merge, or discard this patch.

tests/PhpSpreadsheet/Worksheet/WorksheetColumnTest.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -13,8 +13,8 @@
 block discarded – undo
             ->disableOriginalConstructor()
             ->getMock();
         $this->mockWorksheet->expects($this->any())
-                 ->method('getHighestRow')
-                 ->will($this->returnValue(5));
+                    ->method('getHighestRow')
+                    ->will($this->returnValue(5));
     }
 
 

Please login to merge, or discard this patch.

tests/PhpSpreadsheet/Worksheet/ColumnIteratorTest.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -18,11 +18,11 @@
 block discarded – undo
             ->getMock();
 
         $this->mockWorksheet->expects($this->any())
-                 ->method('getHighestColumn')
-                 ->will($this->returnValue('E'));
+                    ->method('getHighestColumn')
+                    ->will($this->returnValue('E'));
         $this->mockWorksheet->expects($this->any())
-                 ->method('current')
-                 ->will($this->returnValue($this->mockColumn));
+                    ->method('current')
+                    ->will($this->returnValue($this->mockColumn));
     }
 
 

Please login to merge, or discard this patch.

tests/PhpSpreadsheet/Worksheet/ColumnCellIteratorTest.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -18,11 +18,11 @@
 block discarded – undo
             ->getMock();
 
         $this->mockWorksheet->expects($this->any())
-                 ->method('getHighestRow')
-                 ->will($this->returnValue(5));
+                    ->method('getHighestRow')
+                    ->will($this->returnValue(5));
         $this->mockWorksheet->expects($this->any())
-                 ->method('getCellByColumnAndRow')
-                 ->will($this->returnValue($this->mockCell));
+                    ->method('getCellByColumnAndRow')
+                    ->will($this->returnValue($this->mockCell));
     }
 
 

Please login to merge, or discard this patch.

tests/PhpSpreadsheet/Worksheet/RowIteratorTest.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -18,11 +18,11 @@
 block discarded – undo
             ->getMock();
 
         $this->mockWorksheet->expects($this->any())
-                 ->method('getHighestRow')
-                 ->will($this->returnValue(5));
+                    ->method('getHighestRow')
+                    ->will($this->returnValue(5));
         $this->mockWorksheet->expects($this->any())
-                 ->method('current')
-                 ->will($this->returnValue($this->mockRow));
+                    ->method('current')
+                    ->will($this->returnValue($this->mockRow));
     }
 
 

Please login to merge, or discard this patch.

tests/PhpSpreadsheet/Worksheet/RowCellIteratorTest.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -18,11 +18,11 @@
 block discarded – undo
             ->getMock();
 
         $this->mockWorksheet->expects($this->any())
-                 ->method('getHighestColumn')
-                 ->will($this->returnValue('E'));
+                    ->method('getHighestColumn')
+                    ->will($this->returnValue('E'));
         $this->mockWorksheet->expects($this->any())
-                 ->method('getCellByColumnAndRow')
-                 ->will($this->returnValue($this->mockCell));
+                    ->method('getCellByColumnAndRow')
+                    ->will($this->returnValue($this->mockCell));
     }
 
 

Please login to merge, or discard this patch.

		@@ -52,12 +52,12 @@ discard block
		block discarded – undo
52	52	// Set document properties
53	53	echo date('H:i:s') , " Set properties" , EOL;
54	54	$objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
55		- ->setLastModifiedBy("Maarten Balliauw")
56		- ->setTitle("Office 2007 XLSX Test Document")
57		- ->setSubject("Office 2007 XLSX Test Document")
58		- ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
59		- ->setKeywords("office 2007 openxml php")
60		- ->setCategory("Test result file");
	55	+ ->setLastModifiedBy("Maarten Balliauw")
	56	+ ->setTitle("Office 2007 XLSX Test Document")
	57	+ ->setSubject("Office 2007 XLSX Test Document")
	58	+ ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
	59	+ ->setKeywords("office 2007 openxml php")
	60	+ ->setCategory("Test result file");
61	61
62	62
63	63	// Create a first sheet
		@@ -79,8 +79,8 @@ discard block
		block discarded – undo
79	79	// Set outline levels
80	80	echo date('H:i:s') , " Set outline levels" , EOL;
81	81	$objPHPExcel->getActiveSheet()->getColumnDimension('E')->setOutlineLevel(1)
82		- ->setVisible(false)
83		- ->setCollapsed(true);
	82	+ ->setVisible(false)
	83	+ ->setCollapsed(true);
84	84
85	85	// Freeze panes
86	86	echo date('H:i:s') , " Freeze panes" , EOL;
		@@ -94,11 +94,11 @@ discard block
		block discarded – undo
94	94
95	95	// Add data
96	96	for ($i = 2; $i <= 5000; $i++) {
97		- $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, "FName $i")
98		- ->setCellValue('B' . $i, "LName $i")
99		- ->setCellValue('C' . $i, "PhoneNo $i")
100		- ->setCellValue('D' . $i, "FaxNo $i")
101		- ->setCellValue('E' . $i, true);
	97	+ $objPHPExcel->getActiveSheet()->setCellValue('A' . $i, "FName $i")
	98	+ ->setCellValue('B' . $i, "LName $i")
	99	+ ->setCellValue('C' . $i, "PhoneNo $i")
	100	+ ->setCellValue('D' . $i, "FaxNo $i")
	101	+ ->setCellValue('E' . $i, true);
102	102	}
103	103
104	104

		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	ini_set('display_errors', TRUE);
31	31	ini_set('display_startup_errors', TRUE);
32	32
33		-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
	33	+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
34	34
35	35	date_default_timezone_set('Europe/London');
36	36
		@@ -39,18 +39,18 @@ discard block
		block discarded – undo
39	39
40	40	$cacheMethod = \PHPExcel\CachedObjectStorageFactory::CACHE_TO_SQLITE;
41	41	if (\PHPExcel\Settings::setCacheStorageMethod($cacheMethod)) {
42		- echo date('H:i:s') , " Enable Cell Caching using " , $cacheMethod , " method" , EOL;
	42	+ echo date('H:i:s'), " Enable Cell Caching using ", $cacheMethod, " method", EOL;
43	43	} else {
44		- echo date('H:i:s') , " Unable to set Cell Caching using " , $cacheMethod , " method, reverting to memory" , EOL;
	44	+ echo date('H:i:s'), " Unable to set Cell Caching using ", $cacheMethod, " method, reverting to memory", EOL;
45	45	}
46	46
47	47
48	48	// Create new PHPExcel object
49		-echo date('H:i:s') , " Create new PHPExcel object" , EOL;
	49	+echo date('H:i:s'), " Create new PHPExcel object", EOL;
50	50	$objPHPExcel = new \PHPExcel\Spreadsheet();
51	51
52	52	// Set document properties
53		-echo date('H:i:s') , " Set properties" , EOL;
	53	+echo date('H:i:s'), " Set properties", EOL;
54	54	$objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
55	55	->setLastModifiedBy("Maarten Balliauw")
56	56	->setTitle("Office 2007 XLSX Test Document")
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62
63	63	// Create a first sheet
64		-echo date('H:i:s') , " Add data" , EOL;
	64	+echo date('H:i:s'), " Add data", EOL;
65	65	$objPHPExcel->setActiveSheetIndex(0);
66	66	$objPHPExcel->getActiveSheet()->setCellValue('A1', "Firstname");
67	67	$objPHPExcel->getActiveSheet()->setCellValue('B1', "Lastname");
		@@ -71,24 +71,24 @@ discard block
		block discarded – undo
71	71
72	72
73	73	// Hide "Phone" and "fax" column
74		-echo date('H:i:s') , " Hide 'Phone' and 'fax' columns" , EOL;
	74	+echo date('H:i:s'), " Hide 'Phone' and 'fax' columns", EOL;
75	75	$objPHPExcel->getActiveSheet()->getColumnDimension('C')->setVisible(false);
76	76	$objPHPExcel->getActiveSheet()->getColumnDimension('D')->setVisible(false);
77	77
78	78
79	79	// Set outline levels
80		-echo date('H:i:s') , " Set outline levels" , EOL;
	80	+echo date('H:i:s'), " Set outline levels", EOL;
81	81	$objPHPExcel->getActiveSheet()->getColumnDimension('E')->setOutlineLevel(1)
82	82	->setVisible(false)
83	83	->setCollapsed(true);
84	84
85	85	// Freeze panes
86		-echo date('H:i:s') , " Freeze panes" , EOL;
	86	+echo date('H:i:s'), " Freeze panes", EOL;
87	87	$objPHPExcel->getActiveSheet()->freezePane('A2');
88	88
89	89
90	90	// Rows to repeat at top
91		-echo date('H:i:s') , " Rows to repeat at top" , EOL;
	91	+echo date('H:i:s'), " Rows to repeat at top", EOL;
92	92	$objPHPExcel->getActiveSheet()->getPageSetup()->setRowsToRepeatAtTopByStartAndEnd(1, 1);
93	93
94	94
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107
108	108
109	109	// Save Excel 2007 file
110		-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
	110	+echo date('H:i:s'), " Write to Excel2007 format", EOL;
111	111	$callStartTime = microtime(true);
112	112
113	113	$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
		@@ -115,15 +115,15 @@ discard block
		block discarded – undo
115	115	$callEndTime = microtime(true);
116	116	$callTime = $callEndTime - $callStartTime;
117	117
118		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
119		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	118	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	119	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
120	120	// Echo memory usage
121		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	121	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
122	122
123	123
124	124	// Echo memory peak usage
125		-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
	125	+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
126	126
127	127	// Echo done
128		-echo date('H:i:s') , " Done writing file" , EOL;
129		-echo 'File has been created in ' , getcwd() , EOL;
	128	+echo date('H:i:s'), " Done writing file", EOL;
	129	+echo 'File has been created in ', getcwd(), EOL;

		@@ -44,12 +44,12 @@
		block discarded – undo
44	44	// Set document properties
45	45	echo date('H:i:s') , " Set document properties" , EOL;
46	46	$objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
47		- ->setLastModifiedBy("Maarten Balliauw")
48		- ->setTitle("PHPExcel Test Document")
49		- ->setSubject("PHPExcel Test Document")
50		- ->setDescription("Test document for PHPExcel, generated using PHP classes.")
51		- ->setKeywords("office PHPExcel php")
52		- ->setCategory("Test result file");
	47	+ ->setLastModifiedBy("Maarten Balliauw")
	48	+ ->setTitle("PHPExcel Test Document")
	49	+ ->setSubject("PHPExcel Test Document")
	50	+ ->setDescription("Test document for PHPExcel, generated using PHP classes.")
	51	+ ->setKeywords("office PHPExcel php")
	52	+ ->setCategory("Test result file");
53	53
54	54
55	55	// Add some data

		@@ -31,18 +31,18 @@ discard block
		block discarded – undo
31	31	ini_set('display_startup_errors', TRUE);
32	32	date_default_timezone_set('Europe/London');
33	33
34		-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
	34	+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
35	35
36	36	/** Include PHPExcel */
37	37	require_once dirname(__FILE__) . '/../src/Bootstrap.php';
38	38
39	39
40	40	// Create new PHPExcel object
41		-echo date('H:i:s') , " Create new PHPExcel object" , EOL;
	41	+echo date('H:i:s'), " Create new PHPExcel object", EOL;
42	42	$objPHPExcel = new \PHPExcel\Spreadsheet();
43	43
44	44	// Set document properties
45		-echo date('H:i:s') , " Set document properties" , EOL;
	45	+echo date('H:i:s'), " Set document properties", EOL;
46	46	$objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
47	47	->setLastModifiedBy("Maarten Balliauw")
48	48	->setTitle("PHPExcel Test Document")
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53
54	54
55	55	// Add some data
56		-echo date('H:i:s') , " Add some data" , EOL;
	56	+echo date('H:i:s'), " Add some data", EOL;
57	57
58	58	$html1 = '<font color="#0000ff">
59	59	<h1 align="center">My very first example of rich text<br />generated from html markup</h1>
		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124
125	125
126	126	// Rename worksheet
127		-echo date('H:i:s') , " Rename worksheet" , EOL;
	127	+echo date('H:i:s'), " Rename worksheet", EOL;
128	128	$objPHPExcel->getActiveSheet()
129	129	->setTitle('Rich Text Examples');
130	130
		@@ -134,7 +134,7 @@ discard block
		block discarded – undo
134	134
135	135
136	136	// Save Excel 2007 file
137		-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
	137	+echo date('H:i:s'), " Write to Excel2007 format", EOL;
138	138	$callStartTime = microtime(true);
139	139
140	140	$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
		@@ -142,14 +142,14 @@ discard block
		block discarded – undo
142	142	$callEndTime = microtime(true);
143	143	$callTime = $callEndTime - $callStartTime;
144	144
145		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
146		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	145	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	146	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
147	147	// Echo memory usage
148		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	148	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
149	149
150	150
151	151	// Save Excel 95 file
152		-echo date('H:i:s') , " Write to Excel5 format" , EOL;
	152	+echo date('H:i:s'), " Write to Excel5 format", EOL;
153	153	$callStartTime = microtime(true);
154	154
155	155	$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5');
		@@ -157,15 +157,15 @@ discard block
		block discarded – undo
157	157	$callEndTime = microtime(true);
158	158	$callTime = $callEndTime - $callStartTime;
159	159
160		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
161		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	160	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	161	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
162	162	// Echo memory usage
163		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	163	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
164	164
165	165
166	166	// Echo memory peak usage
167		-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
	167	+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
168	168
169	169	// Echo done
170		-echo date('H:i:s') , " Done writing files" , EOL;
171		-echo 'Files have been created in ' , getcwd() , EOL;
	170	+echo date('H:i:s'), " Done writing files", EOL;
	171	+echo 'Files have been created in ', getcwd(), EOL;

		@@ -79,10 +79,10 @@
		block discarded – undo
79	79	header('Cache-Control: max-age=1');
80	80
81	81	// If you're serving to IE over SSL, then the following may be needed
82		-header ('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
83		-header ('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified
84		-header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
85		-header ('Pragma: public'); // HTTP/1.0
	82	+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
	83	+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
	84	+header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
	85	+header('Pragma: public'); // HTTP/1.0
86	86
87	87	$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5');
88	88	$objWriter->save('php://output');

		@@ -31,8 +31,9 @@
		block discarded – undo
31	31	ini_set('display_startup_errors', TRUE);
32	32	date_default_timezone_set('Europe/London');
33	33
34		-if (PHP_SAPI == 'cli')
	34	+if (PHP_SAPI == 'cli') {
35	35	die('This example should only be run from a Web Browser');
	36	+}
36	37
37	38	/** Include PHPExcel */
38	39	require_once dirname(__FILE__) . '/../src/Bootstrap.php';

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	date_default_timezone_set('Europe/London');
32	32
33	33	if (PHP_SAPI == 'cli')
34		- die('This example should only be run from a Web Browser');
	34	+ die('This example should only be run from a Web Browser');
35	35
36	36	/** Include PhpSpreadsheet */
37	37	require_once dirname(__FILE__) . '/../src/Bootstrap.php';
		@@ -42,12 +42,12 @@ discard block
		block discarded – undo
42	42
43	43	// Set document properties
44	44	$objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
45		- ->setLastModifiedBy("Maarten Balliauw")
46		- ->setTitle("Office 2007 XLSX Test Document")
47		- ->setSubject("Office 2007 XLSX Test Document")
48		- ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
49		- ->setKeywords("office 2007 openxml php")
50		- ->setCategory("Test result file");
	45	+ ->setLastModifiedBy("Maarten Balliauw")
	46	+ ->setTitle("Office 2007 XLSX Test Document")
	47	+ ->setSubject("Office 2007 XLSX Test Document")
	48	+ ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
	49	+ ->setKeywords("office 2007 openxml php")
	50	+ ->setCategory("Test result file");
51	51
52	52
53	53	// Add some data

		@@ -43,21 +43,21 @@ discard block
		block discarded – undo
43	43	$objPHPExcel = new \PHPExcel\Spreadsheet();
44	44	$objWorksheet = $objPHPExcel->getActiveSheet();
45	45	$objWorksheet->fromArray(
46		- array(
47		- array('', 2010, 2011, 2012),
48		- array('Jan', 47, 45, 71),
49		- array('Feb', 56, 73, 86),
50		- array('Mar', 52, 61, 69),
51		- array('Apr', 40, 52, 60),
52		- array('May', 42, 55, 71),
53		- array('Jun', 58, 63, 76),
54		- array('Jul', 53, 61, 89),
55		- array('Aug', 46, 69, 85),
56		- array('Sep', 62, 75, 81),
57		- array('Oct', 51, 70, 96),
58		- array('Nov', 55, 66, 89),
59		- array('Dec', 68, 62, 0),
60		- )
	46	+ array(
	47	+ array('', 2010, 2011, 2012),
	48	+ array('Jan', 47, 45, 71),
	49	+ array('Feb', 56, 73, 86),
	50	+ array('Mar', 52, 61, 69),
	51	+ array('Apr', 40, 52, 60),
	52	+ array('May', 42, 55, 71),
	53	+ array('Jun', 58, 63, 76),
	54	+ array('Jul', 53, 61, 89),
	55	+ array('Aug', 46, 69, 85),
	56	+ array('Sep', 62, 75, 81),
	57	+ array('Oct', 51, 70, 96),
	58	+ array('Nov', 55, 66, 89),
	59	+ array('Dec', 68, 62, 0),
	60	+ )
61	61	);
62	62
63	63
		@@ -69,8 +69,8 @@ discard block
		block discarded – undo
69	69	// Data values
70	70	// Data Marker
71	71	$dataSeriesLabels = array(
72		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011
73		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012
	72	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011
	73	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012
74	74	);
75	75	// Set the X-Axis Labels
76	76	// Datatype
		@@ -80,8 +80,8 @@ discard block
		block discarded – undo
80	80	// Data values
81	81	// Data Marker
82	82	$xAxisTickValues = array(
83		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
84		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
	83	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
	84	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
85	85	);
86	86	// Set the Data values for each data series we want to plot
87	87	// Datatype
		@@ -91,21 +91,21 @@ discard block
		block discarded – undo
91	91	// Data values
92	92	// Data Marker
93	93	$dataSeriesValues = array(
94		- new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', NULL, 12),
95		- new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', NULL, 12),
	94	+ new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', NULL, 12),
	95	+ new \PHPExcel\Chart\DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', NULL, 12),
96	96	);
97	97
98	98	// Build the dataseries
99	99	$series = new \PHPExcel\Chart\DataSeries(
100		- \PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
101		- NULL, // plotGrouping (Radar charts don't have any grouping)
102		- range(0, count($dataSeriesValues)-1), // plotOrder
103		- $dataSeriesLabels, // plotLabel
104		- $xAxisTickValues, // plotCategory
105		- $dataSeriesValues, // plotValues
	100	+ \PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
	101	+ NULL, // plotGrouping (Radar charts don't have any grouping)
	102	+ range(0, count($dataSeriesValues)-1), // plotOrder
	103	+ $dataSeriesLabels, // plotLabel
	104	+ $xAxisTickValues, // plotCategory
	105	+ $dataSeriesValues, // plotValues
106	106	NULL, // plotDirection
107		- NULL, // smooth line
108		- \PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle
	107	+ NULL, // smooth line
	108	+ \PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle
109	109	);
110	110
111	111	// Set up a layout object for the Pie chart
		@@ -121,14 +121,14 @@ discard block
		block discarded – undo
121	121
122	122	// Create the chart
123	123	$chart = new \PHPExcel\Chart(
124		- 'chart1', // name
125		- $title, // title
126		- $legend, // legend
127		- $plotArea, // plotArea
128		- true, // plotVisibleOnly
129		- 0, // displayBlanksAs
130		- NULL, // xAxisLabel
131		- NULL // yAxisLabel - Radar charts don't have a Y-Axis
	124	+ 'chart1', // name
	125	+ $title, // title
	126	+ $legend, // legend
	127	+ $plotArea, // plotArea
	128	+ true, // plotVisibleOnly
	129	+ 0, // displayBlanksAs
	130	+ NULL, // xAxisLabel
	131	+ NULL // yAxisLabel - Radar charts don't have a Y-Axis
132	132	);
133	133
134	134	// Set the position where the chart should appear in the worksheet

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	ini_set('display_startup_errors', TRUE);
7	7	date_default_timezone_set('Europe/London');
8	8
9		-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
	9	+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
10	10
11	11	date_default_timezone_set('Europe/London');
12	12
		@@ -44,19 +44,19 @@ discard block
		block discarded – undo
44	44	$objWorksheet = $objPHPExcel->getActiveSheet();
45	45	$objWorksheet->fromArray(
46	46	array(
47		- array('', 2010, 2011, 2012),
48		- array('Jan', 47, 45, 71),
49		- array('Feb', 56, 73, 86),
50		- array('Mar', 52, 61, 69),
51		- array('Apr', 40, 52, 60),
52		- array('May', 42, 55, 71),
53		- array('Jun', 58, 63, 76),
54		- array('Jul', 53, 61, 89),
55		- array('Aug', 46, 69, 85),
56		- array('Sep', 62, 75, 81),
57		- array('Oct', 51, 70, 96),
58		- array('Nov', 55, 66, 89),
59		- array('Dec', 68, 62, 0),
	47	+ array('', 2010, 2011, 2012),
	48	+ array('Jan', 47, 45, 71),
	49	+ array('Feb', 56, 73, 86),
	50	+ array('Mar', 52, 61, 69),
	51	+ array('Apr', 40, 52, 60),
	52	+ array('May', 42, 55, 71),
	53	+ array('Jun', 58, 63, 76),
	54	+ array('Jul', 53, 61, 89),
	55	+ array('Aug', 46, 69, 85),
	56	+ array('Sep', 62, 75, 81),
	57	+ array('Oct', 51, 70, 96),
	58	+ array('Nov', 55, 66, 89),
	59	+ array('Dec', 68, 62, 0),
60	60	)
61	61	);
62	62
		@@ -69,8 +69,8 @@ discard block
		block discarded – undo
69	69	// Data values
70	70	// Data Marker
71	71	$dataSeriesLabels = array(
72		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011
73		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012
	72	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$C$1', NULL, 1), // 2011
	73	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$D$1', NULL, 1), // 2012
74	74	);
75	75	// Set the X-Axis Labels
76	76	// Datatype
		@@ -80,8 +80,8 @@ discard block
		block discarded – undo
80	80	// Data values
81	81	// Data Marker
82	82	$xAxisTickValues = array(
83		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
84		- new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
	83	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
	84	+ new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$A$2:$A$13', NULL, 12), // Jan to Dec
85	85	);
86	86	// Set the Data values for each data series we want to plot
87	87	// Datatype
		@@ -97,14 +97,14 @@ discard block
		block discarded – undo
97	97
98	98	// Build the dataseries
99	99	$series = new \PHPExcel\Chart\DataSeries(
100		- \PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
101		- NULL, // plotGrouping (Radar charts don't have any grouping)
102		- range(0, count($dataSeriesValues)-1), // plotOrder
103		- $dataSeriesLabels, // plotLabel
104		- $xAxisTickValues, // plotCategory
105		- $dataSeriesValues, // plotValues
106		- NULL, // plotDirection
107		- NULL, // smooth line
	100	+ \PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
	101	+ NULL, // plotGrouping (Radar charts don't have any grouping)
	102	+ range(0, count($dataSeriesValues) - 1), // plotOrder
	103	+ $dataSeriesLabels, // plotLabel
	104	+ $xAxisTickValues, // plotCategory
	105	+ $dataSeriesValues, // plotValues
	106	+ NULL, // plotDirection
	107	+ NULL, // smooth line
108	108	\PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle
109	109	);
110	110
		@@ -121,13 +121,13 @@ discard block
		block discarded – undo
121	121
122	122	// Create the chart
123	123	$chart = new \PHPExcel\Chart(
124		- 'chart1', // name
125		- $title, // title
126		- $legend, // legend
127		- $plotArea, // plotArea
128		- true, // plotVisibleOnly
129		- 0, // displayBlanksAs
130		- NULL, // xAxisLabel
	124	+ 'chart1', // name
	125	+ $title, // title
	126	+ $legend, // legend
	127	+ $plotArea, // plotArea
	128	+ true, // plotVisibleOnly
	129	+ 0, // displayBlanksAs
	130	+ NULL, // xAxisLabel
131	131	NULL // yAxisLabel - Radar charts don't have a Y-Axis
132	132	);
133	133
		@@ -140,16 +140,16 @@ discard block
		block discarded – undo
140	140
141	141
142	142	// Save Excel 2007 file
143		-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
	143	+echo date('H:i:s'), " Write to Excel2007 format", EOL;
144	144	$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
145	145	$objWriter->setIncludeCharts(TRUE);
146	146	$objWriter->save(str_replace('.php', '.xlsx', __FILE__));
147		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
	147	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
148	148
149	149
150	150	// Echo memory peak usage
151		-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
	151	+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
152	152
153	153	// Echo done
154		-echo date('H:i:s') , " Done writing file" , EOL;
155		-echo 'File has been created in ' , getcwd() , EOL;
	154	+echo date('H:i:s'), " Done writing file", EOL;
	155	+echo 'File has been created in ', getcwd(), EOL;

		@@ -13,8 +13,8 @@
		block discarded – undo
13	13	->disableOriginalConstructor()
14	14	->getMock();
15	15	$this->mockWorksheet->expects($this->any())
16		- ->method('getHighestRow')
17		- ->will($this->returnValue(5));
	16	+ ->method('getHighestRow')
	17	+ ->will($this->returnValue(5));
18	18	}
19	19
20	20

		@@ -18,11 +18,11 @@
		block discarded – undo
18	18	->getMock();
19	19
20	20	$this->mockWorksheet->expects($this->any())
21		- ->method('getHighestColumn')
22		- ->will($this->returnValue('E'));
	21	+ ->method('getHighestColumn')
	22	+ ->will($this->returnValue('E'));
23	23	$this->mockWorksheet->expects($this->any())
24		- ->method('current')
25		- ->will($this->returnValue($this->mockColumn));
	24	+ ->method('current')
	25	+ ->will($this->returnValue($this->mockColumn));
26	26	}
27	27
28	28

PHPOffice / PhpSpreadsheet

Push — develop ( e0a9f9...ba7054 )

Status

Category

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +37 added lines, -37 removed lines patch added patch discarded remove patch

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch