PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Writer/PDF/Core.php

Spacing +65 added lines, -65 removed lines

@@ -72,135 +72,135 @@
      */
     protected static $paperSizes = array(
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER
-            => 'LETTER',                 //    (8.5 in. by 11 in.)
+            => 'LETTER', //    (8.5 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER_SMALL
-            => 'LETTER',                 //    (8.5 in. by 11 in.)
+            => 'LETTER', //    (8.5 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_TABLOID
-            => array(792.00, 1224.00),   //    (11 in. by 17 in.)
+            => array(792.00, 1224.00), //    (11 in. by 17 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LEDGER
-            => array(1224.00, 792.00),   //    (17 in. by 11 in.)
+            => array(1224.00, 792.00), //    (17 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LEGAL
-            => 'LEGAL',                  //    (8.5 in. by 14 in.)
+            => 'LEGAL', //    (8.5 in. by 14 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_STATEMENT
-            => array(396.00, 612.00),    //    (5.5 in. by 8.5 in.)
+            => array(396.00, 612.00), //    (5.5 in. by 8.5 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_EXECUTIVE
-            => 'EXECUTIVE',              //    (7.25 in. by 10.5 in.)
+            => 'EXECUTIVE', //    (7.25 in. by 10.5 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A3
-            => 'A3',                     //    (297 mm by 420 mm)
+            => 'A3', //    (297 mm by 420 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A4
-            => 'A4',                     //    (210 mm by 297 mm)
+            => 'A4', //    (210 mm by 297 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A4_SMALL
-            => 'A4',                     //    (210 mm by 297 mm)
+            => 'A4', //    (210 mm by 297 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A5
-            => 'A5',                     //    (148 mm by 210 mm)
+            => 'A5', //    (148 mm by 210 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_B4
-            => 'B4',                     //    (250 mm by 353 mm)
+            => 'B4', //    (250 mm by 353 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_B5
-            => 'B5',                     //    (176 mm by 250 mm)
+            => 'B5', //    (176 mm by 250 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_FOLIO
-            => 'FOLIO',                  //    (8.5 in. by 13 in.)
+            => 'FOLIO', //    (8.5 in. by 13 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_QUARTO
-            => array(609.45, 779.53),    //    (215 mm by 275 mm)
+            => array(609.45, 779.53), //    (215 mm by 275 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_STANDARD_1
-            => array(720.00, 1008.00),   //    (10 in. by 14 in.)
+            => array(720.00, 1008.00), //    (10 in. by 14 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_STANDARD_2
-            => array(792.00, 1224.00),   //    (11 in. by 17 in.)
+            => array(792.00, 1224.00), //    (11 in. by 17 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_NOTE
-            => 'LETTER',                 //    (8.5 in. by 11 in.)
+            => 'LETTER', //    (8.5 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_NO9_ENVELOPE
-            => array(279.00, 639.00),    //    (3.875 in. by 8.875 in.)
+            => array(279.00, 639.00), //    (3.875 in. by 8.875 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_NO10_ENVELOPE
-            => array(297.00, 684.00),    //    (4.125 in. by 9.5 in.)
+            => array(297.00, 684.00), //    (4.125 in. by 9.5 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_NO11_ENVELOPE
-            => array(324.00, 747.00),    //    (4.5 in. by 10.375 in.)
+            => array(324.00, 747.00), //    (4.5 in. by 10.375 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_NO12_ENVELOPE
-            => array(342.00, 792.00),    //    (4.75 in. by 11 in.)
+            => array(342.00, 792.00), //    (4.75 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_NO14_ENVELOPE
-            => array(360.00, 828.00),    //    (5 in. by 11.5 in.)
+            => array(360.00, 828.00), //    (5 in. by 11.5 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_C
-            => array(1224.00, 1584.00),  //    (17 in. by 22 in.)
+            => array(1224.00, 1584.00), //    (17 in. by 22 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_D
-            => array(1584.00, 2448.00),  //    (22 in. by 34 in.)
+            => array(1584.00, 2448.00), //    (22 in. by 34 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_E
-            => array(2448.00, 3168.00),  //    (34 in. by 44 in.)
+            => array(2448.00, 3168.00), //    (34 in. by 44 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_DL_ENVELOPE
-            => array(311.81, 623.62),    //    (110 mm by 220 mm)
+            => array(311.81, 623.62), //    (110 mm by 220 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_C5_ENVELOPE
-            => 'C5',                     //    (162 mm by 229 mm)
+            => 'C5', //    (162 mm by 229 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_C3_ENVELOPE
-            => 'C3',                     //    (324 mm by 458 mm)
+            => 'C3', //    (324 mm by 458 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_C4_ENVELOPE
-            => 'C4',                     //    (229 mm by 324 mm)
+            => 'C4', //    (229 mm by 324 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_C6_ENVELOPE
-            => 'C6',                     //    (114 mm by 162 mm)
+            => 'C6', //    (114 mm by 162 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_C65_ENVELOPE
-            => array(323.15, 649.13),    //    (114 mm by 229 mm)
+            => array(323.15, 649.13), //    (114 mm by 229 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_B4_ENVELOPE
-            => 'B4',                     //    (250 mm by 353 mm)
+            => 'B4', //    (250 mm by 353 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_B5_ENVELOPE
-            => 'B5',                     //    (176 mm by 250 mm)
+            => 'B5', //    (176 mm by 250 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_B6_ENVELOPE
-            => array(498.90, 354.33),    //    (176 mm by 125 mm)
+            => array(498.90, 354.33), //    (176 mm by 125 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_ITALY_ENVELOPE
-            => array(311.81, 651.97),    //    (110 mm by 230 mm)
+            => array(311.81, 651.97), //    (110 mm by 230 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_MONARCH_ENVELOPE
-            => array(279.00, 540.00),    //    (3.875 in. by 7.5 in.)
+            => array(279.00, 540.00), //    (3.875 in. by 7.5 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_6_3_4_ENVELOPE
-            => array(261.00, 468.00),    //    (3.625 in. by 6.5 in.)
+            => array(261.00, 468.00), //    (3.625 in. by 6.5 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_US_STANDARD_FANFOLD
-            => array(1071.00, 792.00),   //    (14.875 in. by 11 in.)
+            => array(1071.00, 792.00), //    (14.875 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD
-            => array(612.00, 864.00),    //    (8.5 in. by 12 in.)
+            => array(612.00, 864.00), //    (8.5 in. by 12 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD
-            => 'FOLIO',                  //    (8.5 in. by 13 in.)
+            => 'FOLIO', //    (8.5 in. by 13 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_ISO_B4
-            => 'B4',                     //    (250 mm by 353 mm)
+            => 'B4', //    (250 mm by 353 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD
-            => array(566.93, 419.53),    //    (200 mm by 148 mm)
+            => array(566.93, 419.53), //    (200 mm by 148 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_1
-            => array(648.00, 792.00),    //    (9 in. by 11 in.)
+            => array(648.00, 792.00), //    (9 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_2
-            => array(720.00, 792.00),    //    (10 in. by 11 in.)
+            => array(720.00, 792.00), //    (10 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_STANDARD_PAPER_3
-            => array(1080.00, 792.00),   //    (15 in. by 11 in.)
+            => array(1080.00, 792.00), //    (15 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_INVITE_ENVELOPE
-            => array(623.62, 623.62),    //    (220 mm by 220 mm)
+            => array(623.62, 623.62), //    (220 mm by 220 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER
-            => array(667.80, 864.00),    //    (9.275 in. by 12 in.)
+            => array(667.80, 864.00), //    (9.275 in. by 12 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER
-            => array(667.80, 1080.00),   //    (9.275 in. by 15 in.)
+            => array(667.80, 1080.00), //    (9.275 in. by 15 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER
-            => array(841.68, 1296.00),   //    (11.69 in. by 18 in.)
+            => array(841.68, 1296.00), //    (11.69 in. by 18 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A4_EXTRA_PAPER
-            => array(668.98, 912.76),    //    (236 mm by 322 mm)
+            => array(668.98, 912.76), //    (236 mm by 322 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER
-            => array(595.80, 792.00),    //    (8.275 in. by 11 in.)
+            => array(595.80, 792.00), //    (8.275 in. by 11 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER
-            => 'A4',                     //    (210 mm by 297 mm)
+            => 'A4', //    (210 mm by 297 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER
-            => array(667.80, 864.00),    //    (9.275 in. by 12 in.)
+            => array(667.80, 864.00), //    (9.275 in. by 12 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER
-            => array(643.46, 1009.13),   //    (227 mm by 356 mm)
+            => array(643.46, 1009.13), //    (227 mm by 356 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER
-            => array(864.57, 1380.47),   //    (305 mm by 487 mm)
+            => array(864.57, 1380.47), //    (305 mm by 487 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_LETTER_PLUS_PAPER
-            => array(612.00, 913.68),    //    (8.5 in. by 12.69 in.)
+            => array(612.00, 913.68), //    (8.5 in. by 12.69 in.)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A4_PLUS_PAPER
-            => array(595.28, 935.43),    //    (210 mm by 330 mm)
+            => array(595.28, 935.43), //    (210 mm by 330 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER
-            => 'A5',                     //    (148 mm by 210 mm)
+            => 'A5', //    (148 mm by 210 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER
-            => array(515.91, 728.50),    //    (182 mm by 257 mm)
+            => array(515.91, 728.50), //    (182 mm by 257 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_PAPER
-            => array(912.76, 1261.42),   //    (322 mm by 445 mm)
+            => array(912.76, 1261.42), //    (322 mm by 445 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A5_EXTRA_PAPER
-            => array(493.23, 666.14),    //    (174 mm by 235 mm)
+            => array(493.23, 666.14), //    (174 mm by 235 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER
-            => array(569.76, 782.36),    //    (201 mm by 276 mm)
+            => array(569.76, 782.36), //    (201 mm by 276 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A2_PAPER
-            => 'A2',                     //    (420 mm by 594 mm)
+            => 'A2', //    (420 mm by 594 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER
-            => 'A3',                     //    (297 mm by 420 mm)
+            => 'A3', //    (297 mm by 420 mm)
         \PHPExcel\Worksheet\PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER
             => array(912.76, 1261.42)    //    (322 mm by 445 mm)
     );

src/PhpSpreadsheet/Writer/PDF/DomPDF.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/BaseWriter.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      *
      * @var string
      */
-    protected $_diskCachingDirectory    = './';
+    protected $_diskCachingDirectory = './';
 
     /**
      * Write charts in workbook?

src/PhpSpreadsheet/Writer/CSV.php

Spacing +9 added lines, -9 removed lines

@@ -41,28 +41,28 @@ 
      *
      * @var string
      */
-    private $delimiter    = ',';
+    private $delimiter = ',';
 
     /**
      * Enclosure
      *
      * @var string
      */
-    private $enclosure    = '"';
+    private $enclosure = '"';
 
     /**
      * Line ending
      *
      * @var string
      */
-    private $lineEnding    = PHP_EOL;
+    private $lineEnding = PHP_EOL;
 
     /**
      * Sheet index to write
      *
      * @var int
      */
-    private $sheetIndex    = 0;
+    private $sheetIndex = 0;
 
     /**
      * Whether to write a BOM (for UTF8).
@@ -119,10 +119,10 @@ 
         }
 
         if ($this->excelCompatibility) {
-            $this->setUseBOM(true);                //  Enforce UTF-8 BOM Header
-            $this->setIncludeSeparatorLine(true);  //  Set separator line
-            $this->setEnclosure('"');              //  Set enclosure to "
-            $this->setDelimiter(";");              //  Set delimiter to a semi-colon
+            $this->setUseBOM(true); //  Enforce UTF-8 BOM Header
+            $this->setIncludeSeparatorLine(true); //  Set separator line
+            $this->setEnclosure('"'); //  Set enclosure to "
+            $this->setDelimiter(";"); //  Set delimiter to a semi-colon
             $this->setLineEnding("\r\n");
         }
         if ($this->useBOM) {
@@ -141,7 +141,7 @@ 
         // Write rows to file
         for ($row = 1; $row <= $maxRow; ++$row) {
             // Convert the row to an array...
-            $cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row, '', $this->preCalculateFormulas);
+            $cellsArray = $sheet->rangeToArray('A' . $row . ':' . $maxCol . $row, '', $this->preCalculateFormulas);
             // ... and write to the file
             $this->writeLine($fileHandle, $cellsArray[0]);
         }

Documentation/Examples/Reader/exampleReader18.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 //	$inputFileType = 'Gnumeric';
 $inputFileName = './sampleData/example1.xls';
 
-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' information using IOFactory with a defined reader type of ',$inputFileType,'<br />';
+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' information using IOFactory with a defined reader type of ', $inputFileType, '<br />';
 
 $objReader = PHPExcel_IOFactory::createReader($inputFileType);
 $worksheetData = $objReader->listWorksheetInfo($inputFileName);

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/DateTime.php

Spacing +44 added lines, -44 removed lines

@@ -129,10 +129,10 @@ 
 
         $adjustmentMonthsString = (string) $adjustmentMonths;
         if ($adjustmentMonths > 0) {
-            $adjustmentMonthsString = '+'.$adjustmentMonths;
+            $adjustmentMonthsString = '+' . $adjustmentMonths;
         }
         if ($adjustmentMonths != 0) {
-            $PHPDateObject->modify($adjustmentMonthsString.' months');
+            $PHPDateObject->modify($adjustmentMonthsString . ' months');
         }
         $nMonth = (int) $PHPDateObject->format('m');
         $nYear = (int) $PHPDateObject->format('Y');
@@ -140,7 +140,7 @@ 
         $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
         if ($monthDiff != $adjustmentMonths) {
             $adjustDays = (int) $PHPDateObject->format('d');
-            $adjustDaysString = '-'.$adjustDays.' days';
+            $adjustDaysString = '-' . $adjustDays . ' days';
             $PHPDateObject->modify($adjustDaysString);
         }
         return $PHPDateObject;
@@ -302,20 +302,20 @@ 
             (!is_numeric($day))) {
             return Functions::VALUE();
         }
-        $year    = (integer) $year;
+        $year = (integer) $year;
         $month    = (integer) $month;
-        $day    = (integer) $day;
+        $day = (integer) $day;
 
         $baseYear = \PHPExcel\Shared\Date::getExcelCalendar();
         // Validate parameters
-        if ($year < ($baseYear-1900)) {
+        if ($year < ($baseYear - 1900)) {
             return Functions::NAN();
         }
-        if ((($baseYear-1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
+        if ((($baseYear - 1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
             return Functions::NAN();
         }
 
-        if (($year < $baseYear) && ($year >= ($baseYear-1900))) {
+        if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
             $year += 1900;
         }
 
@@ -435,7 +435,7 @@ 
                 }
                 return (float) \PHPExcel\Shared\Date::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
             case Functions::RETURNDATE_PHP_NUMERIC:
-                return (integer) \PHPExcel\Shared\Date::excelToTimestamp(\PHPExcel\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));    // -2147468400; //    -2147472000 + 3600
+                return (integer) \PHPExcel\Shared\Date::excelToTimestamp(\PHPExcel\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
             case Functions::RETURNDATE_PHP_OBJECT:
                 $dayAdjust = 0;
                 if ($hour < 0) {
@@ -448,9 +448,9 @@ 
                     $dayAdjust = floor($hour / 24);
                     $hour = $hour % 24;
                 }
-                $phpDateObject = new \DateTime('1900-01-01 '.$hour.':'.$minute.':'.$second);
+                $phpDateObject = new \DateTime('1900-01-01 ' . $hour . ':' . $minute . ':' . $second);
                 if ($dayAdjust != 0) {
-                    $phpDateObject->modify($dayAdjust.' days');
+                    $phpDateObject->modify($dayAdjust . ' days');
                 }
                 return $phpDateObject;
         }
@@ -485,12 +485,12 @@ 
      */
     public static function DATEVALUE($dateValue = 1)
     {
-        $dateValueOrig= $dateValue;
+        $dateValueOrig = $dateValue;
         $dateValue = trim(Functions::flattenSingleValue($dateValue), '"');
         //    Strip any ordinals because they're allowed in Excel (English only)
         $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
         //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
-        $dateValue    = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
+        $dateValue = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
 
         $yearFound = false;
         $t1 = explode(' ', $dateValue);
@@ -544,9 +544,9 @@ 
             if ($testVal1 < 31 && $testVal2 < 12 && $testVal3 < 12 && strlen($testVal3) == 2) {
                 $testVal3 += 2000;
             }
-            $PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
+            $PHPDateArray = date_parse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
             if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                $PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
+                $PHPDateArray = date_parse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
                 if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
                     return Functions::VALUE();
                 }
@@ -586,7 +586,7 @@ 
                 case Functions::RETURNDATE_PHP_NUMERIC:
                     return (integer) \PHPExcel\Shared\Date::excelToTimestamp($excelDateValue);
                 case Functions::RETURNDATE_PHP_OBJECT:
-                    return new \DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
+                    return new \DateTime($PHPDateArray['year'] . '-' . $PHPDateArray['month'] . '-' . $PHPDateArray['day'] . ' 00:00:00');
             }
         }
         return Functions::VALUE();
@@ -621,7 +621,7 @@ 
         $timeValue = str_replace(array('/', '.'), array('-', '-'), $timeValue);
 
         $arraySplit = preg_split('/[\/:\-\s]/', $timeValue);
-        if ((count($arraySplit) == 2 ||count($arraySplit) == 3) && $arraySplit[0] > 24) {
+        if ((count($arraySplit) == 2 || count($arraySplit) == 3) && $arraySplit[0] > 24) {
             $arraySplit[0] = ($arraySplit[0] % 24);
             $timeValue = implode(':', $arraySplit);
         }
@@ -645,9 +645,9 @@ 
                 case Functions::RETURNDATE_EXCEL:
                     return (float) $excelDateValue;
                 case Functions::RETURNDATE_PHP_NUMERIC:
-                    return (integer) $phpDateValue = \PHPExcel\Shared\Date::excelToTimestamp($excelDateValue+25569) - 3600;
+                    return (integer) $phpDateValue = \PHPExcel\Shared\Date::excelToTimestamp($excelDateValue + 25569) - 3600;
                 case Functions::RETURNDATE_PHP_OBJECT:
-                    return new \DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
+                    return new \DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
             }
         }
         return Functions::VALUE();
@@ -722,7 +722,7 @@ 
             case 'MD':
                 if ($endDays < $startDays) {
                     $retVal = $endDays;
-                    $PHPEndDateObject->modify('-'.$endDays.' days');
+                    $PHPEndDateObject->modify('-' . $endDays . ' days');
                     $adjustDays = $PHPEndDateObject->format('j');
                     $retVal += ($adjustDays - $startDays);
                 } else {
@@ -790,8 +790,8 @@ 
      */
     public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
     {
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
 
         if (is_string($startDate = self::getDateValue($startDate))) {
             return Functions::VALUE();
@@ -846,9 +846,9 @@ 
      */
     public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
     {
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
-        $method        = Functions::flattenSingleValue($method);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
+        $method = Functions::flattenSingleValue($method);
 
         if (is_string($startDate = self::getDateValue($startDate))) {
             return Functions::VALUE();
@@ -943,8 +943,8 @@ 
     public static function NETWORKDAYS($startDate, $endDate)
     {
         //    Retrieve the mandatory start and end date that are referenced in the function definition
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
         //    Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
         $dateArgs = Functions::flattenArray(func_get_args());
         array_shift($dateArgs);
@@ -1030,8 +1030,8 @@ 
     public static function WORKDAY($startDate, $endDays)
     {
         //    Retrieve the mandatory start date and days that are referenced in the function definition
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDays    = Functions::flattenSingleValue($endDays);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDays = Functions::flattenSingleValue($endDays);
         //    Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
         $dateArgs = Functions::flattenArray(func_get_args());
         array_shift($dateArgs);
@@ -1053,7 +1053,7 @@ 
 
         $startDoW = self::DAYOFWEEK($startDate, 3);
         if (self::DAYOFWEEK($startDate, 3) >= 5) {
-            $startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
+            $startDate += ($decrementing) ? -$startDoW + 4 : 7 - $startDoW;
             ($decrementing) ? $endDays++ : $endDays--;
         }
 
@@ -1063,7 +1063,7 @@ 
         //    Adjust the calculated end date if it falls over a weekend
         $endDoW = self::DAYOFWEEK($endDate, 3);
         if ($endDoW >= 5) {
-            $endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
+            $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
         }
 
         //    Test any extra holiday parameters
@@ -1134,7 +1134,7 @@ 
      */
     public static function DAYOFMONTH($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if ($dateValue === null) {
             $dateValue = 1;
@@ -1248,8 +1248,8 @@ 
      */
     public static function WEEKOFYEAR($dateValue = 1, $method = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
-        $method        = Functions::flattenSingleValue($method);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $method = Functions::flattenSingleValue($method);
 
         if (!is_numeric($method)) {
             return Functions::VALUE();
@@ -1294,7 +1294,7 @@ 
      */
     public static function MONTHOFYEAR($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if (empty($dateValue)) {
             $dateValue = 1;
@@ -1327,7 +1327,7 @@ 
      */
     public static function YEAR($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if ($dateValue === null) {
             $dateValue = 1;
@@ -1359,7 +1359,7 @@ 
      */
     public static function HOUROFDAY($timeValue = 0)
     {
-        $timeValue    = Functions::flattenSingleValue($timeValue);
+        $timeValue = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1400,7 +1400,7 @@ 
      */
     public static function MINUTEOFHOUR($timeValue = 0)
     {
-        $timeValue = $timeTester    = Functions::flattenSingleValue($timeValue);
+        $timeValue = $timeTester = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1441,7 +1441,7 @@ 
      */
     public static function SECONDOFMINUTE($timeValue = 0)
     {
-        $timeValue    = Functions::flattenSingleValue($timeValue);
+        $timeValue = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1488,8 +1488,8 @@ 
      */
     public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue            = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths    = Functions::flattenSingleValue($adjustmentMonths);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
 
         if (!is_numeric($adjustmentMonths)) {
             return Functions::VALUE();
@@ -1534,8 +1534,8 @@ 
      */
     public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue            = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths    = Functions::flattenSingleValue($adjustmentMonths);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
 
         if (!is_numeric($adjustmentMonths)) {
             return Functions::VALUE();
@@ -1547,7 +1547,7 @@ 
         }
 
         // Execute function
-        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths+1);
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths + 1);
         $adjustDays = (int) $PHPDateObject->format('d');
         $adjustDaysString = '-' . $adjustDays . ' days';
         $PHPDateObject->modify($adjustDaysString);