PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Reader/OOCalc.php

Spacing +4 added lines, -4 removed lines

@@ -626,10 +626,10 @@
                                     foreach ($temp as &$value) {
                                         //    Only replace in alternate array entries (i.e. non-quoted blocks)
                                         if ($tKey = !$tKey) {
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value);    //  Cell range reference in another sheet
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value);       //  Cell reference in another sheet
-                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value);    //  Cell range reference
-                                            $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value);                  //  Simple cell reference
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value); //  Cell range reference in another sheet
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value); //  Cell reference in another sheet
+                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value); //  Cell range reference
+                                            $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value); //  Simple cell reference
                                             $value = \PhpSpreadsheet\Calculation::translateSeparator(';', ',', $value, $inBraces);
                                         }
                                     }

src/PhpSpreadsheet/Reader/Gnumeric.php

Spacing +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
         $worksheetNames = [];
         while ($xml->read()) {
             if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
-                $xml->read();    //    Move onto the value node
+                $xml->read(); //    Move onto the value node
                 $worksheetNames[] = (string) $xml->value;
             } elseif ($xml->name == 'gnm:Sheets') {
                 //    break out of the loop once we've got our sheet names rather than parse the entire file
@@ -143,14 +143,14 @@ 
 
                 while ($xml->read()) {
                     if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read();    //    Move onto the value node
+                        $xml->read(); //    Move onto the value node
                         $tmpInfo['worksheetName'] = (string) $xml->value;
                     } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read();    //    Move onto the value node
+                        $xml->read(); //    Move onto the value node
                         $tmpInfo['lastColumnIndex'] = (int) $xml->value;
                         $tmpInfo['totalColumns'] = (int) $xml->value + 1;
                     } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read();    //    Move onto the value node
+                        $xml->read(); //    Move onto the value node
                         $tmpInfo['totalRows'] = (int) $xml->value + 1;
                         break;
                     }
@@ -349,7 +349,7 @@ 
                 if (isset($sheet->PrintInformation->Margins)) {
                     foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) {
                         $marginAttributes = $margin->attributes();
-                        $marginSize = 72 / 100;    //    Default
+                        $marginSize = 72 / 100; //    Default
                         switch ($marginAttributes['PrefUnit']) {
                             case 'mm':
                                 $marginSize = intval($marginAttributes['Points']) / 100;
@@ -435,7 +435,7 @@ 
                             break;
                         case '20':        //    Boolean
                             $type = \PhpSpreadsheet\Cell\DataType::TYPE_BOOL;
-                            $cell = ($cell == 'TRUE') ? true: false;
+                            $cell = ($cell == 'TRUE') ? true : false;
                             break;
                         case '30':        //    Integer
                             $cell = intval($cell);

src/PhpSpreadsheet/Shared/Font.php

Indentation +27 added lines, -27 removed lines

@@ -143,40 +143,40 @@
      */
     public static $defaultColumnWidths = [
         'Arial' => [
-             1 => ['px' => 24, 'width' => 12.00000000],
-             2 => ['px' => 24, 'width' => 12.00000000],
-             3 => ['px' => 32, 'width' => 10.66406250],
-             4 => ['px' => 32, 'width' => 10.66406250],
-             5 => ['px' => 40, 'width' => 10.00000000],
-             6 => ['px' => 48, 'width' => 9.59765625],
-             7 => ['px' => 48, 'width' => 9.59765625],
-             8 => ['px' => 56, 'width' => 9.33203125],
-             9 => ['px' => 64, 'width' => 9.14062500],
+                1 => ['px' => 24, 'width' => 12.00000000],
+                2 => ['px' => 24, 'width' => 12.00000000],
+                3 => ['px' => 32, 'width' => 10.66406250],
+                4 => ['px' => 32, 'width' => 10.66406250],
+                5 => ['px' => 40, 'width' => 10.00000000],
+                6 => ['px' => 48, 'width' => 9.59765625],
+                7 => ['px' => 48, 'width' => 9.59765625],
+                8 => ['px' => 56, 'width' => 9.33203125],
+                9 => ['px' => 64, 'width' => 9.14062500],
             10 => ['px' => 64, 'width' => 9.14062500],
         ],
         'Calibri' => [
-             1 => ['px' => 24, 'width' => 12.00000000],
-             2 => ['px' => 24, 'width' => 12.00000000],
-             3 => ['px' => 32, 'width' => 10.66406250],
-             4 => ['px' => 32, 'width' => 10.66406250],
-             5 => ['px' => 40, 'width' => 10.00000000],
-             6 => ['px' => 48, 'width' => 9.59765625],
-             7 => ['px' => 48, 'width' => 9.59765625],
-             8 => ['px' => 56, 'width' => 9.33203125],
-             9 => ['px' => 56, 'width' => 9.33203125],
+                1 => ['px' => 24, 'width' => 12.00000000],
+                2 => ['px' => 24, 'width' => 12.00000000],
+                3 => ['px' => 32, 'width' => 10.66406250],
+                4 => ['px' => 32, 'width' => 10.66406250],
+                5 => ['px' => 40, 'width' => 10.00000000],
+                6 => ['px' => 48, 'width' => 9.59765625],
+                7 => ['px' => 48, 'width' => 9.59765625],
+                8 => ['px' => 56, 'width' => 9.33203125],
+                9 => ['px' => 56, 'width' => 9.33203125],
             10 => ['px' => 64, 'width' => 9.14062500],
             11 => ['px' => 64, 'width' => 9.14062500],
         ],
         'Verdana' => [
-             1 => ['px' => 24, 'width' => 12.00000000],
-             2 => ['px' => 24, 'width' => 12.00000000],
-             3 => ['px' => 32, 'width' => 10.66406250],
-             4 => ['px' => 32, 'width' => 10.66406250],
-             5 => ['px' => 40, 'width' => 10.00000000],
-             6 => ['px' => 48, 'width' => 9.59765625],
-             7 => ['px' => 48, 'width' => 9.59765625],
-             8 => ['px' => 64, 'width' => 9.14062500],
-             9 => ['px' => 72, 'width' => 9.00000000],
+                1 => ['px' => 24, 'width' => 12.00000000],
+                2 => ['px' => 24, 'width' => 12.00000000],
+                3 => ['px' => 32, 'width' => 10.66406250],
+                4 => ['px' => 32, 'width' => 10.66406250],
+                5 => ['px' => 40, 'width' => 10.00000000],
+                6 => ['px' => 48, 'width' => 9.59765625],
+                7 => ['px' => 48, 'width' => 9.59765625],
+                8 => ['px' => 64, 'width' => 9.14062500],
+                9 => ['px' => 72, 'width' => 9.00000000],
             10 => ['px' => 72, 'width' => 9.00000000],
         ],
     ];

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     const CHARSET_ANSI_JAPANESE_SHIFTJIS = 0x80;
     const CHARSET_ANSI_KOREAN_HANGUL = 0x81;
     const CHARSET_ANSI_KOREAN_JOHAB = 0x82;
-    const CHARSET_ANSI_CHINESE_SIMIPLIFIED = 0x86;        //    gb2312
-    const CHARSET_ANSI_CHINESE_TRADITIONAL = 0x88;        //    big5
+    const CHARSET_ANSI_CHINESE_SIMIPLIFIED = 0x86; //    gb2312
+    const CHARSET_ANSI_CHINESE_TRADITIONAL = 0x88; //    big5
     const CHARSET_ANSI_GREEK = 0xA1;
     const CHARSET_ANSI_TURKISH = 0xA2;
     const CHARSET_ANSI_VIETNAMESE = 0xA3;

src/PhpSpreadsheet/Shared/PCLZip/PclZip.php

Indentation +25 added lines, -25 removed lines

@@ -541,12 +541,12 @@ 
 
         // ----- For each file in the list check the attributes
         $v_supported_attributes = [
-          PCLZIP_ATT_FILE_NAME => 'mandatory',
-          PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
-          PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
-          PCLZIP_ATT_FILE_MTIME => 'optional',
-          PCLZIP_ATT_FILE_CONTENT => 'optional',
-          PCLZIP_ATT_FILE_COMMENT => 'optional',
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional',
         ];
         foreach ($v_att_list as $v_entry) {
             $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
@@ -704,25 +704,25 @@ 
             if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
                 // ----- Parse the options
                 $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, [
-                  PCLZIP_OPT_PATH => 'optional',
-                  PCLZIP_OPT_REMOVE_PATH => 'optional',
-                  PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                  PCLZIP_OPT_ADD_PATH => 'optional',
-                  PCLZIP_CB_PRE_EXTRACT => 'optional',
-                  PCLZIP_CB_POST_EXTRACT => 'optional',
-                  PCLZIP_OPT_SET_CHMOD => 'optional',
-                  PCLZIP_OPT_BY_NAME => 'optional',
-                  PCLZIP_OPT_BY_EREG => 'optional',
-                  PCLZIP_OPT_BY_PREG => 'optional',
-                  PCLZIP_OPT_BY_INDEX => 'optional',
-                  PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                  PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                  PCLZIP_OPT_REPLACE_NEWER => 'optional',
-                  PCLZIP_OPT_STOP_ON_ERROR => 'optional',
-                  PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                  PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                  PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                  PCLZIP_OPT_TEMP_FILE_OFF => 'optional',
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_BY_NAME => 'optional',
+                    PCLZIP_OPT_BY_EREG => 'optional',
+                    PCLZIP_OPT_BY_PREG => 'optional',
+                    PCLZIP_OPT_BY_INDEX => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional',
                 ]);
                 if ($v_result != 1) {
                     return 0;

Spacing +2 added lines, -2 removed lines

@@ -2592,7 +2592,7 @@ 
                 // ----- Set the file properties
                 $p_header['size'] = 0;
                 //$p_header['external'] = 0x41FF0010;     // Value for a folder : to be checked
-                $p_header['external'] = 0x00000010;     // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
                 // ----- Call the header generation
                 if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
@@ -4980,7 +4980,7 @@ 
                 if ($v_skip > 0) {
                     --$v_skip;
                 } else {
-                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1)?'/' . $v_result:'');
+                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/' . $v_result : '');
                 }
             }
         }

src/PhpSpreadsheet/Shared/Excel5.php

Spacing +2 added lines, -2 removed lines

@@ -233,8 +233,8 @@
         $y1 = $offsetY;
 
         // 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 >= self::sizeCol($sheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start))) {

src/PhpSpreadsheet/Shared/PasswordHasher.php

Spacing +4 added lines, -4 removed lines

@@ -41,14 +41,14 @@
     public static function hashPassword($pPassword = '')
     {
         $password = 0x0000;
-        $charPos = 1;       // char position
+        $charPos = 1; // char position
 
         // split the plain text password in its component characters
         $chars = preg_split('//', $pPassword, -1, PREG_SPLIT_NO_EMPTY);
         foreach ($chars as $char) {
-            $value = ord($char) << $charPos++;    // shifted ASCII value
-            $rotated_bits = $value >> 15;                // rotated bits beyond bit 15
-            $value &= 0x7fff;                    // first 15 bits
+            $value = ord($char) << $charPos++; // shifted ASCII value
+            $rotated_bits = $value >> 15; // rotated bits beyond bit 15
+            $value &= 0x7fff; // first 15 bits
             $password ^= ($value | $rotated_bits);
         }
 

src/PhpSpreadsheet/Shared/OLE/PPS.php

Indentation +15 added lines, -15 removed lines

@@ -170,21 +170,21 @@
         $ret = str_pad($this->Name, 64, "\x00");
 
         $ret .= pack('v', strlen($this->Name) + 2)  // 66
-              . pack('c', $this->Type)              // 67
-              . pack('c', 0x00) //UK                // 68
-              . pack('V', $this->PrevPps) //Prev    // 72
-              . pack('V', $this->NextPps) //Next    // 76
-              . pack('V', $this->DirPps)  //Dir     // 80
-              . "\x00\x09\x02\x00"                  // 84
-              . "\x00\x00\x00\x00"                  // 88
-              . "\xc0\x00\x00\x00"                  // 92
-              . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
-              . "\x00\x00\x00\x00"                  // 100
-              . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st)          // 108
-              . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd)          // 116
-              . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
-              . pack('V', $this->Size)               // 124
-              . pack('V', 0);                        // 128
+                . pack('c', $this->Type)              // 67
+                . pack('c', 0x00) //UK                // 68
+                . pack('V', $this->PrevPps) //Prev    // 72
+                . pack('V', $this->NextPps) //Next    // 76
+                . pack('V', $this->DirPps)  //Dir     // 80
+                . "\x00\x09\x02\x00"                  // 84
+                . "\x00\x00\x00\x00"                  // 88
+                . "\xc0\x00\x00\x00"                  // 92
+                . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
+                . "\x00\x00\x00\x00"                  // 100
+                . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st)          // 108
+                . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd)          // 116
+                . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
+                . pack('V', $this->Size)               // 124
+                . pack('V', 0);                        // 128
         return $ret;
     }
 

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
               . \PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd)          // 116
               . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
               . pack('V', $this->Size)               // 124
-              . pack('V', 0);                        // 128
+              . pack('V', 0); // 128
         return $ret;
     }
 

src/PhpSpreadsheet/Worksheet/AutoFilter.php

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

Spacing +1 added lines, -2 removed lines

@@ -137,8 +137,7 @@
         $this->rotation = 0;
         $this->shadow = new Drawing\Shadow();
 
-        // Set image index
-        ++self::$imageCounter;
+        // Set image index++self::$imageCounter;
         $this->imageIndex = self::$imageCounter;
     }