PHPOffice / PhpSpreadsheet

Documentation/Examples/Reader/exampleReader03.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 //	$inputFileType = 'Gnumeric';

 $inputFileName = './sampleData/example1.xls';

 

-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' using IOFactory with a defined reader type of ',$inputFileType,'<br />';

+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' using IOFactory with a defined reader type of ', $inputFileType, '<br />';

 $objReader = PHPExcel_IOFactory::createReader($inputFileType);

 echo 'Turning Formatting off for Load<br />';

 $objReader->setReadDataOnly(true);

@@ -42,7 +42,7 @@ 
 

 echo '<hr />';

 

-$sheetData = $objPHPExcel->getActiveSheet()->toArray(null,true,true,true);

+$sheetData = $objPHPExcel->getActiveSheet()->toArray(null, true, true, true);

 var_dump($sheetData);

 

 

Documentation/Examples/Calculations/Database/DPRODUCT.php

Spacing +17 added lines, -17 removed lines

@@ -32,21 +32,21 @@ 
 $worksheet = $objPHPExcel->getActiveSheet();

 

 // Add some data

-$database = array( array( 'Tree',  'Height', 'Age', 'Yield', 'Profit' ),

-                   array( 'Apple',  18,       20,    14,      105.00  ),

-                   array( 'Pear',   12,       12,    10,       96.00  ),

-                   array( 'Cherry', 13,       14,     9,      105.00  ),

-                   array( 'Apple',  14,       15,    10,       75.00  ),

-                   array( 'Pear',    9,        8,     8,       76.80  ),

-                   array( 'Apple',   8,        9,     6,       45.00  ),

+$database = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit'),

+                   array('Apple', 18, 20, 14, 105.00),

+                   array('Pear', 12, 12, 10, 96.00),

+                   array('Cherry', 13, 14, 9, 105.00),

+                   array('Apple', 14, 15, 10, 75.00),

+                   array('Pear', 9, 8, 8, 76.80),

+                   array('Apple', 8, 9, 6, 45.00),

                  );

-$criteria = array( array( 'Tree',      'Height', 'Age', 'Yield', 'Profit', 'Height' ),

-                   array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

-                   array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

+$criteria = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'),

+                   array('="=Apple"', '>10', NULL, NULL, NULL, '<16'),

+                   array('="=Pear"', NULL, NULL, NULL, NULL, NULL)

                  );

 

-$worksheet->fromArray( $criteria, NULL, 'A1' );

-$worksheet->fromArray( $database, NULL, 'A4' );

+$worksheet->fromArray($criteria, NULL, 'A1');

+$worksheet->fromArray($database, NULL, 'A4');

 

 $worksheet->setCellValue('A12', 'The height of the Apple tree between 10\' and 16\' tall');

 $worksheet->setCellValue('B12', '=DGET(A4:E10,"Height",A1:F2)');

@@ -57,7 +57,7 @@ 
 

 echo '<h4>Database</h4>';

 

-$databaseData = $worksheet->rangeToArray('A4:E10',null,true,true,true);

+$databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);

 var_dump($databaseData);

 

 

@@ -69,15 +69,15 @@ 
 

 echo 'ALL' . '<br /><br />';

 

-echo $worksheet->getCell("A12")->getValue() .'<br />';

-echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';

+echo $worksheet->getCell("A12")->getValue() . '<br />';

+echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() . '<br /><br />';

 

 echo '<h4>Criteria</h4>';

 

-$criteriaData = $worksheet->rangeToArray('A1:A2',null,true,true,true);

+$criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);

 var_dump($criteriaData);

 

-echo $worksheet->getCell("A13")->getValue() .'<br />';

+echo $worksheet->getCell("A13")->getValue() . '<br />';

 echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();

 

 

Documentation/Examples/Calculations/Database/DMAX.php

Spacing +17 added lines, -17 removed lines

@@ -32,21 +32,21 @@ 
 $worksheet = $objPHPExcel->getActiveSheet();

 

 // Add some data

-$database = array( array( 'Tree',  'Height', 'Age', 'Yield', 'Profit' ),

-                   array( 'Apple',  18,       20,    14,      105.00  ),

-                   array( 'Pear',   12,       12,    10,       96.00  ),

-                   array( 'Cherry', 13,       14,     9,      105.00  ),

-                   array( 'Apple',  14,       15,    10,       75.00  ),

-                   array( 'Pear',    9,        8,     8,       76.80  ),

-                   array( 'Apple',   8,        9,     6,       45.00  ),

+$database = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit'),

+                   array('Apple', 18, 20, 14, 105.00),

+                   array('Pear', 12, 12, 10, 96.00),

+                   array('Cherry', 13, 14, 9, 105.00),

+                   array('Apple', 14, 15, 10, 75.00),

+                   array('Pear', 9, 8, 8, 76.80),

+                   array('Apple', 8, 9, 6, 45.00),

                  );

-$criteria = array( array( 'Tree',      'Height', 'Age', 'Yield', 'Profit', 'Height' ),

-                   array( '="=Apple"', '>10',    NULL,  NULL,    NULL,     '<16'    ),

-                   array( '="=Pear"',  NULL,     NULL,  NULL,    NULL,     NULL     )

+$criteria = array(array('Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'),

+                   array('="=Apple"', '>10', NULL, NULL, NULL, '<16'),

+                   array('="=Pear"', NULL, NULL, NULL, NULL, NULL)

                  );

 

-$worksheet->fromArray( $criteria, NULL, 'A1' );

-$worksheet->fromArray( $database, NULL, 'A4' );

+$worksheet->fromArray($criteria, NULL, 'A1');

+$worksheet->fromArray($database, NULL, 'A4');

 

 $worksheet->setCellValue('A12', 'The height of the Apple tree between 10\' and 16\' tall');

 $worksheet->setCellValue('B12', '=DGET(A4:E10,"Height",A1:F2)');

@@ -57,7 +57,7 @@ 
 

 echo '<h4>Database</h4>';

 

-$databaseData = $worksheet->rangeToArray('A4:E10',null,true,true,true);

+$databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);

 var_dump($databaseData);

 

 

@@ -69,15 +69,15 @@ 
 

 echo 'ALL' . '<br /><br />';

 

-echo $worksheet->getCell("A12")->getValue() .'<br />';

-echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() .'<br /><br />';

+echo $worksheet->getCell("A12")->getValue() . '<br />';

+echo 'DMAX() Result is ' . $worksheet->getCell("B12")->getCalculatedValue() . '<br /><br />';

 

 echo '<h4>Criteria</h4>';

 

-$criteriaData = $worksheet->rangeToArray('A1:A2',null,true,true,true);

+$criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);

 var_dump($criteriaData);

 

-echo $worksheet->getCell("A13")->getValue() .'<br />';

+echo $worksheet->getCell("A13")->getValue() . '<br />';

 echo 'DMAX() Result is ' . $worksheet->getCell("B13")->getCalculatedValue();

 

 

src/PhpSpreadsheet/Calculation/Engineering.php

Spacing +40 added lines, -40 removed lines

@@ -747,7 +747,7 @@ 
      */
     public static function parseComplex($complexNumber)
     {
-        $workString = (string)$complexNumber;
+        $workString = (string) $complexNumber;
 
         $realNumber = $imaginary = 0;
         //    Extract the suffix, if there is one
@@ -828,7 +828,7 @@ 
     {
         if (!is_null($places)) {
             if (is_numeric($places)) {
-                $places = (int)$places;
+                $places = (int) $places;
             } else {
                 return Functions::VALUE();
             }
@@ -1153,7 +1153,7 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
@@ -1161,7 +1161,7 @@ 
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             $x = floor($x);
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
             return Functions::NAN();
         }
@@ -1208,7 +1208,7 @@ 
         // Argument X
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
@@ -1216,7 +1216,7 @@ 
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             $x = floor($x);
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
             return Functions::NAN();
         }
@@ -1226,7 +1226,7 @@ 
             //    Two's Complement
             return str_repeat('F', 8) . substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
         }
-        $hexVal = (string)strtoupper(dechex(bindec($x)));
+        $hexVal = (string) strtoupper(dechex(bindec($x)));
 
         return self::nbrConversionFormat($hexVal, $places);
     }
@@ -1263,7 +1263,7 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
@@ -1271,7 +1271,7 @@ 
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             $x = floor($x);
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
             return Functions::NAN();
         }
@@ -1281,7 +1281,7 @@ 
             //    Two's Complement
             return str_repeat('7', 7) . substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
         }
-        $octVal = (string)decoct(bindec($x));
+        $octVal = (string) decoct(bindec($x));
 
         return self::nbrConversionFormat($octVal, $places);
     }
@@ -1322,17 +1322,17 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
             return Functions::VALUE();
         }
 
-        $x = (string)floor($x);
+        $x = (string) floor($x);
         if ($x < -512 || $x > 511) {
             return Functions::NAN();
         }
@@ -1383,16 +1383,16 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
             return Functions::VALUE();
         }
-        $x = (string)floor($x);
+        $x = (string) floor($x);
         $r = strtoupper(dechex($x));
         if (strlen($r) == 8) {
             //    Two's Complement
@@ -1439,16 +1439,16 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
             return Functions::VALUE();
         }
-        $x = (string)floor($x);
+        $x = (string) floor($x);
         $r = decoct($x);
         if (strlen($r) == 11) {
             //    Two's Complement
@@ -1495,7 +1495,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
             return Functions::NAN();
         }
@@ -1530,12 +1530,12 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
             return Functions::NAN();
         }
 
-        if (strlen($x)> 10) {
+        if (strlen($x) > 10) {
             return Functions::NAN();
         }
 
@@ -1593,7 +1593,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
             return Functions::NAN();
         }
@@ -1648,7 +1648,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
             return Functions::NAN();
         }
@@ -1683,13 +1683,13 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
             return Functions::NAN();
         }
         $binX = '';
         foreach (str_split($x) as $char) {
-            $binX .= str_pad(decbin((int)$char), 3, '0', STR_PAD_LEFT);
+            $binX .= str_pad(decbin((int) $char), 3, '0', STR_PAD_LEFT);
         }
         if (strlen($binX) == 30 && $binX[0] == '1') {
             for ($i = 0; $i < 30; $i++) {
@@ -1737,7 +1737,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
             return Functions::NAN();
         }
@@ -1772,32 +1772,32 @@ 
         if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
             (($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))
         ) {
-            $realNumber = (float)$realNumber;
-            $imaginary = (float)$imaginary;
+            $realNumber = (float) $realNumber;
+            $imaginary = (float) $imaginary;
 
             if ($suffix == '') {
                 $suffix = 'i';
             }
             if ($realNumber == 0.0) {
                 if ($imaginary == 0.0) {
-                    return (string)'0';
+                    return (string) '0';
                 } elseif ($imaginary == 1.0) {
-                    return (string)$suffix;
+                    return (string) $suffix;
                 } elseif ($imaginary == -1.0) {
-                    return (string)'-' . $suffix;
+                    return (string) '-' . $suffix;
                 }
-                return (string)$imaginary . $suffix;
+                return (string) $imaginary . $suffix;
             } elseif ($imaginary == 0.0) {
-                return (string)$realNumber;
+                return (string) $realNumber;
             } elseif ($imaginary == 1.0) {
-                return (string)$realNumber . '+' . $suffix;
+                return (string) $realNumber . '+' . $suffix;
             } elseif ($imaginary == -1.0) {
-                return (string)$realNumber . '-' . $suffix;
+                return (string) $realNumber . '-' . $suffix;
             }
             if ($imaginary > 0) {
-                $imaginary = (string)'+' . $imaginary;
+                $imaginary = (string) '+' . $imaginary;
             }
-            return (string)$realNumber . $imaginary . $suffix;
+            return (string) $realNumber . $imaginary . $suffix;
         }
 
         return Functions::VALUE();
@@ -2362,7 +2362,7 @@ 
         $a = Functions::flattenSingleValue($a);
         $b = Functions::flattenSingleValue($b);
 
-        return (int)($a == $b);
+        return (int) ($a == $b);
     }
 
 
@@ -2386,7 +2386,7 @@ 
         $number = Functions::flattenSingleValue($number);
         $step = Functions::flattenSingleValue($step);
 
-        return (int)($number >= $step);
+        return (int) ($number >= $step);
     }
 
 

src/PhpSpreadsheet/Writer/PDF/TcPDF.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $fileHandle = parent::prepareForSave($pFilename);
 
         //  Default PDF paper size
-        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
+        $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
 
         //  Check for paper size and page orientation
         if (is_null($this->getSheetIndex())) {

src/PhpSpreadsheet/Writer/PDF/MPDF.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $fileHandle = parent::prepareForSave($pFilename);
 
         //  Default PDF paper size
-        $paperSize = 'LETTER';    //    Letter    (8.5 in. by 11 in.)
+        $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
 
         //  Check for paper size and page orientation
         if (is_null($this->getSheetIndex())) {

Examples/07readerPCLZip.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,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');
 
@@ -41,19 +41,19 @@ 
 	exit("Please run 05featuredemo.php first." . EOL);
 }
 
-echo date('H:i:s') , " Load from Excel2007 file" , EOL;
+echo date('H:i:s'), " Load from Excel2007 file", EOL;
 $callStartTime = microtime(true);
 
 $objPHPExcel = \PHPExcel\IOFactory::load("05featuredemo.xlsx");
 
 $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') , " Write to Excel2007 format" , EOL;
+echo date('H:i:s'), " Write to Excel2007 format", EOL;
 $callStartTime = microtime(true);
 
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
@@ -62,15 +62,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;

Examples/33chartcreate-scatter.php

Spacing +30 added lines, -30 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),
 	)
 );
 
@@ -60,13 +60,13 @@ 
 //		Data values
 //		Data Marker
 $dataSeriesLabels = array(
-	new \PHPExcel\Chart\DataSeriesValues('String', 'Worksheet!$B$1', NULL, 1),	//	2010
-	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!$B$1', NULL, 1), //	2010
+	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
 $xAxisTickValues = 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
@@ -83,14 +83,14 @@ 
 
 //	Build the dataseries
 $series = new \PHPExcel\Chart\DataSeries(
-	\PHPExcel\Chart\DataSeries::TYPE_SCATTERCHART,	// plotType
-	NULL,											// plotGrouping (Scatter 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_SCATTERCHART, // plotType
+	NULL, // plotGrouping (Scatter 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_LINEMARKER		// plotStyle
 );
 
@@ -105,13 +105,13 @@ 
 
 //	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
 	$yAxisLabel		// yAxisLabel
 );
 
@@ -124,16 +124,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;

Examples/22heavilyformatted.php

Spacing +15 added lines, -15 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');
 
@@ -40,11 +40,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")
@@ -55,7 +55,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);
 
 $sharedStyle1 = new \PHPExcel\Style();
@@ -87,7 +87,7 @@ 
 $objPHPExcel->getActiveSheet()->duplicateStyle($sharedStyle2, "C5:R95");
 
 // 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,14 +95,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');
@@ -110,15 +110,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;