@@ -219,8 +219,8 @@ |
||
219 | 219 | } |
220 | 220 | $spreadsheet->setActiveSheetIndex($this->sheetIndex); |
221 | 221 | |
222 | - $fromFormats = ['\-', '\ ']; |
|
223 | - $toFormats = ['-', ' ']; |
|
222 | + $fromFormats = ['\-', '\ ']; |
|
223 | + $toFormats = ['-', ' ']; |
|
224 | 224 | |
225 | 225 | // Loop through file |
226 | 226 | $rowData = []; |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | 'SimpleXMLElement', |
137 | 137 | \PhpSpreadsheet\Settings::getLibXmlLoaderOptions() |
138 | 138 | ) |
139 | - ); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main" |
|
139 | + ); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main" |
|
140 | 140 | |
141 | 141 | if ($xmlWorkbook->sheets) { |
142 | 142 | foreach ($xmlWorkbook->sheets->sheet as $eleSheet) { |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | } |
542 | 542 | |
543 | 543 | if (!is_null($macros)) { |
544 | - $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin');//vbaProject.bin always in 'xl' dir and always named vbaProject.bin |
|
544 | + $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin'); //vbaProject.bin always in 'xl' dir and always named vbaProject.bin |
|
545 | 545 | if ($macrosCode !== false) { |
546 | 546 | $excel->setMacrosCode($macrosCode); |
547 | 547 | $excel->setHasMacros(true); |
@@ -1313,7 +1313,7 @@ discard block |
||
1313 | 1313 | foreach (\PhpSpreadsheet\Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) { |
1314 | 1314 | $cell = $docSheet->getCell($cellReference); |
1315 | 1315 | if (isset($linkRel['id'])) { |
1316 | - $hyperlinkUrl = $hyperlinks[ (string) $linkRel['id'] ]; |
|
1316 | + $hyperlinkUrl = $hyperlinks[(string) $linkRel['id']]; |
|
1317 | 1317 | if (isset($hyperlink['location'])) { |
1318 | 1318 | $hyperlinkUrl .= '#' . (string) $hyperlink['location']; |
1319 | 1319 | } |
@@ -1740,10 +1740,10 @@ discard block |
||
1740 | 1740 | } |
1741 | 1741 | break; |
1742 | 1742 | case '_xlnm.Print_Area': |
1743 | - $rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma? |
|
1743 | + $rangeSets = explode(',', $extractedRange); // FIXME: what if sheetname contains comma? |
|
1744 | 1744 | $newRangeSets = []; |
1745 | 1745 | foreach ($rangeSets as $rangeSet) { |
1746 | - $range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark? |
|
1746 | + $range = explode('!', $rangeSet); // FIXME: what if sheetname contains exclamation mark? |
|
1747 | 1747 | $rangeSet = isset($range[1]) ? $range[1] : $range[0]; |
1748 | 1748 | if (strpos($rangeSet, ':') === false) { |
1749 | 1749 | $rangeSet = $rangeSet . ':' . $rangeSet; |
@@ -1122,7 +1122,7 @@ |
||
1122 | 1122 | // $range should look like one of these |
1123 | 1123 | // Foo!$C$7:$J$66 |
1124 | 1124 | // Bar!$A$1:$IV$2 |
1125 | - $explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark? |
|
1125 | + $explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark? |
|
1126 | 1126 | $sheetName = trim($explodes[0], "'"); |
1127 | 1127 | if (count($explodes) == 2) { |
1128 | 1128 | if (strpos($explodes[1], ':') === false) { |
@@ -626,10 +626,10 @@ |
||
626 | 626 | foreach ($temp as &$value) { |
627 | 627 | // Only replace in alternate array entries (i.e. non-quoted blocks) |
628 | 628 | if ($tKey = !$tKey) { |
629 | - $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value); // Cell range reference in another sheet |
|
630 | - $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value); // Cell reference in another sheet |
|
631 | - $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value); // Cell range reference |
|
632 | - $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value); // Simple cell reference |
|
629 | + $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value); // Cell range reference in another sheet |
|
630 | + $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value); // Cell reference in another sheet |
|
631 | + $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value); // Cell range reference |
|
632 | + $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value); // Simple cell reference |
|
633 | 633 | $value = \PhpSpreadsheet\Calculation::translateSeparator(';', ',', $value, $inBraces); |
634 | 634 | } |
635 | 635 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | $worksheetNames = []; |
103 | 103 | while ($xml->read()) { |
104 | 104 | if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) { |
105 | - $xml->read(); // Move onto the value node |
|
105 | + $xml->read(); // Move onto the value node |
|
106 | 106 | $worksheetNames[] = (string) $xml->value; |
107 | 107 | } elseif ($xml->name == 'gnm:Sheets') { |
108 | 108 | // break out of the loop once we've got our sheet names rather than parse the entire file |
@@ -143,14 +143,14 @@ discard block |
||
143 | 143 | |
144 | 144 | while ($xml->read()) { |
145 | 145 | if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) { |
146 | - $xml->read(); // Move onto the value node |
|
146 | + $xml->read(); // Move onto the value node |
|
147 | 147 | $tmpInfo['worksheetName'] = (string) $xml->value; |
148 | 148 | } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) { |
149 | - $xml->read(); // Move onto the value node |
|
149 | + $xml->read(); // Move onto the value node |
|
150 | 150 | $tmpInfo['lastColumnIndex'] = (int) $xml->value; |
151 | 151 | $tmpInfo['totalColumns'] = (int) $xml->value + 1; |
152 | 152 | } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) { |
153 | - $xml->read(); // Move onto the value node |
|
153 | + $xml->read(); // Move onto the value node |
|
154 | 154 | $tmpInfo['totalRows'] = (int) $xml->value + 1; |
155 | 155 | break; |
156 | 156 | } |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | if (isset($sheet->PrintInformation->Margins)) { |
350 | 350 | foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) { |
351 | 351 | $marginAttributes = $margin->attributes(); |
352 | - $marginSize = 72 / 100; // Default |
|
352 | + $marginSize = 72 / 100; // Default |
|
353 | 353 | switch ($marginAttributes['PrefUnit']) { |
354 | 354 | case 'mm': |
355 | 355 | $marginSize = intval($marginAttributes['Points']) / 100; |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | break; |
436 | 436 | case '20': // Boolean |
437 | 437 | $type = \PhpSpreadsheet\Cell\DataType::TYPE_BOOL; |
438 | - $cell = ($cell == 'TRUE') ? true: false; |
|
438 | + $cell = ($cell == 'TRUE') ? true : false; |
|
439 | 439 | break; |
440 | 440 | case '30': // Integer |
441 | 441 | $cell = intval($cell); |
@@ -45,8 +45,8 @@ |
||
45 | 45 | const CHARSET_ANSI_JAPANESE_SHIFTJIS = 0x80; |
46 | 46 | const CHARSET_ANSI_KOREAN_HANGUL = 0x81; |
47 | 47 | const CHARSET_ANSI_KOREAN_JOHAB = 0x82; |
48 | - const CHARSET_ANSI_CHINESE_SIMIPLIFIED = 0x86; // gb2312 |
|
49 | - const CHARSET_ANSI_CHINESE_TRADITIONAL = 0x88; // big5 |
|
48 | + const CHARSET_ANSI_CHINESE_SIMIPLIFIED = 0x86; // gb2312 |
|
49 | + const CHARSET_ANSI_CHINESE_TRADITIONAL = 0x88; // big5 |
|
50 | 50 | const CHARSET_ANSI_GREEK = 0xA1; |
51 | 51 | const CHARSET_ANSI_TURKISH = 0xA2; |
52 | 52 | const CHARSET_ANSI_VIETNAMESE = 0xA3; |
@@ -29,8 +29,8 @@ |
||
29 | 29 | class Date |
30 | 30 | { |
31 | 31 | /** constants */ |
32 | - const CALENDAR_WINDOWS_1900 = 1900; // Base date of 1st Jan 1900 = 1.0 |
|
33 | - const CALENDAR_MAC_1904 = 1904; // Base date of 2nd Jan 1904 = 1.0 |
|
32 | + const CALENDAR_WINDOWS_1900 = 1900; // Base date of 1st Jan 1900 = 1.0 |
|
33 | + const CALENDAR_MAC_1904 = 1904; // Base date of 2nd Jan 1904 = 1.0 |
|
34 | 34 | |
35 | 35 | /* |
36 | 36 | * Names of the months of the year, indexed by shortname |
@@ -2592,7 +2592,7 @@ discard block |
||
2592 | 2592 | // ----- Set the file properties |
2593 | 2593 | $p_header['size'] = 0; |
2594 | 2594 | //$p_header['external'] = 0x41FF0010; // Value for a folder : to be checked |
2595 | - $p_header['external'] = 0x00000010; // Value for a folder : to be checked |
|
2595 | + $p_header['external'] = 0x00000010; // Value for a folder : to be checked |
|
2596 | 2596 | |
2597 | 2597 | // ----- Call the header generation |
2598 | 2598 | if (($v_result = $this->privWriteFileHeader($p_header)) != 1) { |
@@ -4980,7 +4980,7 @@ discard block |
||
4980 | 4980 | if ($v_skip > 0) { |
4981 | 4981 | --$v_skip; |
4982 | 4982 | } else { |
4983 | - $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1)?'/' . $v_result:''); |
|
4983 | + $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/' . $v_result : ''); |
|
4984 | 4984 | } |
4985 | 4985 | } |
4986 | 4986 | } |
@@ -233,8 +233,8 @@ |
||
233 | 233 | $y1 = $offsetY; |
234 | 234 | |
235 | 235 | // Initialise end cell to the same as the start cell |
236 | - $col_end = $col_start; // Col containing lower right corner of object |
|
237 | - $row_end = $row_start; // Row containing bottom right corner of object |
|
236 | + $col_end = $col_start; // Col containing lower right corner of object |
|
237 | + $row_end = $row_start; // Row containing bottom right corner of object |
|
238 | 238 | |
239 | 239 | // Zero the specified offset if greater than the cell dimensions |
240 | 240 | if ($x1 >= self::sizeCol($sheet, \PhpSpreadsheet\Cell::stringFromColumnIndex($col_start))) { |