PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Style/Conditional.php

Doc Comments +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
     /**
      * Get Condition type
      *
-     * @return string
+     * @return integer
      */
     public function getConditionType()
     {
@@ -122,7 +122,7 @@ 
     /**
      * Get Operator type
      *
-     * @return string
+     * @return integer
      */
     public function getOperatorType()
     {

src/PhpSpreadsheet/Worksheet/AutoFilter.php

Doc Comments +6 added lines

@@ -467,6 +467,7 @@ 
      *
      *    @param    string                   $dynamicRuleType
      *    @param    AutoFilter\Column        &$filterColumn
+     * @param AutoFilter\Column $filterColumn
      *    @return mixed[]
      */
     private function dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
@@ -571,6 +572,11 @@ 
         return array('method' => 'filterTestInCustomDataSet', 'arguments' => array('filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_AND));
     }
 
+    /**
+     * @param integer $columnID
+     * @param integer $startRow
+     * @param string $ruleType
+     */
     private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue)
     {
         $range = $columnID.$startRow.':'.$columnID.$endRow;

Indentation +2 added lines, -2 removed lines

@@ -707,8 +707,8 @@
                                 ? AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
                                 : AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
                             $ruleValues[] = ['operator' => $operator,
-                                                   'value' => $average,
-                                                 ];
+                                                    'value' => $average,
+                                                    ];
                             $columnFilterTests[$columnID] = [
                                 'method' => 'filterTestInCustomDataSet',
                                 'arguments' => ['filterRules' => $ruleValues, 'join' => AutoFilter\Column::AUTOFILTER_COLUMN_JOIN_OR],

Spacing +1 added lines, -1 removed lines

@@ -456,7 +456,7 @@
      *    @var    array
      */
     private static $fromReplace = ['\*', '\?', '~~', '~.*', '~.?'];
-    private static $toReplace = ['.*', '.',  '~',  '\*',  '\?'];
+    private static $toReplace = ['.*', '.', '~', '\*', '\?'];
 
     /**
      *    Convert a dynamic rule daterange to a custom filter range expression for ease of calculation

src/PhpSpreadsheet/Worksheet/Dimension.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     /**
      * Create a new Dimension
      *
-     * @param int $pIndex Numeric row index
+     * @param integer $initialValue
      */
     public function __construct($initialValue = null)
     {

src/PhpSpreadsheet/Worksheet/PageSetup.php

Doc Comments +2 added lines, -2 removed lines

@@ -802,7 +802,7 @@ 
      * Set first page number
      *
      * @param int $value
-     * @return HeaderFooter
+     * @return PageSetup
      */
     public function setFirstPageNumber($value = null)
     {
@@ -813,7 +813,7 @@ 
     /**
      * Reset first page number
      *
-     * @return HeaderFooter
+     * @return PageSetup
      */
     public function resetFirstPageNumber()
     {

src/PhpSpreadsheet/Writer/Excel5/Escher.php

Doc Comments +1 added lines

@@ -67,6 +67,7 @@
 
     /**
      * Process the object to be written
+     * @return string
      */
     public function close()
     {

src/PhpSpreadsheet/Writer/Excel5/Parser.php

Doc Comments +9 added lines, -9 removed lines

@@ -504,7 +504,7 @@ 
      *
      * @access private
      * @param mixed $token The token to convert.
-     * @return mixed the converted token on success
+     * @return string the converted token on success
      */
     private function convert($token)
     {
@@ -574,7 +574,7 @@ 
      *
      * @access private
      * @param string $string A string for conversion to its ptg value.
-     * @return mixed the converted token on success
+     * @return string the converted token on success
      */
     private function convertString($string)
     {
@@ -654,7 +654,7 @@ 
      *
      * @access private
      * @param string $token An Excel range in the Sheet1!A1:A2 format.
-     * @return mixed The packed ptgArea3d token on success.
+     * @return string The packed ptgArea3d token on success.
      */
     private function convertRange3d($token)
     {
@@ -726,7 +726,7 @@ 
      *
      * @access private
      * @param string $cell An Excel cell reference
-     * @return mixed The packed ptgRef3d token on success.
+     * @return string The packed ptgRef3d token on success.
      */
     private function convertRef3d($cell)
     {
@@ -834,7 +834,7 @@ 
      *
      * @access private
      * @param string $ext_ref The name of the external reference
-     * @return mixed The reference index in packed() format on success
+     * @return string The reference index in packed() format on success
      */
     private function getRefIndex($ext_ref)
     {
@@ -925,7 +925,7 @@ 
      *
      * @access private
      * @param string $cell The Excel cell reference to be packed
-     * @return array Array containing the row and column in packed() format
+     * @return string[] Array containing the row and column in packed() format
      */
     private function cellToPackedRowcol($cell)
     {
@@ -954,7 +954,7 @@ 
      *
      * @access private
      * @param string $range The Excel range to be packed
-     * @return array Array containing (row1,col1,row2,col2) in packed() format
+     * @return string[] Array containing (row1,col1,row2,col2) in packed() format
      */
     private function rangeToPackedRange($range)
     {
@@ -1075,7 +1075,7 @@ 
      * Checks if it's a valid token.
      *
      * @access private
-     * @param mixed $token The token to check.
+     * @param string $token The token to check.
      * @return mixed       The checked token or false on failure
      */
     private function match($token)
@@ -1157,7 +1157,7 @@ 
      * @access public
      * @param string $formula The formula to parse, without the initial equal
      *                        sign (=).
-     * @return mixed true on success
+     * @return boolean true on success
      */
     public function parse($formula)
     {

Indentation +1 added lines, -1 removed lines

@@ -666,7 +666,7 @@
             list($row1, $col1) = $this->cellToPackedRowcol($cell1);
             list($row2, $col2) = $this->cellToPackedRowcol($cell2);
         } else { // It's a rows range (like 26:27)
-             list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2);
+                list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2);
         }
 
         // The ptg value depends on the class of the ptg.

Spacing +261 added lines, -261 removed lines

@@ -114,11 +114,11 @@ 
     public function __construct()
     {
         $this->currentCharacter = 0;
-        $this->currentToken = '';       // The token we are working on.
-        $this->formula = '';       // The formula to parse.
-        $this->lookAhead = '';       // The character ahead of the current char.
-        $this->parseTree = '';       // The parse tree to be generated.
-        $this->initializeHashes();      // Initialize the hashes: ptg's and function's ptg's
+        $this->currentToken = ''; // The token we are working on.
+        $this->formula = ''; // The formula to parse.
+        $this->lookAhead = ''; // The character ahead of the current char.
+        $this->parseTree = ''; // The parse tree to be generated.
+        $this->initializeHashes(); // Initialize the hashes: ptg's and function's ptg's
         $this->externalSheets = [];
         $this->references = [];
     }
@@ -242,256 +242,256 @@ 
         //
         $this->functions = [
             // function                  ptg  args  class  vol
-            'COUNT' => [0,   -1,    0,    0],
-            'IF' => [1,   -1,    1,    0],
-            'ISNA' => [2,    1,    1,    0],
-            'ISERROR' => [3,    1,    1,    0],
-            'SUM' => [4,   -1,    0,    0],
-            'AVERAGE' => [5,   -1,    0,    0],
-            'MIN' => [6,   -1,    0,    0],
-            'MAX' => [7,   -1,    0,    0],
-            'ROW' => [8,   -1,    0,    0],
-            'COLUMN' => [9,   -1,    0,    0],
-            'NA' => [10,    0,    0,    0],
-            'NPV' => [11,   -1,    1,    0],
-            'STDEV' => [12,   -1,    0,    0],
-            'DOLLAR' => [13,   -1,    1,    0],
-            'FIXED' => [14,   -1,    1,    0],
-            'SIN' => [15,    1,    1,    0],
-            'COS' => [16,    1,    1,    0],
-            'TAN' => [17,    1,    1,    0],
-            'ATAN' => [18,    1,    1,    0],
-            'PI' => [19,    0,    1,    0],
-            'SQRT' => [20,    1,    1,    0],
-            'EXP' => [21,    1,    1,    0],
-            'LN' => [22,    1,    1,    0],
-            'LOG10' => [23,    1,    1,    0],
-            'ABS' => [24,    1,    1,    0],
-            'INT' => [25,    1,    1,    0],
-            'SIGN' => [26,    1,    1,    0],
-            'ROUND' => [27,    2,    1,    0],
-            'LOOKUP' => [28,   -1,    0,    0],
-            'INDEX' => [29,   -1,    0,    1],
-            'REPT' => [30,    2,    1,    0],
-            'MID' => [31,    3,    1,    0],
-            'LEN' => [32,    1,    1,    0],
-            'VALUE' => [33,    1,    1,    0],
-            'TRUE' => [34,    0,    1,    0],
-            'FALSE' => [35,    0,    1,    0],
-            'AND' => [36,   -1,    0,    0],
-            'OR' => [37,   -1,    0,    0],
-            'NOT' => [38,    1,    1,    0],
-            'MOD' => [39,    2,    1,    0],
-            'DCOUNT' => [40,    3,    0,    0],
-            'DSUM' => [41,    3,    0,    0],
-            'DAVERAGE' => [42,    3,    0,    0],
-            'DMIN' => [43,    3,    0,    0],
-            'DMAX' => [44,    3,    0,    0],
-            'DSTDEV' => [45,    3,    0,    0],
-            'VAR' => [46,   -1,    0,    0],
-            'DVAR' => [47,    3,    0,    0],
-            'TEXT' => [48,    2,    1,    0],
-            'LINEST' => [49,   -1,    0,    0],
-            'TREND' => [50,   -1,    0,    0],
-            'LOGEST' => [51,   -1,    0,    0],
-            'GROWTH' => [52,   -1,    0,    0],
-            'PV' => [56,   -1,    1,    0],
-            'FV' => [57,   -1,    1,    0],
-            'NPER' => [58,   -1,    1,    0],
-            'PMT' => [59,   -1,    1,    0],
-            'RATE' => [60,   -1,    1,    0],
-            'MIRR' => [61,    3,    0,    0],
-            'IRR' => [62,   -1,    0,    0],
-            'RAND' => [63,    0,    1,    1],
-            'MATCH' => [64,   -1,    0,    0],
-            'DATE' => [65,    3,    1,    0],
-            'TIME' => [66,    3,    1,    0],
-            'DAY' => [67,    1,    1,    0],
-            'MONTH' => [68,    1,    1,    0],
-            'YEAR' => [69,    1,    1,    0],
-            'WEEKDAY' => [70,   -1,    1,    0],
-            'HOUR' => [71,    1,    1,    0],
-            'MINUTE' => [72,    1,    1,    0],
-            'SECOND' => [73,    1,    1,    0],
-            'NOW' => [74,    0,    1,    1],
-            'AREAS' => [75,    1,    0,    1],
-            'ROWS' => [76,    1,    0,    1],
-            'COLUMNS' => [77,    1,    0,    1],
-            'OFFSET' => [78,   -1,    0,    1],
-            'SEARCH' => [82,   -1,    1,    0],
-            'TRANSPOSE' => [83,    1,    1,    0],
-            'TYPE' => [86,    1,    1,    0],
-            'ATAN2' => [97,    2,    1,    0],
-            'ASIN' => [98,    1,    1,    0],
-            'ACOS' => [99,    1,    1,    0],
-            'CHOOSE' => [100,   -1,    1,    0],
-            'HLOOKUP' => [101,   -1,    0,    0],
-            'VLOOKUP' => [102,   -1,    0,    0],
-            'ISREF' => [105,    1,    0,    0],
-            'LOG' => [109,   -1,    1,    0],
-            'CHAR' => [111,    1,    1,    0],
-            'LOWER' => [112,    1,    1,    0],
-            'UPPER' => [113,    1,    1,    0],
-            'PROPER' => [114,    1,    1,    0],
-            'LEFT' => [115,   -1,    1,    0],
-            'RIGHT' => [116,   -1,    1,    0],
-            'EXACT' => [117,    2,    1,    0],
-            'TRIM' => [118,    1,    1,    0],
-            'REPLACE' => [119,    4,    1,    0],
-            'SUBSTITUTE' => [120,   -1,    1,    0],
-            'CODE' => [121,    1,    1,    0],
-            'FIND' => [124,   -1,    1,    0],
-            'CELL' => [125,   -1,    0,    1],
-            'ISERR' => [126,    1,    1,    0],
-            'ISTEXT' => [127,    1,    1,    0],
-            'ISNUMBER' => [128,    1,    1,    0],
-            'ISBLANK' => [129,    1,    1,    0],
-            'T' => [130,    1,    0,    0],
-            'N' => [131,    1,    0,    0],
-            'DATEVALUE' => [140,    1,    1,    0],
-            'TIMEVALUE' => [141,    1,    1,    0],
-            'SLN' => [142,    3,    1,    0],
-            'SYD' => [143,    4,    1,    0],
-            'DDB' => [144,   -1,    1,    0],
-            'INDIRECT' => [148,   -1,    1,    1],
-            'CALL' => [150,   -1,    1,    0],
-            'CLEAN' => [162,    1,    1,    0],
-            'MDETERM' => [163,    1,    2,    0],
-            'MINVERSE' => [164,    1,    2,    0],
-            'MMULT' => [165,    2,    2,    0],
-            'IPMT' => [167,   -1,    1,    0],
-            'PPMT' => [168,   -1,    1,    0],
-            'COUNTA' => [169,   -1,    0,    0],
-            'PRODUCT' => [183,   -1,    0,    0],
-            'FACT' => [184,    1,    1,    0],
-            'DPRODUCT' => [189,    3,    0,    0],
-            'ISNONTEXT' => [190,    1,    1,    0],
-            'STDEVP' => [193,   -1,    0,    0],
-            'VARP' => [194,   -1,    0,    0],
-            'DSTDEVP' => [195,    3,    0,    0],
-            'DVARP' => [196,    3,    0,    0],
-            'TRUNC' => [197,   -1,    1,    0],
-            'ISLOGICAL' => [198,    1,    1,    0],
-            'DCOUNTA' => [199,    3,    0,    0],
-            'USDOLLAR' => [204,   -1,    1,    0],
-            'FINDB' => [205,   -1,    1,    0],
-            'SEARCHB' => [206,   -1,    1,    0],
-            'REPLACEB' => [207,    4,    1,    0],
-            'LEFTB' => [208,   -1,    1,    0],
-            'RIGHTB' => [209,   -1,    1,    0],
-            'MIDB' => [210,    3,    1,    0],
-            'LENB' => [211,    1,    1,    0],
-            'ROUNDUP' => [212,    2,    1,    0],
-            'ROUNDDOWN' => [213,    2,    1,    0],
-            'ASC' => [214,    1,    1,    0],
-            'DBCS' => [215,    1,    1,    0],
-            'RANK' => [216,   -1,    0,    0],
-            'ADDRESS' => [219,   -1,    1,    0],
-            'DAYS360' => [220,   -1,    1,    0],
-            'TODAY' => [221,    0,    1,    1],
-            'VDB' => [222,   -1,    1,    0],
-            'MEDIAN' => [227,   -1,    0,    0],
-            'SUMPRODUCT' => [228,   -1,    2,    0],
-            'SINH' => [229,    1,    1,    0],
-            'COSH' => [230,    1,    1,    0],
-            'TANH' => [231,    1,    1,    0],
-            'ASINH' => [232,    1,    1,    0],
-            'ACOSH' => [233,    1,    1,    0],
-            'ATANH' => [234,    1,    1,    0],
-            'DGET' => [235,    3,    0,    0],
-            'INFO' => [244,    1,    1,    1],
-            'DB' => [247,   -1,    1,    0],
-            'FREQUENCY' => [252,    2,    0,    0],
-            'ERROR.TYPE' => [261,    1,    1,    0],
-            'REGISTER.ID' => [267,   -1,    1,    0],
-            'AVEDEV' => [269,   -1,    0,    0],
-            'BETADIST' => [270,   -1,    1,    0],
-            'GAMMALN' => [271,    1,    1,    0],
-            'BETAINV' => [272,   -1,    1,    0],
-            'BINOMDIST' => [273,    4,    1,    0],
-            'CHIDIST' => [274,    2,    1,    0],
-            'CHIINV' => [275,    2,    1,    0],
-            'COMBIN' => [276,    2,    1,    0],
-            'CONFIDENCE' => [277,    3,    1,    0],
-            'CRITBINOM' => [278,    3,    1,    0],
-            'EVEN' => [279,    1,    1,    0],
-            'EXPONDIST' => [280,    3,    1,    0],
-            'FDIST' => [281,    3,    1,    0],
-            'FINV' => [282,    3,    1,    0],
-            'FISHER' => [283,    1,    1,    0],
-            'FISHERINV' => [284,    1,    1,    0],
-            'FLOOR' => [285,    2,    1,    0],
-            'GAMMADIST' => [286,    4,    1,    0],
-            'GAMMAINV' => [287,    3,    1,    0],
-            'CEILING' => [288,    2,    1,    0],
-            'HYPGEOMDIST' => [289,    4,    1,    0],
-            'LOGNORMDIST' => [290,    3,    1,    0],
-            'LOGINV' => [291,    3,    1,    0],
-            'NEGBINOMDIST' => [292,    3,    1,    0],
-            'NORMDIST' => [293,    4,    1,    0],
-            'NORMSDIST' => [294,    1,    1,    0],
-            'NORMINV' => [295,    3,    1,    0],
-            'NORMSINV' => [296,    1,    1,    0],
-            'STANDARDIZE' => [297,    3,    1,    0],
-            'ODD' => [298,    1,    1,    0],
-            'PERMUT' => [299,    2,    1,    0],
-            'POISSON' => [300,    3,    1,    0],
-            'TDIST' => [301,    3,    1,    0],
-            'WEIBULL' => [302,    4,    1,    0],
-            'SUMXMY2' => [303,    2,    2,    0],
-            'SUMX2MY2' => [304,    2,    2,    0],
-            'SUMX2PY2' => [305,    2,    2,    0],
-            'CHITEST' => [306,    2,    2,    0],
-            'CORREL' => [307,    2,    2,    0],
-            'COVAR' => [308,    2,    2,    0],
-            'FORECAST' => [309,    3,    2,    0],
-            'FTEST' => [310,    2,    2,    0],
-            'INTERCEPT' => [311,    2,    2,    0],
-            'PEARSON' => [312,    2,    2,    0],
-            'RSQ' => [313,    2,    2,    0],
-            'STEYX' => [314,    2,    2,    0],
-            'SLOPE' => [315,    2,    2,    0],
-            'TTEST' => [316,    4,    2,    0],
-            'PROB' => [317,   -1,    2,    0],
-            'DEVSQ' => [318,   -1,    0,    0],
-            'GEOMEAN' => [319,   -1,    0,    0],
-            'HARMEAN' => [320,   -1,    0,    0],
-            'SUMSQ' => [321,   -1,    0,    0],
-            'KURT' => [322,   -1,    0,    0],
-            'SKEW' => [323,   -1,    0,    0],
-            'ZTEST' => [324,   -1,    0,    0],
-            'LARGE' => [325,    2,    0,    0],
-            'SMALL' => [326,    2,    0,    0],
-            'QUARTILE' => [327,    2,    0,    0],
-            'PERCENTILE' => [328,    2,    0,    0],
-            'PERCENTRANK' => [329,   -1,    0,    0],
-            'MODE' => [330,   -1,    2,    0],
-            'TRIMMEAN' => [331,    2,    0,    0],
-            'TINV' => [332,    2,    1,    0],
-            'CONCATENATE' => [336,   -1,    1,    0],
-            'POWER' => [337,    2,    1,    0],
-            'RADIANS' => [342,    1,    1,    0],
-            'DEGREES' => [343,    1,    1,    0],
-            'SUBTOTAL' => [344,   -1,    0,    0],
-            'SUMIF' => [345,   -1,    0,    0],
-            'COUNTIF' => [346,    2,    0,    0],
-            'COUNTBLANK' => [347,    1,    0,    0],
-            'ISPMT' => [350,    4,    1,    0],
-            'DATEDIF' => [351,    3,    1,    0],
-            'DATESTRING' => [352,    1,    1,    0],
-            'NUMBERSTRING' => [353,    2,    1,    0],
-            'ROMAN' => [354,   -1,    1,    0],
-            'GETPIVOTDATA' => [358,   -1,    0,    0],
-            'HYPERLINK' => [359,   -1,    1,    0],
-            'PHONETIC' => [360,    1,    0,    0],
-            'AVERAGEA' => [361,   -1,    0,    0],
-            'MAXA' => [362,   -1,    0,    0],
-            'MINA' => [363,   -1,    0,    0],
-            'STDEVPA' => [364,   -1,    0,    0],
-            'VARPA' => [365,   -1,    0,    0],
-            'STDEVA' => [366,   -1,    0,    0],
-            'VARA' => [367,   -1,    0,    0],
-            'BAHTTEXT' => [368,    1,    0,    0],
+            'COUNT' => [0, -1, 0, 0],
+            'IF' => [1, -1, 1, 0],
+            'ISNA' => [2, 1, 1, 0],
+            'ISERROR' => [3, 1, 1, 0],
+            'SUM' => [4, -1, 0, 0],
+            'AVERAGE' => [5, -1, 0, 0],
+            'MIN' => [6, -1, 0, 0],
+            'MAX' => [7, -1, 0, 0],
+            'ROW' => [8, -1, 0, 0],
+            'COLUMN' => [9, -1, 0, 0],
+            'NA' => [10, 0, 0, 0],
+            'NPV' => [11, -1, 1, 0],
+            'STDEV' => [12, -1, 0, 0],
+            'DOLLAR' => [13, -1, 1, 0],
+            'FIXED' => [14, -1, 1, 0],
+            'SIN' => [15, 1, 1, 0],
+            'COS' => [16, 1, 1, 0],
+            'TAN' => [17, 1, 1, 0],
+            'ATAN' => [18, 1, 1, 0],
+            'PI' => [19, 0, 1, 0],
+            'SQRT' => [20, 1, 1, 0],
+            'EXP' => [21, 1, 1, 0],
+            'LN' => [22, 1, 1, 0],
+            'LOG10' => [23, 1, 1, 0],
+            'ABS' => [24, 1, 1, 0],
+            'INT' => [25, 1, 1, 0],
+            'SIGN' => [26, 1, 1, 0],
+            'ROUND' => [27, 2, 1, 0],
+            'LOOKUP' => [28, -1, 0, 0],
+            'INDEX' => [29, -1, 0, 1],
+            'REPT' => [30, 2, 1, 0],
+            'MID' => [31, 3, 1, 0],
+            'LEN' => [32, 1, 1, 0],
+            'VALUE' => [33, 1, 1, 0],
+            'TRUE' => [34, 0, 1, 0],
+            'FALSE' => [35, 0, 1, 0],
+            'AND' => [36, -1, 0, 0],
+            'OR' => [37, -1, 0, 0],
+            'NOT' => [38, 1, 1, 0],
+            'MOD' => [39, 2, 1, 0],
+            'DCOUNT' => [40, 3, 0, 0],
+            'DSUM' => [41, 3, 0, 0],
+            'DAVERAGE' => [42, 3, 0, 0],
+            'DMIN' => [43, 3, 0, 0],
+            'DMAX' => [44, 3, 0, 0],
+            'DSTDEV' => [45, 3, 0, 0],
+            'VAR' => [46, -1, 0, 0],
+            'DVAR' => [47, 3, 0, 0],
+            'TEXT' => [48, 2, 1, 0],
+            'LINEST' => [49, -1, 0, 0],
+            'TREND' => [50, -1, 0, 0],
+            'LOGEST' => [51, -1, 0, 0],
+            'GROWTH' => [52, -1, 0, 0],
+            'PV' => [56, -1, 1, 0],
+            'FV' => [57, -1, 1, 0],
+            'NPER' => [58, -1, 1, 0],
+            'PMT' => [59, -1, 1, 0],
+            'RATE' => [60, -1, 1, 0],
+            'MIRR' => [61, 3, 0, 0],
+            'IRR' => [62, -1, 0, 0],
+            'RAND' => [63, 0, 1, 1],
+            'MATCH' => [64, -1, 0, 0],
+            'DATE' => [65, 3, 1, 0],
+            'TIME' => [66, 3, 1, 0],
+            'DAY' => [67, 1, 1, 0],
+            'MONTH' => [68, 1, 1, 0],
+            'YEAR' => [69, 1, 1, 0],
+            'WEEKDAY' => [70, -1, 1, 0],
+            'HOUR' => [71, 1, 1, 0],
+            'MINUTE' => [72, 1, 1, 0],
+            'SECOND' => [73, 1, 1, 0],
+            'NOW' => [74, 0, 1, 1],
+            'AREAS' => [75, 1, 0, 1],
+            'ROWS' => [76, 1, 0, 1],
+            'COLUMNS' => [77, 1, 0, 1],
+            'OFFSET' => [78, -1, 0, 1],
+            'SEARCH' => [82, -1, 1, 0],
+            'TRANSPOSE' => [83, 1, 1, 0],
+            'TYPE' => [86, 1, 1, 0],
+            'ATAN2' => [97, 2, 1, 0],
+            'ASIN' => [98, 1, 1, 0],
+            'ACOS' => [99, 1, 1, 0],
+            'CHOOSE' => [100, -1, 1, 0],
+            'HLOOKUP' => [101, -1, 0, 0],
+            'VLOOKUP' => [102, -1, 0, 0],
+            'ISREF' => [105, 1, 0, 0],
+            'LOG' => [109, -1, 1, 0],
+            'CHAR' => [111, 1, 1, 0],
+            'LOWER' => [112, 1, 1, 0],
+            'UPPER' => [113, 1, 1, 0],
+            'PROPER' => [114, 1, 1, 0],
+            'LEFT' => [115, -1, 1, 0],
+            'RIGHT' => [116, -1, 1, 0],
+            'EXACT' => [117, 2, 1, 0],
+            'TRIM' => [118, 1, 1, 0],
+            'REPLACE' => [119, 4, 1, 0],
+            'SUBSTITUTE' => [120, -1, 1, 0],
+            'CODE' => [121, 1, 1, 0],
+            'FIND' => [124, -1, 1, 0],
+            'CELL' => [125, -1, 0, 1],
+            'ISERR' => [126, 1, 1, 0],
+            'ISTEXT' => [127, 1, 1, 0],
+            'ISNUMBER' => [128, 1, 1, 0],
+            'ISBLANK' => [129, 1, 1, 0],
+            'T' => [130, 1, 0, 0],
+            'N' => [131, 1, 0, 0],
+            'DATEVALUE' => [140, 1, 1, 0],
+            'TIMEVALUE' => [141, 1, 1, 0],
+            'SLN' => [142, 3, 1, 0],
+            'SYD' => [143, 4, 1, 0],
+            'DDB' => [144, -1, 1, 0],
+            'INDIRECT' => [148, -1, 1, 1],
+            'CALL' => [150, -1, 1, 0],
+            'CLEAN' => [162, 1, 1, 0],
+            'MDETERM' => [163, 1, 2, 0],
+            'MINVERSE' => [164, 1, 2, 0],
+            'MMULT' => [165, 2, 2, 0],
+            'IPMT' => [167, -1, 1, 0],
+            'PPMT' => [168, -1, 1, 0],
+            'COUNTA' => [169, -1, 0, 0],
+            'PRODUCT' => [183, -1, 0, 0],
+            'FACT' => [184, 1, 1, 0],
+            'DPRODUCT' => [189, 3, 0, 0],
+            'ISNONTEXT' => [190, 1, 1, 0],
+            'STDEVP' => [193, -1, 0, 0],
+            'VARP' => [194, -1, 0, 0],
+            'DSTDEVP' => [195, 3, 0, 0],
+            'DVARP' => [196, 3, 0, 0],
+            'TRUNC' => [197, -1, 1, 0],
+            'ISLOGICAL' => [198, 1, 1, 0],
+            'DCOUNTA' => [199, 3, 0, 0],
+            'USDOLLAR' => [204, -1, 1, 0],
+            'FINDB' => [205, -1, 1, 0],
+            'SEARCHB' => [206, -1, 1, 0],
+            'REPLACEB' => [207, 4, 1, 0],
+            'LEFTB' => [208, -1, 1, 0],
+            'RIGHTB' => [209, -1, 1, 0],
+            'MIDB' => [210, 3, 1, 0],
+            'LENB' => [211, 1, 1, 0],
+            'ROUNDUP' => [212, 2, 1, 0],
+            'ROUNDDOWN' => [213, 2, 1, 0],
+            'ASC' => [214, 1, 1, 0],
+            'DBCS' => [215, 1, 1, 0],
+            'RANK' => [216, -1, 0, 0],
+            'ADDRESS' => [219, -1, 1, 0],
+            'DAYS360' => [220, -1, 1, 0],
+            'TODAY' => [221, 0, 1, 1],
+            'VDB' => [222, -1, 1, 0],
+            'MEDIAN' => [227, -1, 0, 0],
+            'SUMPRODUCT' => [228, -1, 2, 0],
+            'SINH' => [229, 1, 1, 0],
+            'COSH' => [230, 1, 1, 0],
+            'TANH' => [231, 1, 1, 0],
+            'ASINH' => [232, 1, 1, 0],
+            'ACOSH' => [233, 1, 1, 0],
+            'ATANH' => [234, 1, 1, 0],
+            'DGET' => [235, 3, 0, 0],
+            'INFO' => [244, 1, 1, 1],
+            'DB' => [247, -1, 1, 0],
+            'FREQUENCY' => [252, 2, 0, 0],
+            'ERROR.TYPE' => [261, 1, 1, 0],
+            'REGISTER.ID' => [267, -1, 1, 0],
+            'AVEDEV' => [269, -1, 0, 0],
+            'BETADIST' => [270, -1, 1, 0],
+            'GAMMALN' => [271, 1, 1, 0],
+            'BETAINV' => [272, -1, 1, 0],
+            'BINOMDIST' => [273, 4, 1, 0],
+            'CHIDIST' => [274, 2, 1, 0],
+            'CHIINV' => [275, 2, 1, 0],
+            'COMBIN' => [276, 2, 1, 0],
+            'CONFIDENCE' => [277, 3, 1, 0],
+            'CRITBINOM' => [278, 3, 1, 0],
+            'EVEN' => [279, 1, 1, 0],
+            'EXPONDIST' => [280, 3, 1, 0],
+            'FDIST' => [281, 3, 1, 0],
+            'FINV' => [282, 3, 1, 0],
+            'FISHER' => [283, 1, 1, 0],
+            'FISHERINV' => [284, 1, 1, 0],
+            'FLOOR' => [285, 2, 1, 0],
+            'GAMMADIST' => [286, 4, 1, 0],
+            'GAMMAINV' => [287, 3, 1, 0],
+            'CEILING' => [288, 2, 1, 0],
+            'HYPGEOMDIST' => [289, 4, 1, 0],
+            'LOGNORMDIST' => [290, 3, 1, 0],
+            'LOGINV' => [291, 3, 1, 0],
+            'NEGBINOMDIST' => [292, 3, 1, 0],
+            'NORMDIST' => [293, 4, 1, 0],
+            'NORMSDIST' => [294, 1, 1, 0],
+            'NORMINV' => [295, 3, 1, 0],
+            'NORMSINV' => [296, 1, 1, 0],
+            'STANDARDIZE' => [297, 3, 1, 0],
+            'ODD' => [298, 1, 1, 0],
+            'PERMUT' => [299, 2, 1, 0],
+            'POISSON' => [300, 3, 1, 0],
+            'TDIST' => [301, 3, 1, 0],
+            'WEIBULL' => [302, 4, 1, 0],
+            'SUMXMY2' => [303, 2, 2, 0],
+            'SUMX2MY2' => [304, 2, 2, 0],
+            'SUMX2PY2' => [305, 2, 2, 0],
+            'CHITEST' => [306, 2, 2, 0],
+            'CORREL' => [307, 2, 2, 0],
+            'COVAR' => [308, 2, 2, 0],
+            'FORECAST' => [309, 3, 2, 0],
+            'FTEST' => [310, 2, 2, 0],
+            'INTERCEPT' => [311, 2, 2, 0],
+            'PEARSON' => [312, 2, 2, 0],
+            'RSQ' => [313, 2, 2, 0],
+            'STEYX' => [314, 2, 2, 0],
+            'SLOPE' => [315, 2, 2, 0],
+            'TTEST' => [316, 4, 2, 0],
+            'PROB' => [317, -1, 2, 0],
+            'DEVSQ' => [318, -1, 0, 0],
+            'GEOMEAN' => [319, -1, 0, 0],
+            'HARMEAN' => [320, -1, 0, 0],
+            'SUMSQ' => [321, -1, 0, 0],
+            'KURT' => [322, -1, 0, 0],
+            'SKEW' => [323, -1, 0, 0],
+            'ZTEST' => [324, -1, 0, 0],
+            'LARGE' => [325, 2, 0, 0],
+            'SMALL' => [326, 2, 0, 0],
+            'QUARTILE' => [327, 2, 0, 0],
+            'PERCENTILE' => [328, 2, 0, 0],
+            'PERCENTRANK' => [329, -1, 0, 0],
+            'MODE' => [330, -1, 2, 0],
+            'TRIMMEAN' => [331, 2, 0, 0],
+            'TINV' => [332, 2, 1, 0],
+            'CONCATENATE' => [336, -1, 1, 0],
+            'POWER' => [337, 2, 1, 0],
+            'RADIANS' => [342, 1, 1, 0],
+            'DEGREES' => [343, 1, 1, 0],
+            'SUBTOTAL' => [344, -1, 0, 0],
+            'SUMIF' => [345, -1, 0, 0],
+            'COUNTIF' => [346, 2, 0, 0],
+            'COUNTBLANK' => [347, 1, 0, 0],
+            'ISPMT' => [350, 4, 1, 0],
+            'DATEDIF' => [351, 3, 1, 0],
+            'DATESTRING' => [352, 1, 1, 0],
+            'NUMBERSTRING' => [353, 2, 1, 0],
+            'ROMAN' => [354, -1, 1, 0],
+            'GETPIVOTDATA' => [358, -1, 0, 0],
+            'HYPERLINK' => [359, -1, 1, 0],
+            'PHONETIC' => [360, 1, 0, 0],
+            'AVERAGEA' => [361, -1, 0, 0],
+            'MAXA' => [362, -1, 0, 0],
+            'MINA' => [363, -1, 0, 0],
+            'STDEVPA' => [364, -1, 0, 0],
+            'VARPA' => [365, -1, 0, 0],
+            'STDEVA' => [366, -1, 0, 0],
+            'VARA' => [367, -1, 0, 0],
+            'BAHTTEXT' => [368, 1, 0, 0],
         ];
     }
 
@@ -1318,12 +1318,12 @@ 
     private function fact()
     {
         if ($this->currentToken == '(') {
-            $this->advance();         // eat the "("
+            $this->advance(); // eat the "("
             $result = $this->parenthesizedExpression();
             if ($this->currentToken != ')') {
                 throw new \PhpSpreadsheet\Writer\Exception("')' token expected.");
             }
-            $this->advance();         // eat the ")"
+            $this->advance(); // eat the ")"
             return $result;
         }
         // if it's a reference
@@ -1372,7 +1372,7 @@ 
             // If it's a number or a percent
             if ($this->lookAhead == '%') {
                 $result = $this->createTree('ptgPercent', $this->currentToken, '');
-                $this->advance();  // Skip the percentage operator once we've pre-built that tree
+                $this->advance(); // Skip the percentage operator once we've pre-built that tree
             } else {
                 $result = $this->createTree($this->currentToken, '', '');
             }
@@ -1400,12 +1400,12 @@ 
         $function = strtoupper($this->currentToken);
         $result = ''; // initialize result
         $this->advance();
-        $this->advance();         // eat the "("
+        $this->advance(); // eat the "("
         while ($this->currentToken != ')') {
             /**/
             if ($num_args > 0) {
                 if ($this->currentToken == ',' || $this->currentToken == ';') {
-                    $this->advance();  // eat the "," or ";"
+                    $this->advance(); // eat the "," or ";"
                 } else {
                     throw new \PhpSpreadsheet\Writer\Exception("Syntax error: comma expected in function $function, arg #{$num_args}");
                 }
@@ -1427,7 +1427,7 @@ 
         }
 
         $result = $this->createTree($function, $result, $num_args);
-        $this->advance();         // eat the ")"
+        $this->advance(); // eat the ")"
         return $result;
     }
 

src/PhpSpreadsheet/Writer/Excel5/Worksheet.php

Doc Comments +10 added lines, -8 removed lines

@@ -200,10 +200,12 @@ 
      * @param int        &$str_unique    Total number of unique strings
      * @param array        &$str_table        String Table
      * @param array        &$colors        Colour Table
-     * @param mixed        $parser            The formula parser created for the Workbook
+     * @param Parser        $parser            The formula parser created for the Workbook
      * @param boolean    $preCalculateFormulas    Flag indicating whether formulas should be calculated or just written
      * @param string    $phpSheet        The worksheet to write
      * @param \PHPExcel\Worksheet $phpSheet
+     * @param integer $str_total
+     * @param integer $str_unique
      */
     public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet)
     {
@@ -614,7 +616,7 @@ 
      * @param integer $row    Zero indexed row
      * @param integer $col    Zero indexed column
      * @param float   $num    The number to write
-     * @param mixed   $xfIndex The optional XF format
+     * @param integer   $xfIndex The optional XF format
      * @return integer
      */
     private function writeNumber($row, $col, $num, $xfIndex)
@@ -652,7 +654,7 @@ 
      * @param int $row Row index (0-based)
      * @param int $col Column index (0-based)
      * @param string $str The string
-     * @param mixed   $xfIndex The XF format index for the cell
+     * @param integer   $xfIndex The XF format index for the cell
      * @param array $arrcRun Index to Font record and characters beginning
      */
     private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun)
@@ -720,7 +722,7 @@ 
      * @param integer $row    Zero indexed row
      * @param integer $col    Zero indexed column
      * @param string  $str    The string to write
-     * @param mixed   $xfIndex The XF format index for the cell
+     * @param integer   $xfIndex The XF format index for the cell
      * @return integer
      */
     private function writeLabelSst($row, $col, $str, $xfIndex)
@@ -785,7 +787,7 @@ 
      *
      * @param integer $row    Zero indexed row
      * @param integer $col    Zero indexed column
-     * @param mixed   $xfIndex The XF format index
+     * @param integer   $xfIndex The XF format index
      */
     public function writeBlank($row, $col, $xfIndex)
     {
@@ -830,7 +832,7 @@ 
      * @param integer $row     Zero indexed row
      * @param integer $col     Zero indexed column
      * @param string  $formula The formula text string
-     * @param mixed   $xfIndex  The XF format index
+     * @param integer   $xfIndex  The XF format index
      * @param mixed   $calculatedValue  Calculated value
      * @return integer
      */
@@ -2307,8 +2309,8 @@ 
      * @param mixed   $bitmap  The bitmap filename or GD-image resource
      * @param integer $x       The horizontal position (offset) of the image inside the cell.
      * @param integer $y       The vertical position (offset) of the image inside the cell.
-     * @param float   $scale_x The horizontal scale
-     * @param float   $scale_y The vertical scale
+     * @param integer   $scale_x The horizontal scale
+     * @param integer   $scale_y The vertical scale
      */
     public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
     {

Indentation +12 added lines, -12 removed lines

@@ -1020,8 +1020,8 @@ 
 
         // Write the packed data
         $this->append($header . $data .
-                       $unknown1 . $options .
-                       $unknown2 . $url_len . $url);
+                        $unknown1 . $options .
+                        $unknown2 . $url_len . $url);
 
         return 0;
     }
@@ -1069,8 +1069,8 @@ 
 
         // Write the packed data
         $this->append($header . $data .
-                       $unknown1 . $options .
-                       $url_len . $url);
+                        $unknown1 . $options .
+                        $url_len . $url);
 
         return 0;
     }
@@ -1151,14 +1151,14 @@ 
 
         // Pack the main data stream
         $data = pack('vvvv', $row1, $row2, $col1, $col2) .
-                          $unknown1 .
-                          $link_type .
-                          $unknown2 .
-                          $up_count .
-                          $dir_short_len .
-                          $dir_short .
-                          $unknown3 .
-                          $stream_len;/*.
+                            $unknown1 .
+                            $link_type .
+                            $unknown2 .
+                            $up_count .
+                            $dir_short_len .
+                            $dir_short .
+                            $unknown3 .
+                            $stream_len;/*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .

Spacing +219 added lines, -219 removed lines

@@ -542,7 +542,7 @@ 
         }
 
         $firstCellCoordinates = \PhpSpreadsheet\Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
-        $lastCellCoordinates = \PhpSpreadsheet\Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
+        $lastCellCoordinates = \PhpSpreadsheet\Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
 
         return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, \PhpSpreadsheet\Cell::columnIndexFromString($firstCellCoordinates[0]) - 1, \PhpSpreadsheet\Cell::columnIndexFromString($lastCellCoordinates[0]) - 1);
     }
@@ -616,8 +616,8 @@ 
      */
     private function writeNumber($row, $col, $num, $xfIndex)
     {
-        $record = 0x0203;                 // Record identifier
-        $length = 0x000E;                 // Number of bytes to follow
+        $record = 0x0203; // Record identifier
+        $length = 0x000E; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('vvv', $row, $col, $xfIndex);
@@ -655,8 +655,8 @@ 
      */
     private function writeRichTextString($row, $col, $str, $xfIndex, $arrcRun)
     {
-        $record = 0x00FD;                   // Record identifier
-        $length = 0x000A;                   // Bytes to follow
+        $record = 0x00FD; // Record identifier
+        $length = 0x000A; // Bytes to follow
         $str = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeShort($str, $arrcRun);
 
         /* check if string is already present */
@@ -687,8 +687,8 @@ 
     private function writeLabel($row, $col, $str, $xfIndex)
     {
         $strlen = strlen($str);
-        $record = 0x0204;                   // Record identifier
-        $length = 0x0008 + $strlen;         // Bytes to follow
+        $record = 0x0204; // Record identifier
+        $length = 0x0008 + $strlen; // Bytes to follow
 
         $str_error = 0;
 
@@ -722,8 +722,8 @@ 
      */
     private function writeLabelSst($row, $col, $str, $xfIndex)
     {
-        $record = 0x00FD;                   // Record identifier
-        $length = 0x000A;                   // Bytes to follow
+        $record = 0x00FD; // Record identifier
+        $length = 0x000A; // Bytes to follow
 
         $str = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($str);
 
@@ -749,8 +749,8 @@ 
     private function writeNote($row, $col, $note)
     {
         $note_length = strlen($note);
-        $record = 0x001C;            // Record identifier
-        $max_length = 2048;                // Maximun length for a NOTE record
+        $record = 0x001C; // Record identifier
+        $max_length = 2048; // Maximun length for a NOTE record
 
         // Length for this record is no more than 2048 + 6
         $length = 0x0006 + min($note_length, 2048);
@@ -787,8 +787,8 @@ 
      */
     public function writeBlank($row, $col, $xfIndex)
     {
-        $record = 0x0201;                 // Record identifier
-        $length = 0x0006;                 // Number of bytes to follow
+        $record = 0x0201; // Record identifier
+        $length = 0x0006; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('vvv', $row, $col, $xfIndex);
@@ -836,7 +836,7 @@ 
      */
     private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
     {
-        $record = 0x0006;     // Record identifier
+        $record = 0x0006; // Record identifier
 
         // Initialize possible additional value for STRING record that should be written after the FORMULA record?
         $stringValue = null;
@@ -871,8 +871,8 @@ 
             $num = pack('d', 0x00);
         }
 
-        $grbit = 0x03;                // Option flags
-        $unknown = 0x0000;            // Must be zero
+        $grbit = 0x03; // Option flags
+        $unknown = 0x0000; // Must be zero
 
         // Strip the '=' or '@' sign at the beginning of the formula string
         if ($formula{0} == '=') {
@@ -889,8 +889,8 @@ 
             $error = $this->parser->parse($formula);
             $formula = $this->parser->toReversePolish();
 
-            $formlen = strlen($formula);    // Length of the binary string
-            $length = 0x16 + $formlen;     // Length of the record data
+            $formlen = strlen($formula); // Length of the binary string
+            $length = 0x16 + $formlen; // Length of the record data
 
             $header = pack('vv', $record, $length);
 
@@ -917,7 +917,7 @@ 
      */
     private function writeStringRecord($stringValue)
     {
-        $record = 0x0207;     // Record identifier
+        $record = 0x0207; // Record identifier
         $data = \PhpSpreadsheet\Shared\StringHelper::UTF8toBIFF8UnicodeLong($stringValue);
 
         $length = strlen($data);
@@ -994,8 +994,8 @@ 
      */
     public function writeUrlWeb($row1, $col1, $row2, $col2, $url)
     {
-        $record = 0x01B8;                       // Record identifier
-        $length = 0x00000;                      // Bytes to follow
+        $record = 0x01B8; // Record identifier
+        $length = 0x00000; // Bytes to follow
 
         // Pack the undocumented parts of the hyperlink stream
         $unknown1 = pack('H*', 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
@@ -1039,8 +1039,8 @@ 
      */
     public function writeUrlInternal($row1, $col1, $row2, $col2, $url)
     {
-        $record = 0x01B8;                       // Record identifier
-        $length = 0x00000;                      // Bytes to follow
+        $record = 0x01B8; // Record identifier
+        $length = 0x00000; // Bytes to follow
 
         // Strip URL type
         $url = preg_replace('/^internal:/', '', $url);
@@ -1098,8 +1098,8 @@ 
             return; //($this->writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
         }
 
-        $record = 0x01B8;                       // Record identifier
-        $length = 0x00000;                      // Bytes to follow
+        $record = 0x01B8; // Record identifier
+        $length = 0x00000; // Bytes to follow
 
         // Strip URL type and change Unix dir separator to Dos style (if needed)
         //
@@ -1158,7 +1158,7 @@ 
                           $dir_short_len .
                           $dir_short .
                           $unknown3 .
-                          $stream_len;/*.
+                          $stream_len; /*.
                           $dir_long_len .
                           $unknown4     .
                           $dir_long     .
@@ -1187,14 +1187,14 @@ 
      */
     private function writeRow($row, $height, $xfIndex, $hidden = false, $level = 0)
     {
-        $record = 0x0208;               // Record identifier
-        $length = 0x0010;               // Number of bytes to follow
-
-        $colMic = 0x0000;               // First defined column
-        $colMac = 0x0000;               // Last defined column
-        $irwMac = 0x0000;               // Used by Excel to optimise loading
-        $reserved = 0x0000;               // Reserved
-        $grbit = 0x0000;               // Option flags
+        $record = 0x0208; // Record identifier
+        $length = 0x0010; // Number of bytes to follow
+
+        $colMic = 0x0000; // First defined column
+        $colMac = 0x0000; // Last defined column
+        $irwMac = 0x0000; // Used by Excel to optimise loading
+        $reserved = 0x0000; // Reserved
+        $grbit = 0x0000; // Option flags
         $ixfe = $xfIndex;
 
         if ($height < 0) {
@@ -1203,9 +1203,9 @@ 
 
         // Use writeRow($row, null, $XF) to set XF format without setting height
         if ($height != null) {
-            $miyRw = $height * 20;  // row height
+            $miyRw = $height * 20; // row height
         } else {
-            $miyRw = 0xff;          // default row height is 256
+            $miyRw = 0xff; // default row height is 256
         }
 
         // Set the options flags. fUnsynced is used to show that the font and row
@@ -1250,26 +1250,26 @@ 
      */
     private function writeWindow2()
     {
-        $record = 0x023E;     // Record identifier
+        $record = 0x023E; // Record identifier
         $length = 0x0012;
 
-        $grbit = 0x00B6;     // Option flags
-        $rwTop = 0x0000;     // Top row visible in window
-        $colLeft = 0x0000;     // Leftmost column visible in window
+        $grbit = 0x00B6; // Option flags
+        $rwTop = 0x0000; // Top row visible in window
+        $colLeft = 0x0000; // Leftmost column visible in window
 
         // The options flags that comprise $grbit
-        $fDspFmla = 0;                     // 0 - bit
+        $fDspFmla = 0; // 0 - bit
         $fDspGrid = $this->phpSheet->getShowGridlines() ? 1 : 0; // 1
         $fDspRwCol = $this->phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
-        $fFrozen = $this->phpSheet->getFreezePane() ? 1 : 0;        // 3
-        $fDspZeros = 1;                     // 4
-        $fDefaultHdr = 1;                     // 5
+        $fFrozen = $this->phpSheet->getFreezePane() ? 1 : 0; // 3
+        $fDspZeros = 1; // 4
+        $fDefaultHdr = 1; // 5
         $fArabic = $this->phpSheet->getRightToLeft() ? 1 : 0; // 6
-        $fDspGuts = $this->outlineOn;    // 7
-        $fFrozenNoSplit = 0;                     // 0 - bit
+        $fDspGuts = $this->outlineOn; // 7
+        $fFrozenNoSplit = 0; // 0 - bit
         // no support in PhpSpreadsheet for selected sheet, therefore sheet is only selected if it is the active sheet
         $fSelected = ($this->phpSheet === $this->phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
-        $fPaged = 1;                     // 2
+        $fPaged = 1; // 2
         $fPageBreakPreview = $this->phpSheet->getSheetView()->getView() === \PhpSpreadsheet\Worksheet\SheetView::SHEETVIEW_PAGE_BREAK_PREVIEW;
 
         $grbit = $fDspFmla;
@@ -1312,8 +1312,8 @@ 
         // convert to twips
         $defaultRowHeight = (int) 20 * $defaultRowHeight;
 
-        $record = 0x0225;      // Record identifier
-        $length = 0x0004;      // Number of bytes to follow
+        $record = 0x0225; // Record identifier
+        $length = 0x0004; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', 1, $defaultRowHeight);
@@ -1327,8 +1327,8 @@ 
     {
         $defaultColWidth = 8;
 
-        $record = 0x0055;      // Record identifier
-        $length = 0x0002;      // Number of bytes to follow
+        $record = 0x0055; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $defaultColWidth);
@@ -1377,13 +1377,13 @@ 
         } else {
             $level = 0;
         }
-        $record = 0x007D;          // Record identifier
-        $length = 0x000C;          // Number of bytes to follow
+        $record = 0x007D; // Record identifier
+        $length = 0x000C; // Number of bytes to follow
 
-        $coldx *= 256;             // Convert to units of 1/256 of a char
+        $coldx *= 256; // Convert to units of 1/256 of a char
 
         $ixfe = $xfIndex;
-        $reserved = 0x0000;            // Reserved
+        $reserved = 0x0000; // Reserved
 
         $level = max(0, min($level, 7));
         $grbit |= $level << 8;
@@ -1424,20 +1424,20 @@ 
         $rwFirst = min($rwFirst, 65535);
         $rwLast = min($rwLast, 65535);
 
-        $record = 0x001D;                  // Record identifier
-        $length = 0x000F;                  // Number of bytes to follow
+        $record = 0x001D; // Record identifier
+        $length = 0x000F; // Number of bytes to follow
 
-        $pnn = $this->activePane;     // Pane position
-        $rwAct = $rwFirst;                // Active row
-        $colAct = $colFirst;               // Active column
-        $irefAct = 0;                       // Active cell ref
-        $cref = 1;                       // Number of refs
+        $pnn = $this->activePane; // Pane position
+        $rwAct = $rwFirst; // Active row
+        $colAct = $colFirst; // Active column
+        $irefAct = 0; // Active cell ref
+        $cref = 1; // Number of refs
 
         if (!isset($rwLast)) {
-            $rwLast = $rwFirst;       // Last  row in reference
+            $rwLast = $rwFirst; // Last  row in reference
         }
         if (!isset($colLast)) {
-            $colLast = $colFirst;      // Last  col in reference
+            $colLast = $colFirst; // Last  col in reference
         }
 
         // Swap last row/col for first row/col as necessary
@@ -1621,7 +1621,7 @@ 
 
             $length = strlen($recordData);
 
-            $record = 0x0868;        // Record identifier
+            $record = 0x0868; // Record identifier
             $header = pack('vv', $record, $length);
             $this->append($header . $recordData);
         }
@@ -1641,8 +1641,8 @@ 
      */
     private function writeExterncount($count)
     {
-        $record = 0x0016;          // Record identifier
-        $length = 0x0002;          // Number of bytes to follow
+        $record = 0x0016; // Record identifier
+        $length = 0x0002; // Number of bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $count);
@@ -1659,20 +1659,20 @@ 
      */
     private function writeExternsheet($sheetname)
     {
-        $record = 0x0017;         // Record identifier
+        $record = 0x0017; // Record identifier
 
         // References to the current sheet are encoded differently to references to
         // external sheets.
         //
         if ($this->phpSheet->getTitle() == $sheetname) {
             $sheetname = '';
-            $length = 0x02;  // The following 2 bytes
-            $cch = 1;     // The following byte
-            $rgch = 0x02;  // Self reference
+            $length = 0x02; // The following 2 bytes
+            $cch = 1; // The following byte
+            $rgch = 0x02; // Self reference
         } else {
             $length = 0x02 + strlen($sheetname);
             $cch = strlen($sheetname);
-            $rgch = 0x03;  // Reference to a sheet in the current workbook
+            $rgch = 0x03; // Reference to a sheet in the current workbook
         }
 
         $header = pack('vv', $record, $length);
@@ -1707,8 +1707,8 @@ 
         } else {
             $pnnAct = null;
         }
-        $record = 0x0041;       // Record identifier
-        $length = 0x000A;       // Number of bytes to follow
+        $record = 0x0041; // Record identifier
+        $length = 0x000A; // Number of bytes to follow
 
         // Code specific to frozen or thawed panes.
         if ($this->phpSheet->getFreezePane()) {
@@ -1767,38 +1767,38 @@ 
      */
     private function writeSetup()
     {
-        $record = 0x00A1;                  // Record identifier
-        $length = 0x0022;                  // Number of bytes to follow
+        $record = 0x00A1; // Record identifier
+        $length = 0x0022; // Number of bytes to follow
 
-        $iPaperSize = $this->phpSheet->getPageSetup()->getPaperSize();    // Paper size
+        $iPaperSize = $this->phpSheet->getPageSetup()->getPaperSize(); // Paper size
 
         $iScale = $this->phpSheet->getPageSetup()->getScale() ?
-            $this->phpSheet->getPageSetup()->getScale() : 100;   // Print scaling factor
+            $this->phpSheet->getPageSetup()->getScale() : 100; // Print scaling factor
 
-        $iPageStart = 0x01;                 // Starting page number
-        $iFitWidth = (int) $this->phpSheet->getPageSetup()->getFitToWidth();    // Fit to number of pages wide
-        $iFitHeight = (int) $this->phpSheet->getPageSetup()->getFitToHeight();    // Fit to number of pages high
-        $grbit = 0x00;                 // Option flags
-        $iRes = 0x0258;               // Print resolution
-        $iVRes = 0x0258;               // Vertical print resolution
+        $iPageStart = 0x01; // Starting page number
+        $iFitWidth = (int) $this->phpSheet->getPageSetup()->getFitToWidth(); // Fit to number of pages wide
+        $iFitHeight = (int) $this->phpSheet->getPageSetup()->getFitToHeight(); // Fit to number of pages high
+        $grbit = 0x00; // Option flags
+        $iRes = 0x0258; // Print resolution
+        $iVRes = 0x0258; // Vertical print resolution
 
-        $numHdr = $this->phpSheet->getPageMargins()->getHeader();  // Header Margin
+        $numHdr = $this->phpSheet->getPageMargins()->getHeader(); // Header Margin
 
-        $numFtr = $this->phpSheet->getPageMargins()->getFooter();   // Footer Margin
-        $iCopies = 0x01;                 // Number of copies
+        $numFtr = $this->phpSheet->getPageMargins()->getFooter(); // Footer Margin
+        $iCopies = 0x01; // Number of copies
 
-        $fLeftToRight = 0x0;                     // Print over then down
+        $fLeftToRight = 0x0; // Print over then down
 
         // Page orientation
         $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == \PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE) ?
             0x0 : 0x1;
 
-        $fNoPls = 0x0;                     // Setup not read from printer
-        $fNoColor = 0x0;                     // Print black and white
-        $fDraft = 0x0;                     // Print draft quality
-        $fNotes = 0x0;                     // Print notes
-        $fNoOrient = 0x0;                     // Orientation not set
-        $fUsePage = 0x0;                     // Use custom starting page
+        $fNoPls = 0x0; // Setup not read from printer
+        $fNoColor = 0x0; // Print black and white
+        $fDraft = 0x0; // Print draft quality
+        $fNotes = 0x0; // Print notes
+        $fNoOrient = 0x0; // Orientation not set
+        $fUsePage = 0x0; // Use custom starting page
 
         $grbit = $fLeftToRight;
         $grbit |= $fLandscape << 1;
@@ -1828,7 +1828,7 @@ 
      */
     private function writeHeader()
     {
-        $record = 0x0014;               // Record identifier
+        $record = 0x0014; // Record identifier
 
         /* removing for now
         // need to fix character count (multibyte!)
@@ -1852,7 +1852,7 @@ 
      */
     private function writeFooter()
     {
-        $record = 0x0015;               // Record identifier
+        $record = 0x0015; // Record identifier
 
         /* removing for now
         // need to fix character count (multibyte!)
@@ -1876,10 +1876,10 @@ 
      */
     private function writeHcenter()
     {
-        $record = 0x0083;              // Record identifier
-        $length = 0x0002;              // Bytes to follow
+        $record = 0x0083; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $fHCenter = $this->phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0;     // Horizontal centering
+        $fHCenter = $this->phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0; // Horizontal centering
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fHCenter);
@@ -1892,10 +1892,10 @@ 
      */
     private function writeVcenter()
     {
-        $record = 0x0084;              // Record identifier
-        $length = 0x0002;              // Bytes to follow
+        $record = 0x0084; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $fVCenter = $this->phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0;     // Horizontal centering
+        $fVCenter = $this->phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0; // Horizontal centering
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fVCenter);
@@ -1907,10 +1907,10 @@ 
      */
     private function writeMarginLeft()
     {
-        $record = 0x0026;                   // Record identifier
-        $length = 0x0008;                   // Bytes to follow
+        $record = 0x0026; // Record identifier
+        $length = 0x0008; // Bytes to follow
 
-        $margin = $this->phpSheet->getPageMargins()->getLeft();     // Margin in inches
+        $margin = $this->phpSheet->getPageMargins()->getLeft(); // Margin in inches
 
         $header = pack('vv', $record, $length);
         $data = pack('d', $margin);
@@ -1926,10 +1926,10 @@ 
      */
     private function writeMarginRight()
     {
-        $record = 0x0027;                   // Record identifier
-        $length = 0x0008;                   // Bytes to follow
+        $record = 0x0027; // Record identifier
+        $length = 0x0008; // Bytes to follow
 
-        $margin = $this->phpSheet->getPageMargins()->getRight();     // Margin in inches
+        $margin = $this->phpSheet->getPageMargins()->getRight(); // Margin in inches
 
         $header = pack('vv', $record, $length);
         $data = pack('d', $margin);
@@ -1945,10 +1945,10 @@ 
      */
     private function writeMarginTop()
     {
-        $record = 0x0028;                   // Record identifier
-        $length = 0x0008;                   // Bytes to follow
+        $record = 0x0028; // Record identifier
+        $length = 0x0008; // Bytes to follow
 
-        $margin = $this->phpSheet->getPageMargins()->getTop();     // Margin in inches
+        $margin = $this->phpSheet->getPageMargins()->getTop(); // Margin in inches
 
         $header = pack('vv', $record, $length);
         $data = pack('d', $margin);
@@ -1964,10 +1964,10 @@ 
      */
     private function writeMarginBottom()
     {
-        $record = 0x0029;                   // Record identifier
-        $length = 0x0008;                   // Bytes to follow
+        $record = 0x0029; // Record identifier
+        $length = 0x0008; // Bytes to follow
 
-        $margin = $this->phpSheet->getPageMargins()->getBottom();     // Margin in inches
+        $margin = $this->phpSheet->getPageMargins()->getBottom(); // Margin in inches
 
         $header = pack('vv', $record, $length);
         $data = pack('d', $margin);
@@ -1983,10 +1983,10 @@ 
      */
     private function writePrintHeaders()
     {
-        $record = 0x002a;                   // Record identifier
-        $length = 0x0002;                   // Bytes to follow
+        $record = 0x002a; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $fPrintRwCol = $this->_print_headers;     // Boolean flag
+        $fPrintRwCol = $this->_print_headers; // Boolean flag
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fPrintRwCol);
@@ -1999,10 +1999,10 @@ 
      */
     private function writePrintGridlines()
     {
-        $record = 0x002b;                    // Record identifier
-        $length = 0x0002;                    // Bytes to follow
+        $record = 0x002b; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $fPrintGrid = $this->phpSheet->getPrintGridlines() ? 1 : 0;    // Boolean flag
+        $fPrintGrid = $this->phpSheet->getPrintGridlines() ? 1 : 0; // Boolean flag
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fPrintGrid);
@@ -2015,10 +2015,10 @@ 
      */
     private function writeGridset()
     {
-        $record = 0x0082;                        // Record identifier
-        $length = 0x0002;                        // Bytes to follow
+        $record = 0x0082; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $fGridSet = !$this->phpSheet->getPrintGridlines();     // Boolean flag
+        $fGridSet = !$this->phpSheet->getPrintGridlines(); // Boolean flag
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fGridSet);
@@ -2030,8 +2030,8 @@ 
      */
     private function writeAutoFilterInfo()
     {
-        $record = 0x009D;                        // Record identifier
-        $length = 0x0002;                        // Bytes to follow
+        $record = 0x009D; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
         $rangeBounds = \PhpSpreadsheet\Cell::rangeBoundaries($this->phpSheet->getAutoFilter()->getRange());
         $iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
@@ -2050,11 +2050,11 @@ 
      */
     private function writeGuts()
     {
-        $record = 0x0080;   // Record identifier
-        $length = 0x0008;   // Bytes to follow
+        $record = 0x0080; // Record identifier
+        $length = 0x0008; // Bytes to follow
 
-        $dxRwGut = 0x0000;   // Size of row gutter
-        $dxColGut = 0x0000;   // Size of col gutter
+        $dxRwGut = 0x0000; // Size of row gutter
+        $dxColGut = 0x0000; // Size of col gutter
 
         // determine maximum row outline level
         $maxRowOutlineLevel = 0;
@@ -2094,15 +2094,15 @@ 
      */
     private function writeWsbool()
     {
-        $record = 0x0081;   // Record identifier
-        $length = 0x0002;   // Bytes to follow
+        $record = 0x0081; // Record identifier
+        $length = 0x0002; // Bytes to follow
         $grbit = 0x0000;
 
         // The only option that is of interest is the flag for fit to page. So we
         // set all the options in one go.
         //
         // Set the option flags
-        $grbit |= 0x0001;                           // Auto page breaks visible
+        $grbit |= 0x0001; // Auto page breaks visible
         if ($this->outlineStyle) {
             $grbit |= 0x0020; // Auto outline styles
         }
@@ -2162,9 +2162,9 @@ 
                 array_shift($hbreaks);
             }
 
-            $record = 0x001b;               // Record identifier
-            $cbrk = count($hbreaks);       // Number of page breaks
-            $length = 2 + 6 * $cbrk;      // Bytes to follow
+            $record = 0x001b; // Record identifier
+            $cbrk = count($hbreaks); // Number of page breaks
+            $length = 2 + 6 * $cbrk; // Bytes to follow
 
             $header = pack('vv', $record, $length);
             $data = pack('v', $cbrk);
@@ -2189,9 +2189,9 @@ 
                 array_shift($vbreaks);
             }
 
-            $record = 0x001a;               // Record identifier
-            $cbrk = count($vbreaks);       // Number of page breaks
-            $length = 2 + 6 * $cbrk;      // Bytes to follow
+            $record = 0x001a; // Record identifier
+            $cbrk = count($vbreaks); // Number of page breaks
+            $length = 2 + 6 * $cbrk; // Bytes to follow
 
             $header = pack('vv', $record, $length);
             $data = pack('v', $cbrk);
@@ -2215,10 +2215,10 @@ 
             return;
         }
 
-        $record = 0x0012;             // Record identifier
-        $length = 0x0002;             // Bytes to follow
+        $record = 0x0012; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $fLock = 1;    // Worksheet is protected
+        $fLock = 1; // Worksheet is protected
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $fLock);
@@ -2284,10 +2284,10 @@ 
             return;
         }
 
-        $record = 0x0013;               // Record identifier
-        $length = 0x0002;               // Bytes to follow
+        $record = 0x0013; // Record identifier
+        $length = 0x0002; // Bytes to follow
 
-        $wPassword = hexdec($this->phpSheet->getProtection()->getPassword());     // Encoded password
+        $wPassword = hexdec($this->phpSheet->getProtection()->getPassword()); // Encoded password
 
         $header = pack('vv', $record, $length);
         $data = pack('v', $wPassword);
@@ -2382,8 +2382,8 @@ 
     public function positionImage($col_start, $row_start, $x1, $y1, $width, $height)
     {
         // Initialise end cell to the same as the start cell
-        $col_end = $col_start;  // Col containing lower right corner of object
-        $row_end = $row_start;  // Row containing bottom right corner of object
+        $col_end = $col_start; // Col containing lower right corner of object
+        $row_end = $row_start; // Row containing bottom right corner of object
 
         // Zero the specified offset if greater than the cell dimensions
         if ($x1 >= \PhpSpreadsheet\Shared\Excel5::sizeCol($this->phpSheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start))) {
@@ -2448,33 +2448,33 @@ 
      */
     private function writeObjPicture($colL, $dxL, $rwT, $dyT, $colR, $dxR, $rwB, $dyB)
     {
-        $record = 0x005d;   // Record identifier
-        $length = 0x003c;   // Bytes to follow
-
-        $cObj = 0x0001;   // Count of objects in file (set to 1)
-        $OT = 0x0008;   // Object type. 8 = Picture
-        $id = 0x0001;   // Object ID
-        $grbit = 0x0614;   // Option flags
-
-        $cbMacro = 0x0000;   // Length of FMLA structure
-        $Reserved1 = 0x0000;   // Reserved
-        $Reserved2 = 0x0000;   // Reserved
-
-        $icvBack = 0x09;     // Background colour
-        $icvFore = 0x09;     // Foreground colour
-        $fls = 0x00;     // Fill pattern
-        $fAuto = 0x00;     // Automatic fill
-        $icv = 0x08;     // Line colour
-        $lns = 0xff;     // Line style
-        $lnw = 0x01;     // Line weight
-        $fAutoB = 0x00;     // Automatic border
-        $frs = 0x0000;   // Frame style
-        $cf = 0x0009;   // Image format, 9 = bitmap
-        $Reserved3 = 0x0000;   // Reserved
-        $cbPictFmla = 0x0000;   // Length of FMLA structure
-        $Reserved4 = 0x0000;   // Reserved
-        $grbit2 = 0x0001;   // Option flags
-        $Reserved5 = 0x0000;   // Reserved
+        $record = 0x005d; // Record identifier
+        $length = 0x003c; // Bytes to follow
+
+        $cObj = 0x0001; // Count of objects in file (set to 1)
+        $OT = 0x0008; // Object type. 8 = Picture
+        $id = 0x0001; // Object ID
+        $grbit = 0x0614; // Option flags
+
+        $cbMacro = 0x0000; // Length of FMLA structure
+        $Reserved1 = 0x0000; // Reserved
+        $Reserved2 = 0x0000; // Reserved
+
+        $icvBack = 0x09; // Background colour
+        $icvFore = 0x09; // Foreground colour
+        $fls = 0x00; // Fill pattern
+        $fAuto = 0x00; // Automatic fill
+        $icv = 0x08; // Line colour
+        $lns = 0xff; // Line style
+        $lnw = 0x01; // Line weight
+        $fAutoB = 0x00; // Automatic border
+        $frs = 0x0000; // Frame style
+        $cf = 0x0009; // Image format, 9 = bitmap
+        $Reserved3 = 0x0000; // Reserved
+        $cbPictFmla = 0x0000; // Length of FMLA structure
+        $Reserved4 = 0x0000; // Reserved
+        $grbit2 = 0x0001; // Option flags
+        $Reserved5 = 0x0000; // Reserved
 
         $header = pack('vv', $record, $length);
         $data = pack('V', $cObj);
@@ -2636,8 +2636,8 @@ 
             return;
         }
 
-        $record = 0x00A0;               // Record identifier
-        $length = 0x0004;               // Bytes to follow
+        $record = 0x00A0; // Record identifier
+        $length = 0x0004; // Bytes to follow
 
         $header = pack('vv', $record, $length);
         $data = pack('vv', $this->phpSheet->getSheetView()->getZoomScale(), 100);
@@ -2682,7 +2682,7 @@ 
             $nm = count($spOffsets) - 1; // number of shapes excluding first shape
             for ($i = 1; $i <= $nm; ++$i) {
                 // MSODRAWING record
-                $record = 0x00EC;            // Record identifier
+                $record = 0x00EC; // Record identifier
 
                 // chunk of Escher stream for one shape
                 $dataChunk = substr($data, $spOffsets[$i - 1], $spOffsets[$i] - $spOffsets[$i - 1]);
@@ -2760,20 +2760,20 @@ 
         // Write data validations?
         if (!empty($dataValidationCollection)) {
             // DATAVALIDATIONS record
-            $record = 0x01B2;      // Record identifier
-            $length = 0x0012;      // Bytes to follow
+            $record = 0x01B2; // Record identifier
+            $length = 0x0012; // Bytes to follow
 
-            $grbit = 0x0000;       // Prompt box at cell, no cached validity data at DV records
-            $horPos = 0x00000000;  // Horizontal position of prompt box, if fixed position
-            $verPos = 0x00000000;  // Vertical position of prompt box, if fixed position
-            $objId = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
+            $grbit = 0x0000; // Prompt box at cell, no cached validity data at DV records
+            $horPos = 0x00000000; // Horizontal position of prompt box, if fixed position
+            $verPos = 0x00000000; // Vertical position of prompt box, if fixed position
+            $objId = 0xFFFFFFFF; // Object identifier of drop down arrow object, or -1 if not visible
 
             $header = pack('vv', $record, $length);
             $data = pack('vVVVV', $grbit, $horPos, $verPos, $objId, count($dataValidationCollection));
             $this->append($header . $data);
 
             // DATAVALIDATION records
-            $record = 0x01BE;              // Record identifier
+            $record = 0x01BE; // Record identifier
 
             foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
                 // initialize record data
@@ -2973,8 +2973,8 @@ 
      */
     private function writePageLayoutView()
     {
-        $record = 0x088B;               // Record identifier
-        $length = 0x0010;               // Bytes to follow
+        $record = 0x088B; // Record identifier
+        $length = 0x0010; // Bytes to follow
 
         $rt = 0x088B; // 2
         $grbitFrt = 0x0000; // 2
@@ -3005,7 +3005,7 @@ 
      */
     private function writeCFRule(\PhpSpreadsheet\Style\Conditional $conditional)
     {
-        $record = 0x01B1;               // Record identifier
+        $record = 0x01B1; // Record identifier
 
         // $type : Type of the CF
         // $operatorType : Comparison operator
@@ -3125,43 +3125,43 @@ 
         }
         // Alignment
         $flags = 0;
-        $flags |= (1 == $bAlignHz      ? 0x00000001 : 0);
-        $flags |= (1 == $bAlignVt      ? 0x00000002 : 0);
-        $flags |= (1 == $bAlignWrapTx  ? 0x00000004 : 0);
-        $flags |= (1 == $bTxRotation   ? 0x00000008 : 0);
+        $flags |= (1 == $bAlignHz ? 0x00000001 : 0);
+        $flags |= (1 == $bAlignVt ? 0x00000002 : 0);
+        $flags |= (1 == $bAlignWrapTx ? 0x00000004 : 0);
+        $flags |= (1 == $bTxRotation ? 0x00000008 : 0);
         // Justify last line flag
-        $flags |= (1 == 1              ? 0x00000010 : 0);
-        $flags |= (1 == $bIndent       ? 0x00000020 : 0);
-        $flags |= (1 == $bShrinkToFit  ? 0x00000040 : 0);
+        $flags |= (1 == 1 ? 0x00000010 : 0);
+        $flags |= (1 == $bIndent ? 0x00000020 : 0);
+        $flags |= (1 == $bShrinkToFit ? 0x00000040 : 0);
         // Default
-        $flags |= (1 == 1              ? 0x00000080 : 0);
+        $flags |= (1 == 1 ? 0x00000080 : 0);
         // Protection
-        $flags |= (1 == $bProtLocked   ? 0x00000100 : 0);
-        $flags |= (1 == $bProtHidden   ? 0x00000200 : 0);
+        $flags |= (1 == $bProtLocked ? 0x00000100 : 0);
+        $flags |= (1 == $bProtHidden ? 0x00000200 : 0);
         // Border
-        $flags |= (1 == $bBorderLeft   ? 0x00000400 : 0);
-        $flags |= (1 == $bBorderRight  ? 0x00000800 : 0);
-        $flags |= (1 == $bBorderTop    ? 0x00001000 : 0);
+        $flags |= (1 == $bBorderLeft ? 0x00000400 : 0);
+        $flags |= (1 == $bBorderRight ? 0x00000800 : 0);
+        $flags |= (1 == $bBorderTop ? 0x00001000 : 0);
         $flags |= (1 == $bBorderBottom ? 0x00002000 : 0);
-        $flags |= (1 == 1              ? 0x00004000 : 0); // Top left to Bottom right border
-        $flags |= (1 == 1              ? 0x00008000 : 0); // Bottom left to Top right border
+        $flags |= (1 == 1 ? 0x00004000 : 0); // Top left to Bottom right border
+        $flags |= (1 == 1 ? 0x00008000 : 0); // Bottom left to Top right border
         // Pattern
-        $flags |= (1 == $bFillStyle    ? 0x00010000 : 0);
-        $flags |= (1 == $bFillColor    ? 0x00020000 : 0);
-        $flags |= (1 == $bFillColorBg  ? 0x00040000 : 0);
-        $flags |= (1 == 1              ? 0x00380000 : 0);
+        $flags |= (1 == $bFillStyle ? 0x00010000 : 0);
+        $flags |= (1 == $bFillColor ? 0x00020000 : 0);
+        $flags |= (1 == $bFillColorBg ? 0x00040000 : 0);
+        $flags |= (1 == 1 ? 0x00380000 : 0);
         // Font
-        $flags |= (1 == $bFormatFont   ? 0x04000000 : 0);
+        $flags |= (1 == $bFormatFont ? 0x04000000 : 0);
         // Alignment:
-        $flags |= (1 == $bFormatAlign  ? 0x08000000 : 0);
+        $flags |= (1 == $bFormatAlign ? 0x08000000 : 0);
         // Border
         $flags |= (1 == $bFormatBorder ? 0x10000000 : 0);
         // Pattern
-        $flags |= (1 == $bFormatFill   ? 0x20000000 : 0);
+        $flags |= (1 == $bFormatFill ? 0x20000000 : 0);
         // Protection
-        $flags |= (1 == $bFormatProt   ? 0x40000000 : 0);
+        $flags |= (1 == $bFormatProt ? 0x40000000 : 0);
         // Text direction
-        $flags |= (1 == 0              ? 0x80000000 : 0);
+        $flags |= (1 == 0 ? 0x80000000 : 0);
 
         // Data Blocks
         if ($bFormatFont == 1) {
@@ -3406,11 +3406,11 @@ 
             // Options flags for modified font attributes
             $optionsFlags = 0;
             $optionsFlagsBold = ($conditional->getStyle()->getFont()->getBold() == null ? 1 : 0);
-            $optionsFlags |= (1 == $optionsFlagsBold  ? 0x00000002 : 0);
-            $optionsFlags |= (1 == 1                  ? 0x00000008 : 0);
-            $optionsFlags |= (1 == 1                  ? 0x00000010 : 0);
-            $optionsFlags |= (1 == 0                  ? 0x00000020 : 0);
-            $optionsFlags |= (1 == 1                  ? 0x00000080 : 0);
+            $optionsFlags |= (1 == $optionsFlagsBold ? 0x00000002 : 0);
+            $optionsFlags |= (1 == 1 ? 0x00000008 : 0);
+            $optionsFlags |= (1 == 1 ? 0x00000010 : 0);
+            $optionsFlags |= (1 == 0 ? 0x00000020 : 0);
+            $optionsFlags |= (1 == 1 ? 0x00000080 : 0);
             $dataBlockFont .= pack('V', $optionsFlags);
             // Escapement type
             $dataBlockFont .= pack('V', $fontEscapement);
@@ -3781,10 +3781,10 @@ 
                     break;
                 case \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_LINEAR:
                     $blockFillPatternStyle = 0x00;
-                    break;    // does not exist in BIFF8
+                    break; // does not exist in BIFF8
                 case \PhpSpreadsheet\Style\Fill::FILL_GRADIENT_PATH:
                     $blockFillPatternStyle = 0x00;
-                    break;    // does not exist in BIFF8
+                    break; // does not exist in BIFF8
                 default:
                     $blockFillPatternStyle = 0x00;
                     break;
@@ -4181,8 +4181,8 @@ 
      */
     private function writeCFHeader()
     {
-        $record = 0x01B0;               // Record identifier
-        $length = 0x0016;               // Bytes to follow
+        $record = 0x01B0; // Record identifier
+        $length = 0x0016; // Bytes to follow
 
         $numColumnMin = null;
         $numColumnMax = null;

Examples/29advancedvaluebinder.php

Indentation +34 added lines, -34 removed lines

@@ -51,12 +51,12 @@ 
 // Set document properties
 echo date('H:i:s') , " Set document properties" , EOL;
 $objPHPExcel->getProperties()->setCreator("Maarten Balliauw")
-							 ->setLastModifiedBy("Maarten Balliauw")
-							 ->setTitle("Office 2007 XLSX Test Document")
-							 ->setSubject("Office 2007 XLSX Test Document")
-							 ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
-							 ->setKeywords("office 2007 openxml php")
-							 ->setCategory("Test result file");
+                                ->setLastModifiedBy("Maarten Balliauw")
+                                ->setTitle("Office 2007 XLSX Test Document")
+                                ->setSubject("Office 2007 XLSX Test Document")
+                                ->setDescription("Test document for Office 2007 XLSX, generated using PHP classes.")
+                                ->setKeywords("office 2007 openxml php")
+                                ->setCategory("Test result file");
 
 // Set default font
 echo date('H:i:s') , " Set default font" , EOL;
@@ -71,88 +71,88 @@ 
 // Add some data, resembling some different data types
 echo date('H:i:s') , " Add some data" , EOL;
 $objPHPExcel->getActiveSheet()->setCellValue('A1', 'String value:')
-                              ->setCellValue('B1', 'Mark Baker');
+                                ->setCellValue('B1', 'Mark Baker');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A2', 'Numeric value #1:')
-                              ->setCellValue('B2', 12345);
+                                ->setCellValue('B2', 12345);
 
 $objPHPExcel->getActiveSheet()->setCellValue('A3', 'Numeric value #2:')
-                              ->setCellValue('B3', -12.345);
+                                ->setCellValue('B3', -12.345);
 
 $objPHPExcel->getActiveSheet()->setCellValue('A4', 'Numeric value #3:')
-                              ->setCellValue('B4', .12345);
+                                ->setCellValue('B4', .12345);
 
 $objPHPExcel->getActiveSheet()->setCellValue('A5', 'Numeric value #4:')
-                              ->setCellValue('B5', '12345');
+                                ->setCellValue('B5', '12345');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A6', 'Numeric value #5:')
-                              ->setCellValue('B6', '1.2345');
+                                ->setCellValue('B6', '1.2345');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A7', 'Numeric value #6:')
-                              ->setCellValue('B7', '.12345');
+                                ->setCellValue('B7', '.12345');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A8', 'Numeric value #7:')
-                              ->setCellValue('B8', '1.234e-5');
+                                ->setCellValue('B8', '1.234e-5');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A9', 'Numeric value #8:')
-                              ->setCellValue('B9', '-1.234e+5');
+                                ->setCellValue('B9', '-1.234e+5');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A10', 'Boolean value:')
-                              ->setCellValue('B10', 'TRUE');
+                                ->setCellValue('B10', 'TRUE');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A11', 'Percentage value #1:')
-                              ->setCellValue('B11', '10%');
+                                ->setCellValue('B11', '10%');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A12', 'Percentage value #2:')
-                              ->setCellValue('B12', '12.5%');
+                                ->setCellValue('B12', '12.5%');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A13', 'Fraction value #1:')
-                              ->setCellValue('B13', '-1/2');
+                                ->setCellValue('B13', '-1/2');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A14', 'Fraction value #2:')
-                              ->setCellValue('B14', '3 1/2');
+                                ->setCellValue('B14', '3 1/2');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A15', 'Fraction value #3:')
-                              ->setCellValue('B15', '-12 3/4');
+                                ->setCellValue('B15', '-12 3/4');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A16', 'Fraction value #4:')
-                              ->setCellValue('B16', '13/4');
+                                ->setCellValue('B16', '13/4');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A17', 'Currency value #1:')
-                              ->setCellValue('B17', '$12345');
+                                ->setCellValue('B17', '$12345');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A18', 'Currency value #2:')
-                              ->setCellValue('B18', '$12345.67');
+                                ->setCellValue('B18', '$12345.67');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A19', 'Currency value #3:')
-                              ->setCellValue('B19', '$12,345.67');
+                                ->setCellValue('B19', '$12,345.67');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A20', 'Date value #1:')
-                              ->setCellValue('B20', '21 December 1983');
+                                ->setCellValue('B20', '21 December 1983');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A21', 'Date value #2:')
-                              ->setCellValue('B21', '19-Dec-1960');
+                                ->setCellValue('B21', '19-Dec-1960');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A22', 'Date value #3:')
-                              ->setCellValue('B22', '07/12/1982');
+                                ->setCellValue('B22', '07/12/1982');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A23', 'Date value #4:')
-                              ->setCellValue('B23', '24-11-1950');
+                                ->setCellValue('B23', '24-11-1950');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A24', 'Date value #5:')
-                              ->setCellValue('B24', '17-Mar');
+                                ->setCellValue('B24', '17-Mar');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A25', 'Time value #1:')
-                              ->setCellValue('B25', '01:30');
+                                ->setCellValue('B25', '01:30');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A26', 'Time value #2:')
-                              ->setCellValue('B26', '01:30:15');
+                                ->setCellValue('B26', '01:30:15');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A27', 'Date/Time value:')
-                              ->setCellValue('B27', '19-Dec-1960 01:30');
+                                ->setCellValue('B27', '19-Dec-1960 01:30');
 
 $objPHPExcel->getActiveSheet()->setCellValue('A28', 'Formula:')
-                              ->setCellValue('B28', '=SUM(B2:B9)');
+                                ->setCellValue('B28', '=SUM(B2:B9)');
 
 // Rename worksheet
 echo date('H:i:s') , " Rename worksheet" , EOL;

Spacing +17 added lines, -17 removed lines

@@ -30,26 +30,26 @@ 
 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 />');
 
 /** PHPExcel */
 require_once dirname(__FILE__) . '/../src/Bootstrap.php';
 
 
 // Set timezone
-echo date('H:i:s') , " Set timezone" , EOL;
+echo date('H:i:s'), " Set timezone", EOL;
 date_default_timezone_set('UTC');
 
 // Set value binder
-echo date('H:i:s') , " Set value binder" , EOL;
-\PHPExcel\Cell::setValueBinder( new \PHPExcel\Cell\AdvancedValueBinder() );
+echo date('H:i:s'), " Set value binder", EOL;
+\PHPExcel\Cell::setValueBinder(new \PHPExcel\Cell\AdvancedValueBinder());
 
 // 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")
@@ -59,17 +59,17 @@ 
 							 ->setCategory("Test result file");
 
 // Set default font
-echo date('H:i:s') , " Set default font" , EOL;
+echo date('H:i:s'), " Set default font", EOL;
 $objPHPExcel->getActiveSheet()->getDefaultStyle()->getFont()->setName('Arial');
 $objPHPExcel->getActiveSheet()->getDefaultStyle()->getFont()->setSize(10);
 
 // Set column widths
-echo date('H:i:s') , " Set column widths" , EOL;
+echo date('H:i:s'), " Set column widths", EOL;
 $objPHPExcel->getActiveSheet()->getColumnDimension('A')->setAutoSize(true);
 $objPHPExcel->getActiveSheet()->getColumnDimension('B')->setWidth(14);
 
 // Add some data, resembling some different data types
-echo date('H:i:s') , " Add some data" , EOL;
+echo date('H:i:s'), " Add some data", EOL;
 $objPHPExcel->getActiveSheet()->setCellValue('A1', 'String value:')
                               ->setCellValue('B1', 'Mark Baker');
 
@@ -155,7 +155,7 @@ 
                               ->setCellValue('B28', '=SUM(B2:B9)');
 
 // Rename worksheet
-echo date('H:i:s') , " Rename worksheet" , EOL;
+echo date('H:i:s'), " Rename worksheet", EOL;
 $objPHPExcel->getActiveSheet()->setTitle('Advanced value binder');
 
 
@@ -164,20 +164,20 @@ 
 
 
 // Save Excel 2007 file
-echo date('H:i:s') , " Write to Excel2007 format" , EOL;
+echo date('H:i:s'), " Write to Excel2007 format", EOL;
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007');
 $objWriter->save(str_replace('.php', '.xlsx', __FILE__));
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xlsx', pathinfo(__FILE__, PATHINFO_BASENAME)), EOL;
 // Save Excel5 file
-echo date('H:i:s') , " Write to Excel5 format" , EOL;
+echo date('H:i:s'), " Write to Excel5 format", EOL;
 $objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5');
 $objWriter->save(str_replace('.php', '.xls', __FILE__));
-echo date('H:i:s') , " File written to " , str_replace('.php', '.xls', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
+echo date('H:i:s'), " File written to ", str_replace('.php', '.xls', 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/XMLReader.php

Spacing +6 added lines, -6 removed lines

@@ -34,12 +34,12 @@ 
 require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php';

 

 

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

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

 $inputFileName = "XMLTest.xml";

 

 /**  Identify the type of $inputFileName  **/

 $inputFileType = \PHPExcel\IOFactory::identify($inputFileName);

-echo 'Loading ' , $inputFileName , ' using ' , $inputFileType , " Reader" , PHP_EOL;

+echo 'Loading ', $inputFileName, ' using ', $inputFileType, " Reader", PHP_EOL;

 

 /**  Create a new Reader of the type that has been identified  **/

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

@@ -47,14 +47,14 @@ 
 $objPHPExcel = $objReader->load($inputFileName);

 

 

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

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

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

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

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

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

 

 

 // Echo memory peak usage

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

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

 

 // Echo done

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

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