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

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

@@ -30,18 +30,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 PhpSpreadsheet */
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';
 
 
 // Create new Spreadsheet object
-echo date('H:i:s') , " Create new Spreadsheet object" , EOL;
+echo date('H:i:s'), " Create new Spreadsheet object", EOL;
 $objPhpSpreadsheet = new \PhpSpreadsheet\Spreadsheet();
 
 // Set document properties
-echo date('H:i:s') , " Set document properties" , EOL;
+echo date('H:i:s'), " Set document properties", EOL;
 $objPhpSpreadsheet->getProperties()
     ->setCreator("Maarten Balliauw")
 	->setLastModifiedBy("Maarten Balliauw")
@@ -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;
 $objPhpSpreadsheet->setActiveSheetIndex(0)
     ->setCellValue('A1', 'Hello')
     ->setCellValue('B2', 'world!')
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 
 
 $objPhpSpreadsheet->getActiveSheet()
-    ->setCellValue('A8',"Hello\nWorld");
+    ->setCellValue('A8', "Hello\nWorld");
 $objPhpSpreadsheet->getActiveSheet()
     ->getRowDimension(8)
     ->setRowHeight(-1);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPhpSpreadsheet->getActiveSheet()
     ->setTitle('Simple');
 
@@ -103,7 +103,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 = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel2007');
@@ -111,14 +111,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 = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel5');
@@ -126,15 +126,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.

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

@@ -43,12 +43,12 @@
 block discarded – undo
 // Set document properties
 echo date('H:i:s') , " Set document properties" , EOL;
 $objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
-	->setLastModifiedBy("Maarten Balliauw")
-	->setTitle("PhpSpreadsheet Test Document")
-	->setSubject("PhpSpreadsheet Test Document")
-	->setDescription("Test document for PhpSpreadsheet, generated using PHP classes.")
-	->setKeywords("office PhpSpreadsheet php")
-	->setCategory("Test result file");
+    ->setLastModifiedBy("Maarten Balliauw")
+    ->setTitle("PhpSpreadsheet Test Document")
+    ->setSubject("PhpSpreadsheet Test Document")
+    ->setDescription("Test document for PhpSpreadsheet, generated using PHP classes.")
+    ->setKeywords("office PhpSpreadsheet php")
+    ->setCategory("Test result file");
 
 
 // Add some data

Please login to merge, or discard this patch.

Examples/01simplePCLZip.php 2 patches

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

@@ -43,12 +43,12 @@
 block discarded – undo
 // Set document properties
 echo date('H:i:s') , " Set document properties" , EOL;
 $objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
-	->setLastModifiedBy("Maarten Balliauw")
-	->setTitle("PhpSpreadsheet Test Document")
-	->setSubject("PhpSpreadsheet Test Document")
-	->setDescription("Test document for PhpSpreadsheet, generated using PHP classes.")
-	->setKeywords("office PhpSpreadsheet php")
-	->setCategory("Test result file");
+    ->setLastModifiedBy("Maarten Balliauw")
+    ->setTitle("PhpSpreadsheet Test Document")
+    ->setSubject("PhpSpreadsheet Test Document")
+    ->setDescription("Test document for PhpSpreadsheet, generated using PHP classes.")
+    ->setKeywords("office PhpSpreadsheet php")
+    ->setCategory("Test result file");
 
 
 // Add some data

Please login to merge, or discard this patch.

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

@@ -30,18 +30,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 PhpSpreadsheet */
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';
 
 
 // Create new PhpSpreadsheet object
-echo date('H:i:s') , " Create new PhpSpreadsheet object" , EOL;
+echo date('H:i:s'), " Create new PhpSpreadsheet object", EOL;
 $objPhpSpreadsheet = new \PhpSpreadsheet\Spreadsheet();
 
 // Set document properties
-echo date('H:i:s') , " Set document properties" , EOL;
+echo date('H:i:s'), " Set document properties", EOL;
 $objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
 	->setLastModifiedBy("Maarten Balliauw")
 	->setTitle("PhpSpreadsheet Test Document")
@@ -52,7 +52,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;
 $objPhpSpreadsheet->setActiveSheetIndex(0)
     ->setCellValue('A1', 'Hello')
     ->setCellValue('B2', 'world!')
@@ -65,13 +65,13 @@  discard block
 block discarded – undo
     ->setCellValue('A5', 'éàèùâêîôûëïüÿäöüç');
 
 
-$objPhpSpreadsheet->getActiveSheet()->setCellValue('A8',"Hello\nWorld");
+$objPhpSpreadsheet->getActiveSheet()->setCellValue('A8', "Hello\nWorld");
 $objPhpSpreadsheet->getActiveSheet()->getRowDimension(8)->setRowHeight(-1);
 $objPhpSpreadsheet->getActiveSheet()->getStyle('A8')->getAlignment()->setWrapText(true);
 
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPhpSpreadsheet->getActiveSheet()->setTitle('Simple');
 
 
@@ -80,7 +80,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);
 
 // Use PCLZip rather than ZipArchive to create the Excel2007 OfficeOpenXML file
@@ -91,15 +91,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 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/04printing.php 2 patches

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

@@ -46,18 +46,18 @@
 block discarded – undo
 echo date('H:i:s') , " Set document properties" , EOL;
 $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");
+    ->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, we will use printing features
 echo date('H:i:s') , " Add some data" , EOL;
 for ($i = 1; $i < 200; $i++) {
-	$objPhpSpreadsheet->getActiveSheet()->setCellValue('A' . $i, $i);
-	$objPhpSpreadsheet->getActiveSheet()->setCellValue('B' . $i, 'Test value');
+    $objPhpSpreadsheet->getActiveSheet()->setCellValue('A' . $i, $i);
+    $objPhpSpreadsheet->getActiveSheet()->setCellValue('B' . $i, 'Test value');
 }
 
 // Set header and footer. When no different headers for odd/even are used, odd header is assumed.

Please login to merge, or discard this patch.

Spacing +19 added lines, -19 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,11 +39,11 @@  discard block
 block discarded – undo
 
 
 // Create new PhpSpreadsheet object
-echo date('H:i:s') , " Create new PhpSpreadsheet object" , EOL;
+echo date('H:i:s'), " Create new PhpSpreadsheet object", EOL;
 $objPhpSpreadsheet = new \PhpSpreadsheet\Spreadsheet();
 
 // Set document properties
-echo date('H:i:s') , " Set document properties" , EOL;
+echo date('H:i:s'), " Set document properties", EOL;
 $objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
     ->setLastModifiedBy("Maarten Balliauw")
 	->setTitle("Office 2007 XLSX Test Document")
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
 
 
 // Add some data, we will use printing features
-echo date('H:i:s') , " Add some data" , EOL;
+echo date('H:i:s'), " Add some data", EOL;
 for ($i = 1; $i < 200; $i++) {
 	$objPhpSpreadsheet->getActiveSheet()->setCellValue('A' . $i, $i);
 	$objPhpSpreadsheet->getActiveSheet()->setCellValue('B' . $i, 'Test value');
 }
 
 // Set header and footer. When no different headers for odd/even are used, odd header is assumed.
-echo date('H:i:s') , " Set header/footer" , EOL;
+echo date('H:i:s'), " Set header/footer", EOL;
 $objPhpSpreadsheet->getActiveSheet()
     ->getHeaderFooter()
     ->setOddHeader('&L&G&C&HPlease treat this document as confidential!');
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
     ->setOddFooter('&L&B' . $objPhpSpreadsheet->getProperties()->getTitle() . '&RPage &P of &N');
 
 // Add a drawing to the header
-echo date('H:i:s') , " Add a drawing to the header" , EOL;
+echo date('H:i:s'), " Add a drawing to the header", EOL;
 $objDrawing = new \PhpSpreadsheet\Worksheet\HeaderFooterDrawing();
 $objDrawing->setName('PhpSpreadsheet logo');
 $objDrawing->setPath('./images/PhpSpreadsheet_logo.gif');
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
     ->addImage($objDrawing, \PhpSpreadsheet\Worksheet\HeaderFooter::IMAGE_HEADER_LEFT);
 
 // Set page orientation and size
-echo date('H:i:s') , " Set page orientation and size" , EOL;
+echo date('H:i:s'), " Set page orientation and size", EOL;
 $objPhpSpreadsheet->getActiveSheet()
     ->getPageSetup()
     ->setOrientation(\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
     ->setPaperSize(\PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4);
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPhpSpreadsheet->getActiveSheet()->setTitle('Printing');
 
 
@@ -98,7 +98,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 = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel2007');
@@ -106,14 +106,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 = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel5');
@@ -121,15 +121,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.

src/PhpSpreadsheet/Helper/HTML.php 1 patch

Doc Comments +4 added lines patch added patch discarded remove patch

@@ -802,6 +802,10 @@
 block discarded – undo
         $this->buildTextRun();
     }
 
+    /**
+     * @param DOMElement $element
+     * @param string $callbackTag
+     */
     protected function handleCallback($element, $callbackTag, $callbacks)
     {
         if (isset($callbacks[$callbackTag])) {

Please login to merge, or discard this patch.

src/PhpSpreadsheet/Reader/HTML.php 1 patch

Doc Comments +6 added lines patch added patch discarded remove patch

@@ -222,6 +222,12 @@
 block discarded – undo
         $cellContent = (string) '';
     }
 
+    /**
+     * @param \PhpSpreadsheet\Worksheet $sheet
+     * @param integer $row
+     * @param string $column
+     * @param string $cellContent
+     */
     protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
     {
         foreach ($element->childNodes as $child) {

Please login to merge, or discard this patch.

		@@ -30,18 +30,18 @@ discard block
		block discarded – undo
30	30	ini_set('display_startup_errors', TRUE);
31	31	date_default_timezone_set('Europe/London');
32	32
33		-define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
	33	+define('EOL', (PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
34	34
35	35	/** Include PhpSpreadsheet */
36	36	require_once dirname(__FILE__) . '/../src/Bootstrap.php';
37	37
38	38
39	39	// Create new Spreadsheet object
40		-echo date('H:i:s') , " Create new Spreadsheet object" , EOL;
	40	+echo date('H:i:s'), " Create new Spreadsheet object", EOL;
41	41	$objPhpSpreadsheet = new \PhpSpreadsheet\Spreadsheet();
42	42
43	43	// Set document properties
44		-echo date('H:i:s') , " Set document properties" , EOL;
	44	+echo date('H:i:s'), " Set document properties", EOL;
45	45	$objPhpSpreadsheet->getProperties()
46	46	->setCreator("Maarten Balliauw")
47	47	->setLastModifiedBy("Maarten Balliauw")
		@@ -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	$objPhpSpreadsheet->setActiveSheetIndex(0)
58	58	->setCellValue('A1', 'Hello')
59	59	->setCellValue('B2', 'world!')
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67
68	68
69	69	$objPhpSpreadsheet->getActiveSheet()
70		- ->setCellValue('A8',"Hello\nWorld");
	70	+ ->setCellValue('A8', "Hello\nWorld");
71	71	$objPhpSpreadsheet->getActiveSheet()
72	72	->getRowDimension(8)
73	73	->setRowHeight(-1);
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93
94	94
95	95	// Rename worksheet
96		-echo date('H:i:s') , " Rename worksheet" , EOL;
	96	+echo date('H:i:s'), " Rename worksheet", EOL;
97	97	$objPhpSpreadsheet->getActiveSheet()
98	98	->setTitle('Simple');
99	99
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103
104	104
105	105	// Save Excel 2007 file
106		-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
	106	+echo date('H:i:s'), " Write to Excel2007 format", EOL;
107	107	$callStartTime = microtime(true);
108	108
109	109	$objWriter = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel2007');
		@@ -111,14 +111,14 @@ discard block
		block discarded – undo
111	111	$callEndTime = microtime(true);
112	112	$callTime = $callEndTime - $callStartTime;
113	113
114		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
115		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	114	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	115	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
116	116	// Echo memory usage
117		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	117	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
118	118
119	119
120	120	// Save Excel 95 file
121		-echo date('H:i:s') , " Write to Excel5 format" , EOL;
	121	+echo date('H:i:s'), " Write to Excel5 format", EOL;
122	122	$callStartTime = microtime(true);
123	123
124	124	$objWriter = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel5');
		@@ -126,15 +126,15 @@ discard block
		block discarded – undo
126	126	$callEndTime = microtime(true);
127	127	$callTime = $callEndTime - $callStartTime;
128	128
129		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
130		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	129	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	130	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
131	131	// Echo memory usage
132		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	132	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
133	133
134	134
135	135	// Echo memory peak usage
136		-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
	136	+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
137	137
138	138	// Echo done
139		-echo date('H:i:s') , " Done writing files" , EOL;
140		-echo 'Files have been created in ' , getcwd() , EOL;
	139	+echo date('H:i:s'), " Done writing files", EOL;
	140	+echo 'Files have been created in ', getcwd(), EOL;

		@@ -802,6 +802,10 @@
		block discarded – undo
802	802	$this->buildTextRun();
803	803	}
804	804
	805	+ /**
	806	+ * @param DOMElement $element
	807	+ * @param string $callbackTag
	808	+ */
805	809	protected function handleCallback($element, $callbackTag, $callbacks)
806	810	{
807	811	if (isset($callbacks[$callbackTag])) {

		@@ -222,6 +222,12 @@
		block discarded – undo
222	222	$cellContent = (string) '';
223	223	}
224	224
	225	+ /**
	226	+ * @param \PhpSpreadsheet\Worksheet $sheet
	227	+ * @param integer $row
	228	+ * @param string $column
	229	+ * @param string $cellContent
	230	+ */
225	231	protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
226	232	{
227	233	foreach ($element->childNodes as $child) {

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

		@@ -46,18 +46,18 @@
		block discarded – undo
46	46	echo date('H:i:s') , " Set document properties" , EOL;
47	47	$objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
48	48	->setLastModifiedBy("Maarten Balliauw")
49		- ->setTitle("Office 2007 XLSX Test Document")
50		- ->setSubject("Office 2007 XLSX Test Document")
51		- ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
52		- ->setKeywords("office 2007 openxml php")
53		- ->setCategory("Test result file");
	49	+ ->setTitle("Office 2007 XLSX Test Document")
	50	+ ->setSubject("Office 2007 XLSX Test Document")
	51	+ ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
	52	+ ->setKeywords("office 2007 openxml php")
	53	+ ->setCategory("Test result file");
54	54
55	55
56	56	// Add some data, we will use printing features
57	57	echo date('H:i:s') , " Add some data" , EOL;
58	58	for ($i = 1; $i < 200; $i++) {
59		- $objPhpSpreadsheet->getActiveSheet()->setCellValue('A' . $i, $i);
60		- $objPhpSpreadsheet->getActiveSheet()->setCellValue('B' . $i, 'Test value');
	59	+ $objPhpSpreadsheet->getActiveSheet()->setCellValue('A' . $i, $i);
	60	+ $objPhpSpreadsheet->getActiveSheet()->setCellValue('B' . $i, 'Test value');
61	61	}
62	62
63	63	// Set header and footer. When no different headers for odd/even are used, odd header is assumed.

		@@ -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,11 +39,11 @@ discard block
		block discarded – undo
39	39
40	40
41	41	// Create new PhpSpreadsheet object
42		-echo date('H:i:s') , " Create new PhpSpreadsheet object" , EOL;
	42	+echo date('H:i:s'), " Create new PhpSpreadsheet object", EOL;
43	43	$objPhpSpreadsheet = new \PhpSpreadsheet\Spreadsheet();
44	44
45	45	// Set document properties
46		-echo date('H:i:s') , " Set document properties" , EOL;
	46	+echo date('H:i:s'), " Set document properties", EOL;
47	47	$objPhpSpreadsheet->getProperties()->setCreator("Maarten Balliauw")
48	48	->setLastModifiedBy("Maarten Balliauw")
49	49	->setTitle("Office 2007 XLSX Test Document")
		@@ -54,14 +54,14 @@ discard block
		block discarded – undo
54	54
55	55
56	56	// Add some data, we will use printing features
57		-echo date('H:i:s') , " Add some data" , EOL;
	57	+echo date('H:i:s'), " Add some data", EOL;
58	58	for ($i = 1; $i < 200; $i++) {
59	59	$objPhpSpreadsheet->getActiveSheet()->setCellValue('A' . $i, $i);
60	60	$objPhpSpreadsheet->getActiveSheet()->setCellValue('B' . $i, 'Test value');
61	61	}
62	62
63	63	// Set header and footer. When no different headers for odd/even are used, odd header is assumed.
64		-echo date('H:i:s') , " Set header/footer" , EOL;
	64	+echo date('H:i:s'), " Set header/footer", EOL;
65	65	$objPhpSpreadsheet->getActiveSheet()
66	66	->getHeaderFooter()
67	67	->setOddHeader('&L&G&C&HPlease treat this document as confidential!');
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	->setOddFooter('&L&B' . $objPhpSpreadsheet->getProperties()->getTitle() . '&RPage &P of &N');
71	71
72	72	// Add a drawing to the header
73		-echo date('H:i:s') , " Add a drawing to the header" , EOL;
	73	+echo date('H:i:s'), " Add a drawing to the header", EOL;
74	74	$objDrawing = new \PhpSpreadsheet\Worksheet\HeaderFooterDrawing();
75	75	$objDrawing->setName('PhpSpreadsheet logo');
76	76	$objDrawing->setPath('./images/PhpSpreadsheet_logo.gif');
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	->addImage($objDrawing, \PhpSpreadsheet\Worksheet\HeaderFooter::IMAGE_HEADER_LEFT);
81	81
82	82	// Set page orientation and size
83		-echo date('H:i:s') , " Set page orientation and size" , EOL;
	83	+echo date('H:i:s'), " Set page orientation and size", EOL;
84	84	$objPhpSpreadsheet->getActiveSheet()
85	85	->getPageSetup()
86	86	->setOrientation(\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE);
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	->setPaperSize(\PhpSpreadsheet\Worksheet\PageSetup::PAPERSIZE_A4);
90	90
91	91	// Rename worksheet
92		-echo date('H:i:s') , " Rename worksheet" , EOL;
	92	+echo date('H:i:s'), " Rename worksheet", EOL;
93	93	$objPhpSpreadsheet->getActiveSheet()->setTitle('Printing');
94	94
95	95
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98
99	99
100	100	// Save Excel 2007 file
101		-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
	101	+echo date('H:i:s'), " Write to Excel2007 format", EOL;
102	102	$callStartTime = microtime(true);
103	103
104	104	$objWriter = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel2007');
		@@ -106,14 +106,14 @@ discard block
		block discarded – undo
106	106	$callEndTime = microtime(true);
107	107	$callTime = $callEndTime - $callStartTime;
108	108
109		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
110		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	109	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	110	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
111	111	// Echo memory usage
112		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	112	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
113	113
114	114
115	115	// Save Excel 95 file
116		-echo date('H:i:s') , " Write to Excel5 format" , EOL;
	116	+echo date('H:i:s'), " Write to Excel5 format", EOL;
117	117	$callStartTime = microtime(true);
118	118
119	119	$objWriter = \PhpSpreadsheet\IOFactory::createWriter($objPhpSpreadsheet, 'Excel5');
		@@ -121,15 +121,15 @@ discard block
		block discarded – undo
121	121	$callEndTime = microtime(true);
122	122	$callTime = $callEndTime - $callStartTime;
123	123
124		-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
125		-echo 'Call time to write Workbook was ' , sprintf('%.4f',$callTime) , " seconds" , EOL;
	124	+echo date('H:i:s'), " File written to ", str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
	125	+echo 'Call time to write Workbook was ', sprintf('%.4f', $callTime), " seconds", EOL;
126	126	// Echo memory usage
127		-echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 / 1024) , " MB" , EOL;
	127	+echo date('H:i:s'), ' Current memory usage: ', (memory_get_usage(true) / 1024 / 1024), " MB", EOL;
128	128
129	129
130	130	// Echo memory peak usage
131		-echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
	131	+echo date('H:i:s'), " Peak memory usage: ", (memory_get_peak_usage(true) / 1024 / 1024), " MB", EOL;
132	132
133	133	// Echo done
134		-echo date('H:i:s') , " Done writing files" , EOL;
135		-echo 'Files have been created in ' , getcwd() , EOL;
	134	+echo date('H:i:s'), " Done writing files", EOL;
	135	+echo 'Files have been created in ', getcwd(), EOL;

PHPOffice / PhpSpreadsheet

Push — develop ( e0a9f9...ba7054 )

Status

Category

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

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

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

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

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

Doc Comments +4 added lines patch added patch discarded remove patch

Doc Comments +6 added lines patch added patch discarded remove patch