@@ -18,11 +18,11 @@ |
||
18 | 18 | ->getMock(); |
19 | 19 | |
20 | 20 | $this->mockWorksheet->expects($this->any()) |
21 | - ->method('getHighestColumn') |
|
22 | - ->will($this->returnValue('E')); |
|
21 | + ->method('getHighestColumn') |
|
22 | + ->will($this->returnValue('E')); |
|
23 | 23 | $this->mockWorksheet->expects($this->any()) |
24 | - ->method('getCellByColumnAndRow') |
|
25 | - ->will($this->returnValue($this->mockCell)); |
|
24 | + ->method('getCellByColumnAndRow') |
|
25 | + ->will($this->returnValue($this->mockCell)); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 |
@@ -13,8 +13,8 @@ |
||
13 | 13 | ->disableOriginalConstructor() |
14 | 14 | ->getMock(); |
15 | 15 | $this->mockWorksheet->expects($this->any()) |
16 | - ->method('getHighestColumn') |
|
17 | - ->will($this->returnValue('E')); |
|
16 | + ->method('getHighestColumn') |
|
17 | + ->will($this->returnValue('E')); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 |
@@ -24,8 +24,8 @@ |
||
24 | 24 | ->getMock(); |
25 | 25 | // Configure the stub. |
26 | 26 | $this->cellStub->expects($this->any()) |
27 | - ->method('setValueExplicit') |
|
28 | - ->will($this->returnValue(true)); |
|
27 | + ->method('setValueExplicit') |
|
28 | + ->will($this->returnValue(true)); |
|
29 | 29 | |
30 | 30 | } |
31 | 31 |
@@ -45,22 +45,22 @@ |
||
45 | 45 | ->disableOriginalConstructor() |
46 | 46 | ->getMock(); |
47 | 47 | $cache->expects($this->any()) |
48 | - ->method('getParent') |
|
49 | - ->will($this->returnValue($sheet)); |
|
48 | + ->method('getParent') |
|
49 | + ->will($this->returnValue($sheet)); |
|
50 | 50 | |
51 | 51 | $sheet->expects($this->once()) |
52 | - ->method('getStyle') |
|
53 | - ->will($this->returnSelf()); |
|
52 | + ->method('getStyle') |
|
53 | + ->will($this->returnSelf()); |
|
54 | 54 | $sheet->expects($this->once()) |
55 | - ->method('getNumberFormat') |
|
56 | - ->will($this->returnSelf()); |
|
55 | + ->method('getNumberFormat') |
|
56 | + ->will($this->returnSelf()); |
|
57 | 57 | $sheet->expects($this->once()) |
58 | - ->method('setFormatCode') |
|
59 | - ->with($format) |
|
60 | - ->will($this->returnSelf()); |
|
58 | + ->method('setFormatCode') |
|
59 | + ->with($format) |
|
60 | + ->will($this->returnSelf()); |
|
61 | 61 | $sheet->expects($this->any()) |
62 | - ->method('getCellCacheController') |
|
63 | - ->will($this->returnValue($cache)); |
|
62 | + ->method('getCellCacheController') |
|
63 | + ->will($this->returnValue($cache)); |
|
64 | 64 | |
65 | 65 | \PHPExcel\Shared\StringHelper::setCurrencyCode($currencyCode); |
66 | 66 | \PHPExcel\Shared\StringHelper::setDecimalSeparator($decimalSeparator); |
@@ -29,105 +29,105 @@ |
||
29 | 29 | error_reporting(E_ALL); |
30 | 30 | |
31 | 31 | if (PHP_SAPI != 'cli') { |
32 | - die ('This script executes all tests, and should only be run from the command line'); |
|
32 | + die ('This script executes all tests, and should only be run from the command line'); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | // List of tests |
36 | 36 | $aTests = array( |
37 | - '01simple.php' |
|
38 | - , '01simplePCLZip.php' |
|
39 | - , '02types.php' |
|
40 | - , '02types-xls.php' |
|
41 | - , '03formulas.php' |
|
42 | - , '04printing.php' |
|
43 | - , '05featuredemo.php' |
|
44 | - , '06largescale.php' |
|
45 | - , '06largescale-with-cellcaching.php' |
|
46 | - , '06largescale-with-cellcaching-sqlite.php' |
|
47 | - , '06largescale-with-cellcaching-sqlite3.php' |
|
48 | - , '06largescale-xls.php' |
|
49 | - , '07reader.php' |
|
50 | - , '07readerPCLZip.php' |
|
51 | - , '08conditionalformatting.php' |
|
52 | - , '08conditionalformatting2.php' |
|
53 | - , '09pagebreaks.php' |
|
54 | - , '10autofilter.php' |
|
55 | - , '10autofilter-selection-1.php' |
|
56 | - , '10autofilter-selection-2.php' |
|
57 | - , '10autofilter-selection-display.php' |
|
58 | - , '11documentsecurity.php' |
|
59 | - , '11documentsecurity-xls.php' |
|
60 | - , '12cellProtection.php' |
|
61 | - , '13calculation.php' |
|
37 | + '01simple.php' |
|
38 | + , '01simplePCLZip.php' |
|
39 | + , '02types.php' |
|
40 | + , '02types-xls.php' |
|
41 | + , '03formulas.php' |
|
42 | + , '04printing.php' |
|
43 | + , '05featuredemo.php' |
|
44 | + , '06largescale.php' |
|
45 | + , '06largescale-with-cellcaching.php' |
|
46 | + , '06largescale-with-cellcaching-sqlite.php' |
|
47 | + , '06largescale-with-cellcaching-sqlite3.php' |
|
48 | + , '06largescale-xls.php' |
|
49 | + , '07reader.php' |
|
50 | + , '07readerPCLZip.php' |
|
51 | + , '08conditionalformatting.php' |
|
52 | + , '08conditionalformatting2.php' |
|
53 | + , '09pagebreaks.php' |
|
54 | + , '10autofilter.php' |
|
55 | + , '10autofilter-selection-1.php' |
|
56 | + , '10autofilter-selection-2.php' |
|
57 | + , '10autofilter-selection-display.php' |
|
58 | + , '11documentsecurity.php' |
|
59 | + , '11documentsecurity-xls.php' |
|
60 | + , '12cellProtection.php' |
|
61 | + , '13calculation.php' |
|
62 | 62 | , '13calculationCyclicFormulae.php' |
63 | - , '14excel5.php' |
|
64 | - , '15datavalidation.php' |
|
65 | - , '15datavalidation-xls.php' |
|
66 | - , '16csv.php' |
|
67 | - , '17html.php' |
|
68 | - , '18extendedcalculation.php' |
|
69 | - , '19namedrange.php' |
|
70 | - , '20readexcel5.php' |
|
71 | - , '21pdf.php' |
|
72 | - , '22heavilyformatted.php' |
|
73 | - , '23sharedstyles.php' |
|
74 | - , '24readfilter.php' |
|
75 | - , '25inmemoryimage.php' |
|
76 | - , '26utf8.php' |
|
77 | - , '27imagesexcel5.php' |
|
78 | - , '28iterator.php' |
|
79 | - , '29advancedvaluebinder.php' |
|
80 | - , '30template.php' |
|
81 | - , '31docproperties_write.php' |
|
82 | - , '31docproperties_write-xls.php' |
|
83 | - , '32chartreadwrite.php' |
|
84 | - , '33chartcreate-area.php' |
|
85 | - , '33chartcreate-bar.php' |
|
86 | - , '33chartcreate-bar-stacked.php' |
|
87 | - , '33chartcreate-column.php' |
|
88 | - , '33chartcreate-column-2.php' |
|
89 | - , '33chartcreate-line.php' |
|
90 | - , '33chartcreate-pie.php' |
|
91 | - , '33chartcreate-radar.php' |
|
92 | - , '33chartcreate-scatter.php' |
|
93 | - , '33chartcreate-stock.php' |
|
94 | - , '33chartcreate-multiple-charts.php' |
|
95 | - , '33chartcreate-composite.php' |
|
96 | - , '34chartupdate.php' |
|
97 | - , '35chartrender.php' |
|
98 | - , '36chartreadwriteHTML.php' |
|
99 | - , '36chartreadwritePDF.php' |
|
100 | - , '37page_layout_view.php' |
|
101 | - , '38cloneWorksheet.php' |
|
63 | + , '14excel5.php' |
|
64 | + , '15datavalidation.php' |
|
65 | + , '15datavalidation-xls.php' |
|
66 | + , '16csv.php' |
|
67 | + , '17html.php' |
|
68 | + , '18extendedcalculation.php' |
|
69 | + , '19namedrange.php' |
|
70 | + , '20readexcel5.php' |
|
71 | + , '21pdf.php' |
|
72 | + , '22heavilyformatted.php' |
|
73 | + , '23sharedstyles.php' |
|
74 | + , '24readfilter.php' |
|
75 | + , '25inmemoryimage.php' |
|
76 | + , '26utf8.php' |
|
77 | + , '27imagesexcel5.php' |
|
78 | + , '28iterator.php' |
|
79 | + , '29advancedvaluebinder.php' |
|
80 | + , '30template.php' |
|
81 | + , '31docproperties_write.php' |
|
82 | + , '31docproperties_write-xls.php' |
|
83 | + , '32chartreadwrite.php' |
|
84 | + , '33chartcreate-area.php' |
|
85 | + , '33chartcreate-bar.php' |
|
86 | + , '33chartcreate-bar-stacked.php' |
|
87 | + , '33chartcreate-column.php' |
|
88 | + , '33chartcreate-column-2.php' |
|
89 | + , '33chartcreate-line.php' |
|
90 | + , '33chartcreate-pie.php' |
|
91 | + , '33chartcreate-radar.php' |
|
92 | + , '33chartcreate-scatter.php' |
|
93 | + , '33chartcreate-stock.php' |
|
94 | + , '33chartcreate-multiple-charts.php' |
|
95 | + , '33chartcreate-composite.php' |
|
96 | + , '34chartupdate.php' |
|
97 | + , '35chartrender.php' |
|
98 | + , '36chartreadwriteHTML.php' |
|
99 | + , '36chartreadwritePDF.php' |
|
100 | + , '37page_layout_view.php' |
|
101 | + , '38cloneWorksheet.php' |
|
102 | 102 | , '39dropdown.php' |
103 | - , '40duplicateStyle.php' |
|
104 | - , '41password.php' |
|
105 | - , '42richText.php' |
|
103 | + , '40duplicateStyle.php' |
|
104 | + , '41password.php' |
|
105 | + , '42richText.php' |
|
106 | 106 | , '43mergeWorkbooks.php' |
107 | 107 | , '44worksheetInfo.php' |
108 | - , 'OOCalcReader.php' |
|
109 | - , 'OOCalcReaderPCLZip.php' |
|
110 | - , 'SylkReader.php' |
|
111 | - , 'Excel2003XMLReader.php' |
|
112 | - , 'XMLReader.php' |
|
113 | - , 'GnumericReader.php' |
|
108 | + , 'OOCalcReader.php' |
|
109 | + , 'OOCalcReaderPCLZip.php' |
|
110 | + , 'SylkReader.php' |
|
111 | + , 'Excel2003XMLReader.php' |
|
112 | + , 'XMLReader.php' |
|
113 | + , 'GnumericReader.php' |
|
114 | 114 | ); |
115 | 115 | |
116 | 116 | // First, clear all previous run results |
117 | 117 | foreach ($aTests as $sTest) { |
118 | - @unlink( str_replace('.php', '.xls', $sTest) ); |
|
119 | - @unlink( str_replace('.php', '.xlsx', $sTest) ); |
|
120 | - @unlink( str_replace('.php', '.csv', $sTest) ); |
|
121 | - @unlink( str_replace('.php', '.htm', $sTest) ); |
|
122 | - @unlink( str_replace('.php', '.pdf', $sTest) ); |
|
118 | + @unlink( str_replace('.php', '.xls', $sTest) ); |
|
119 | + @unlink( str_replace('.php', '.xlsx', $sTest) ); |
|
120 | + @unlink( str_replace('.php', '.csv', $sTest) ); |
|
121 | + @unlink( str_replace('.php', '.htm', $sTest) ); |
|
122 | + @unlink( str_replace('.php', '.pdf', $sTest) ); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | // Run all tests |
126 | 126 | foreach ($aTests as $sTest) { |
127 | - echo '============== TEST ==============' . "\r\n"; |
|
128 | - echo 'Test name: ' . $sTest . "\r\n"; |
|
129 | - echo "\r\n"; |
|
130 | - echo shell_exec('php ' . $sTest); |
|
131 | - echo "\r\n"; |
|
132 | - echo "\r\n"; |
|
127 | + echo '============== TEST ==============' . "\r\n"; |
|
128 | + echo 'Test name: ' . $sTest . "\r\n"; |
|
129 | + echo "\r\n"; |
|
130 | + echo shell_exec('php ' . $sTest); |
|
131 | + echo "\r\n"; |
|
132 | + echo "\r\n"; |
|
133 | 133 | } |
134 | 134 | \ No newline at end of file |
@@ -1020,8 +1020,8 @@ discard block |
||
1020 | 1020 | |
1021 | 1021 | // Write the packed data |
1022 | 1022 | $this->append($header . $data . |
1023 | - $unknown1 . $options . |
|
1024 | - $unknown2 . $url_len . $url); |
|
1023 | + $unknown1 . $options . |
|
1024 | + $unknown2 . $url_len . $url); |
|
1025 | 1025 | |
1026 | 1026 | return 0; |
1027 | 1027 | } |
@@ -1069,8 +1069,8 @@ discard block |
||
1069 | 1069 | |
1070 | 1070 | // Write the packed data |
1071 | 1071 | $this->append($header . $data . |
1072 | - $unknown1 . $options . |
|
1073 | - $url_len . $url); |
|
1072 | + $unknown1 . $options . |
|
1073 | + $url_len . $url); |
|
1074 | 1074 | |
1075 | 1075 | return 0; |
1076 | 1076 | } |
@@ -1151,14 +1151,14 @@ discard block |
||
1151 | 1151 | |
1152 | 1152 | // Pack the main data stream |
1153 | 1153 | $data = pack('vvvv', $row1, $row2, $col1, $col2) . |
1154 | - $unknown1 . |
|
1155 | - $link_type . |
|
1156 | - $unknown2 . |
|
1157 | - $up_count . |
|
1158 | - $dir_short_len . |
|
1159 | - $dir_short . |
|
1160 | - $unknown3 . |
|
1161 | - $stream_len;/*. |
|
1154 | + $unknown1 . |
|
1155 | + $link_type . |
|
1156 | + $unknown2 . |
|
1157 | + $up_count . |
|
1158 | + $dir_short_len . |
|
1159 | + $dir_short . |
|
1160 | + $unknown3 . |
|
1161 | + $stream_len;/*. |
|
1162 | 1162 | $dir_long_len . |
1163 | 1163 | $unknown4 . |
1164 | 1164 | $dir_long . |
@@ -666,7 +666,7 @@ |
||
666 | 666 | list($row1, $col1) = $this->cellToPackedRowcol($cell1); |
667 | 667 | list($row2, $col2) = $this->cellToPackedRowcol($cell2); |
668 | 668 | } else { // It's a rows range (like 26:27) |
669 | - list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2); |
|
669 | + list($row1, $col1, $row2, $col2) = $this->rangeToPackedRange($cell1 . ':' . $cell2); |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | // The ptg value depends on the class of the ptg. |
@@ -138,8 +138,8 @@ |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
141 | - 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
142 | - 'styleHashTable', |
|
141 | + 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
142 | + 'styleHashTable', |
|
143 | 143 | ]; |
144 | 144 | |
145 | 145 | // Set HashTable variables |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | // XML header |
47 | 47 | $objWriter->startDocument('1.0', 'UTF-8', 'yes'); |
48 | 48 | |
49 | - // Comments cache |
|
50 | - $comments = $pWorksheet->getComments(); |
|
49 | + // Comments cache |
|
50 | + $comments = $pWorksheet->getComments(); |
|
51 | 51 | |
52 | - // Authors cache |
|
53 | - $authors = []; |
|
52 | + // Authors cache |
|
53 | + $authors = []; |
|
54 | 54 | $authorId = 0; |
55 | 55 | foreach ($comments as $comment) { |
56 | 56 | if (!isset($authors[$comment->getAuthor()])) { |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | // XML header |
127 | 127 | $objWriter->startDocument('1.0', 'UTF-8', 'yes'); |
128 | 128 | |
129 | - // Comments cache |
|
130 | - $comments = $pWorksheet->getComments(); |
|
129 | + // Comments cache |
|
130 | + $comments = $pWorksheet->getComments(); |
|
131 | 131 | |
132 | 132 | // xml |
133 | 133 | $objWriter->startElement('xml'); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | private function writeVMLComment(\PhpSpreadsheet\Shared\XMLWriter $objWriter = null, $pCellReference = 'A1', \PhpSpreadsheet\Comment $pComment = null) |
190 | 190 | { |
191 | 191 | // Metadata |
192 | - list($column, $row) = \PhpSpreadsheet\Cell::coordinateFromString($pCellReference); |
|
192 | + list($column, $row) = \PhpSpreadsheet\Cell::coordinateFromString($pCellReference); |
|
193 | 193 | $column = \PhpSpreadsheet\Cell::columnIndexFromString($column); |
194 | 194 | $id = 1024 + $column + $row; |
195 | 195 | $id = substr($id, 0, 4); |