@@ -164,21 +164,21 @@ |
||
164 | 164 | $ret = str_pad($this->Name, 64, "\x00"); |
165 | 165 | |
166 | 166 | $ret .= pack('v', strlen($this->Name) + 2) // 66 |
167 | - . pack('c', $this->Type) // 67 |
|
168 | - . pack('c', 0x00) //UK // 68 |
|
169 | - . pack('V', $this->PrevPps) //Prev // 72 |
|
170 | - . pack('V', $this->NextPps) //Next // 76 |
|
171 | - . pack('V', $this->DirPps) //Dir // 80 |
|
172 | - . "\x00\x09\x02\x00" // 84 |
|
173 | - . "\x00\x00\x00\x00" // 88 |
|
174 | - . "\xc0\x00\x00\x00" // 92 |
|
175 | - . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root |
|
176 | - . "\x00\x00\x00\x00" // 100 |
|
177 | - . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st) // 108 |
|
178 | - . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd) // 116 |
|
179 | - . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 |
|
180 | - . pack('V', $this->Size) // 124 |
|
181 | - . pack('V', 0); // 128 |
|
167 | + . pack('c', $this->Type) // 67 |
|
168 | + . pack('c', 0x00) //UK // 68 |
|
169 | + . pack('V', $this->PrevPps) //Prev // 72 |
|
170 | + . pack('V', $this->NextPps) //Next // 76 |
|
171 | + . pack('V', $this->DirPps) //Dir // 80 |
|
172 | + . "\x00\x09\x02\x00" // 84 |
|
173 | + . "\x00\x00\x00\x00" // 88 |
|
174 | + . "\xc0\x00\x00\x00" // 92 |
|
175 | + . "\x00\x00\x00\x46" // 96 // Seems to be ok only for Root |
|
176 | + . "\x00\x00\x00\x00" // 100 |
|
177 | + . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time1st) // 108 |
|
178 | + . \PhpOffice\PhpSpreadsheet\Shared\OLE::localDateToOLE($this->Time2nd) // 116 |
|
179 | + . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 |
|
180 | + . pack('V', $this->Size) // 124 |
|
181 | + . pack('V', 0); // 128 |
|
182 | 182 | return $ret; |
183 | 183 | } |
184 | 184 |
@@ -204,6 +204,9 @@ |
||
204 | 204 | return $chart; |
205 | 205 | } |
206 | 206 | |
207 | + /** |
|
208 | + * @param string $type |
|
209 | + */ |
|
207 | 210 | private static function chartTitle($titleDetails, $namespacesChartMeta, $type) |
208 | 211 | { |
209 | 212 | $caption = []; |
@@ -140,8 +140,8 @@ |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
143 | - 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
144 | - 'styleHashTable', |
|
143 | + 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
144 | + 'styleHashTable', |
|
145 | 145 | ]; |
146 | 146 | |
147 | 147 | // Set HashTable variables |
@@ -5157,7 +5157,7 @@ discard block |
||
5157 | 5157 | * is in one piece. |
5158 | 5158 | * Moves to next current position in data stream to start of next record different from a CONtINUE record |
5159 | 5159 | * |
5160 | - * @return array |
|
5160 | + * @return integer|null |
|
5161 | 5161 | */ |
5162 | 5162 | private function getSplicedRecordData() |
5163 | 5163 | { |
@@ -5421,7 +5421,7 @@ discard block |
||
5421 | 5421 | * @param string $formulaData Formula data |
5422 | 5422 | * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas |
5423 | 5423 | * @throws Exception |
5424 | - * @return array |
|
5424 | + * @return string |
|
5425 | 5425 | */ |
5426 | 5426 | private function getNextToken($formulaData, $baseCell = 'A1') |
5427 | 5427 | { |
@@ -6989,7 +6989,7 @@ discard block |
||
6989 | 6989 | * section 2.5.15 |
6990 | 6990 | * |
6991 | 6991 | * @param string $subData |
6992 | - * @return array |
|
6992 | + * @return string |
|
6993 | 6993 | */ |
6994 | 6994 | private function readBIFF8CellRangeAddressList($subData) |
6995 | 6995 | { |
@@ -7100,7 +7100,7 @@ discard block |
||
7100 | 7100 | * section 2.5.8 |
7101 | 7101 | * |
7102 | 7102 | * @param string $arrayData |
7103 | - * @return array |
|
7103 | + * @return string |
|
7104 | 7104 | */ |
7105 | 7105 | private static function readBIFF8ConstantArray($arrayData) |
7106 | 7106 | { |
@@ -7138,7 +7138,7 @@ discard block |
||
7138 | 7138 | * returns e.g. array('value' => '5', 'size' => 9) |
7139 | 7139 | * |
7140 | 7140 | * @param string $valueData |
7141 | - * @return array |
|
7141 | + * @return string |
|
7142 | 7142 | */ |
7143 | 7143 | private static function readBIFF8Constant($valueData) |
7144 | 7144 | { |
@@ -190,6 +190,11 @@ |
||
190 | 190 | return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z) |
191 | 191 | } |
192 | 192 | |
193 | + /** |
|
194 | + * @param string[] $func |
|
195 | + * @param integer $s |
|
196 | + * @param integer $t |
|
197 | + */ |
|
193 | 198 | private static function step($func, &$A, $B, $C, $D, $M, $s, $t) |
194 | 199 | { |
195 | 200 | $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff; |
@@ -199,10 +199,12 @@ discard block |
||
199 | 199 | * @param int &$str_unique Total number of unique strings |
200 | 200 | * @param array &$str_table String Table |
201 | 201 | * @param array &$colors Colour Table |
202 | - * @param mixed $parser The formula parser created for the Workbook |
|
202 | + * @param Parser $parser The formula parser created for the Workbook |
|
203 | 203 | * @param bool $preCalculateFormulas Flag indicating whether formulas should be calculated or just written |
204 | 204 | * @param string $phpSheet The worksheet to write |
205 | 205 | * @param \PhpSpreadsheet\Worksheet $phpSheet |
206 | + * @param integer $str_total |
|
207 | + * @param integer $str_unique |
|
206 | 208 | */ |
207 | 209 | public function __construct(&$str_total, &$str_unique, &$str_table, &$colors, $parser, $preCalculateFormulas, $phpSheet) |
208 | 210 | { |
@@ -611,7 +613,7 @@ discard block |
||
611 | 613 | * @param int $row Zero indexed row |
612 | 614 | * @param int $col Zero indexed column |
613 | 615 | * @param float $num The number to write |
614 | - * @param mixed $xfIndex The optional XF format |
|
616 | + * @param integer $xfIndex The optional XF format |
|
615 | 617 | * @return int |
616 | 618 | */ |
617 | 619 | private function writeNumber($row, $col, $num, $xfIndex) |
@@ -717,7 +719,7 @@ discard block |
||
717 | 719 | * @param int $row Zero indexed row |
718 | 720 | * @param int $col Zero indexed column |
719 | 721 | * @param string $str The string to write |
720 | - * @param mixed $xfIndex The XF format index for the cell |
|
722 | + * @param integer $xfIndex The XF format index for the cell |
|
721 | 723 | * @return int |
722 | 724 | */ |
723 | 725 | private function writeLabelSst($row, $col, $str, $xfIndex) |
@@ -783,7 +785,7 @@ discard block |
||
783 | 785 | * |
784 | 786 | * @param int $row Zero indexed row |
785 | 787 | * @param int $col Zero indexed column |
786 | - * @param mixed $xfIndex The XF format index |
|
788 | + * @param integer $xfIndex The XF format index |
|
787 | 789 | */ |
788 | 790 | public function writeBlank($row, $col, $xfIndex) |
789 | 791 | { |
@@ -830,7 +832,7 @@ discard block |
||
830 | 832 | * @param int $row Zero indexed row |
831 | 833 | * @param int $col Zero indexed column |
832 | 834 | * @param string $formula The formula text string |
833 | - * @param mixed $xfIndex The XF format index |
|
835 | + * @param integer $xfIndex The XF format index |
|
834 | 836 | * @param mixed $calculatedValue Calculated value |
835 | 837 | * @return int |
836 | 838 | */ |
@@ -2299,8 +2301,8 @@ discard block |
||
2299 | 2301 | * @param mixed $bitmap The bitmap filename or GD-image resource |
2300 | 2302 | * @param int $x The horizontal position (offset) of the image inside the cell. |
2301 | 2303 | * @param int $y The vertical position (offset) of the image inside the cell. |
2302 | - * @param float $scale_x The horizontal scale |
|
2303 | - * @param float $scale_y The vertical scale |
|
2304 | + * @param integer $scale_x The horizontal scale |
|
2305 | + * @param integer $scale_y The vertical scale |
|
2304 | 2306 | */ |
2305 | 2307 | public function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1) |
2306 | 2308 | { |
@@ -1147,14 +1147,14 @@ |
||
1147 | 1147 | |
1148 | 1148 | // Pack the main data stream |
1149 | 1149 | $data = pack('vvvv', $row1, $row2, $col1, $col2) . |
1150 | - $unknown1 . |
|
1151 | - $link_type . |
|
1152 | - $unknown2 . |
|
1153 | - $up_count . |
|
1154 | - $dir_short_len . |
|
1155 | - $dir_short . |
|
1156 | - $unknown3 . |
|
1157 | - $stream_len; /*. |
|
1150 | + $unknown1 . |
|
1151 | + $link_type . |
|
1152 | + $unknown2 . |
|
1153 | + $up_count . |
|
1154 | + $dir_short_len . |
|
1155 | + $dir_short . |
|
1156 | + $unknown3 . |
|
1157 | + $stream_len; /*. |
|
1158 | 1158 | $dir_long_len . |
1159 | 1159 | $unknown4 . |
1160 | 1160 | $dir_long . |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | $bFamily = 0; // Font family |
86 | 86 | $bCharSet = \PHPExcel\Shared\Font::getCharsetFromFontName($this->font->getName()); // Character set |
87 | 87 | |
88 | - $record = 0x31; // Record identifier |
|
89 | - $reserved = 0x00; // Reserved |
|
90 | - $grbit = 0x00; // Font attributes |
|
88 | + $record = 0x31; // Record identifier |
|
89 | + $reserved = 0x00; // Reserved |
|
90 | + $grbit = 0x00; // Font attributes |
|
91 | 91 | if ($this->font->getItalic()) { |
92 | 92 | $grbit |= 0x02; |
93 | 93 | } |
@@ -134,9 +134,9 @@ discard block |
||
134 | 134 | private static function mapBold($bold) |
135 | 135 | { |
136 | 136 | if ($bold) { |
137 | - return 0x2BC; // 700 = Bold font weight |
|
137 | + return 0x2BC; // 700 = Bold font weight |
|
138 | 138 | } |
139 | - return 0x190; // 400 = Normal font weight |
|
139 | + return 0x190; // 400 = Normal font weight |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
@@ -168,16 +168,25 @@ discard block |
||
168 | 168 | return fread($this->fileHandle, $blockSize); |
169 | 169 | } |
170 | 170 | |
171 | + /** |
|
172 | + * @param string $data |
|
173 | + */ |
|
171 | 174 | private static function startsWithTag($data) |
172 | 175 | { |
173 | 176 | return '<' === substr(trim($data), 0, 1); |
174 | 177 | } |
175 | 178 | |
179 | + /** |
|
180 | + * @param string $data |
|
181 | + */ |
|
176 | 182 | private static function endsWithTag($data) |
177 | 183 | { |
178 | 184 | return '>' === substr(trim($data), -1, 1); |
179 | 185 | } |
180 | 186 | |
187 | + /** |
|
188 | + * @param string $data |
|
189 | + */ |
|
181 | 190 | private static function containsTags($data) |
182 | 191 | { |
183 | 192 | return strlen($data) !== strlen(strip_tags($data)); |
@@ -249,6 +258,10 @@ discard block |
||
249 | 258 | return array_pop($this->nestedColumn); |
250 | 259 | } |
251 | 260 | |
261 | + /** |
|
262 | + * @param \PhpOffice\PhpSpreadsheet\Worksheet $sheet |
|
263 | + * @param integer $row |
|
264 | + */ |
|
252 | 265 | protected function flushCell($sheet, $column, $row, &$cellContent) |
253 | 266 | { |
254 | 267 | if (is_string($cellContent)) { |
@@ -37,53 +37,53 @@ |
||
37 | 37 | |
38 | 38 | /* Read the document's creator property **/ |
39 | 39 | $creator = $objPHPExcel->getProperties()->getCreator(); |
40 | -echo '<b>Document Creator: </b>',$creator,'<br />'; |
|
40 | +echo '<b>Document Creator: </b>', $creator, '<br />'; |
|
41 | 41 | |
42 | 42 | /* Read the Date when the workbook was created (as a PHP timestamp value) **/ |
43 | 43 | $creationDatestamp = $objPHPExcel->getProperties()->getCreated(); |
44 | 44 | /* Format the date and time using the standard PHP date() function **/ |
45 | 45 | $creationDate = date('l, d<\s\up>S</\s\up> F Y', $creationDatestamp); |
46 | 46 | $creationTime = date('g:i A', $creationDatestamp); |
47 | -echo '<b>Created On: </b>',$creationDate,' at ',$creationTime,'<br />'; |
|
47 | +echo '<b>Created On: </b>', $creationDate, ' at ', $creationTime, '<br />'; |
|
48 | 48 | |
49 | 49 | /* Read the name of the last person to modify this workbook **/ |
50 | 50 | $modifiedBy = $objPHPExcel->getProperties()->getLastModifiedBy(); |
51 | -echo '<b>Last Modified By: </b>',$modifiedBy,'<br />'; |
|
51 | +echo '<b>Last Modified By: </b>', $modifiedBy, '<br />'; |
|
52 | 52 | |
53 | 53 | /* Read the Date when the workbook was last modified (as a PHP timestamp value) **/ |
54 | 54 | $modifiedDatestamp = $objPHPExcel->getProperties()->getModified(); |
55 | 55 | /* Format the date and time using the standard PHP date() function **/ |
56 | 56 | $modifiedDate = date('l, d<\s\up>S</\s\up> F Y', $modifiedDatestamp); |
57 | 57 | $modifiedTime = date('g:i A', $modifiedDatestamp); |
58 | -echo '<b>Last Modified On: </b>',$modifiedDate,' at ',$modifiedTime,'<br />'; |
|
58 | +echo '<b>Last Modified On: </b>', $modifiedDate, ' at ', $modifiedTime, '<br />'; |
|
59 | 59 | |
60 | 60 | /* Read the workbook title property **/ |
61 | 61 | $workbookTitle = $objPHPExcel->getProperties()->getTitle(); |
62 | -echo '<b>Title: </b>',$workbookTitle,'<br />'; |
|
62 | +echo '<b>Title: </b>', $workbookTitle, '<br />'; |
|
63 | 63 | |
64 | 64 | /* Read the workbook description property **/ |
65 | 65 | $description = $objPHPExcel->getProperties()->getDescription(); |
66 | -echo '<b>Description: </b>',$description,'<br />'; |
|
66 | +echo '<b>Description: </b>', $description, '<br />'; |
|
67 | 67 | |
68 | 68 | /* Read the workbook subject property **/ |
69 | 69 | $subject = $objPHPExcel->getProperties()->getSubject(); |
70 | -echo '<b>Subject: </b>',$subject,'<br />'; |
|
70 | +echo '<b>Subject: </b>', $subject, '<br />'; |
|
71 | 71 | |
72 | 72 | /* Read the workbook keywords property **/ |
73 | 73 | $keywords = $objPHPExcel->getProperties()->getKeywords(); |
74 | -echo '<b>Keywords: </b>',$keywords,'<br />'; |
|
74 | +echo '<b>Keywords: </b>', $keywords, '<br />'; |
|
75 | 75 | |
76 | 76 | /* Read the workbook category property **/ |
77 | 77 | $category = $objPHPExcel->getProperties()->getCategory(); |
78 | -echo '<b>Category: </b>',$category,'<br />'; |
|
78 | +echo '<b>Category: </b>', $category, '<br />'; |
|
79 | 79 | |
80 | 80 | /* Read the workbook company property **/ |
81 | 81 | $company = $objPHPExcel->getProperties()->getCompany(); |
82 | -echo '<b>Company: </b>',$company,'<br />'; |
|
82 | +echo '<b>Company: </b>', $company, '<br />'; |
|
83 | 83 | |
84 | 84 | /* Read the workbook manager property **/ |
85 | 85 | $manager = $objPHPExcel->getProperties()->getManager(); |
86 | -echo '<b>Manager: </b>',$manager,'<br />'; |
|
86 | +echo '<b>Manager: </b>', $manager, '<br />'; |
|
87 | 87 | |
88 | 88 | ?> |
89 | 89 | <body> |