@@ -230,7 +230,7 @@ |
||
230 | 230 | /** |
231 | 231 | * Set Color |
232 | 232 | * |
233 | - * @param \PHPExcel\Style_Color $pValue |
|
233 | + * @param \PHPExcel\Style\Color $pValue |
|
234 | 234 | * @throws \PHPExcel\Exception |
235 | 235 | * @return Shadow |
236 | 236 | */ |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | return $this; |
196 | 196 | } |
197 | 197 | |
198 | - /** |
|
198 | + /** |
|
199 | 199 | * Get Shadow alignment |
200 | 200 | * |
201 | 201 | * @return int |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | return $this; |
218 | 218 | } |
219 | 219 | |
220 | - /** |
|
220 | + /** |
|
221 | 221 | * Get Color |
222 | 222 | * |
223 | 223 | * @return \PHPExcel\Style\Color |
@@ -236,11 +236,11 @@ discard block |
||
236 | 236 | */ |
237 | 237 | public function setColor(\PHPExcel\Style\Color $pValue = null) |
238 | 238 | { |
239 | - $this->color = $pValue; |
|
240 | - return $this; |
|
239 | + $this->color = $pValue; |
|
240 | + return $this; |
|
241 | 241 | } |
242 | 242 | |
243 | - /** |
|
243 | + /** |
|
244 | 244 | * Get Alpha |
245 | 245 | * |
246 | 246 | * @return int |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | * Set first page number |
803 | 803 | * |
804 | 804 | * @param int $value |
805 | - * @return HeaderFooter |
|
805 | + * @return PageSetup |
|
806 | 806 | */ |
807 | 807 | public function setFirstPageNumber($value = null) |
808 | 808 | { |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | /** |
814 | 814 | * Reset first page number |
815 | 815 | * |
816 | - * @return HeaderFooter |
|
816 | + * @return PageSetup |
|
817 | 817 | */ |
818 | 818 | public function resetFirstPageNumber() |
819 | 819 | { |
@@ -207,27 +207,27 @@ |
||
207 | 207 | private $scale = 100; |
208 | 208 | |
209 | 209 | /** |
210 | - * Fit To Page |
|
211 | - * Whether scale or fitToWith / fitToHeight applies |
|
212 | - * |
|
213 | - * @var boolean |
|
214 | - */ |
|
210 | + * Fit To Page |
|
211 | + * Whether scale or fitToWith / fitToHeight applies |
|
212 | + * |
|
213 | + * @var boolean |
|
214 | + */ |
|
215 | 215 | private $fitToPage = false; |
216 | 216 | |
217 | 217 | /** |
218 | - * Fit To Height |
|
219 | - * Number of vertical pages to fit on |
|
220 | - * |
|
221 | - * @var int? |
|
222 | - */ |
|
218 | + * Fit To Height |
|
219 | + * Number of vertical pages to fit on |
|
220 | + * |
|
221 | + * @var int? |
|
222 | + */ |
|
223 | 223 | private $fitToHeight = 1; |
224 | 224 | |
225 | 225 | /** |
226 | - * Fit To Width |
|
227 | - * Number of horizontal pages to fit on |
|
228 | - * |
|
229 | - * @var int? |
|
230 | - */ |
|
226 | + * Fit To Width |
|
227 | + * Number of horizontal pages to fit on |
|
228 | + * |
|
229 | + * @var int? |
|
230 | + */ |
|
231 | 231 | private $fitToWidth = 1; |
232 | 232 | |
233 | 233 | /** |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | * |
221 | 221 | * @var int? |
222 | 222 | */ |
223 | - private $fitToHeight = 1; |
|
223 | + private $fitToHeight = 1; |
|
224 | 224 | |
225 | 225 | /** |
226 | 226 | * Fit To Width |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | * |
229 | 229 | * @var int? |
230 | 230 | */ |
231 | - private $fitToWidth = 1; |
|
231 | + private $fitToWidth = 1; |
|
232 | 232 | |
233 | 233 | /** |
234 | 234 | * Columns to repeat at left |
@@ -599,8 +599,8 @@ discard block |
||
599 | 599 | return $this->printArea; |
600 | 600 | } |
601 | 601 | $printAreas = explode(',', $this->printArea); |
602 | - if (isset($printAreas[$index-1])) { |
|
603 | - return $printAreas[$index-1]; |
|
602 | + if (isset($printAreas[$index - 1])) { |
|
603 | + return $printAreas[$index - 1]; |
|
604 | 604 | } |
605 | 605 | throw new \PHPExcel\Exception("Requested Print Area does not exist"); |
606 | 606 | } |
@@ -620,7 +620,7 @@ discard block |
||
620 | 620 | return !is_null($this->printArea); |
621 | 621 | } |
622 | 622 | $printAreas = explode(',', $this->printArea); |
623 | - return isset($printAreas[$index-1]); |
|
623 | + return isset($printAreas[$index - 1]); |
|
624 | 624 | } |
625 | 625 | |
626 | 626 | /** |
@@ -638,8 +638,8 @@ discard block |
||
638 | 638 | $this->printArea = null; |
639 | 639 | } else { |
640 | 640 | $printAreas = explode(',', $this->printArea); |
641 | - if (isset($printAreas[$index-1])) { |
|
642 | - unset($printAreas[$index-1]); |
|
641 | + if (isset($printAreas[$index - 1])) { |
|
642 | + unset($printAreas[$index - 1]); |
|
643 | 643 | $this->printArea = implode(',', $printAreas); |
644 | 644 | } |
645 | 645 | } |
@@ -689,12 +689,12 @@ discard block |
||
689 | 689 | if (($index <= 0) || ($index > count($printAreas))) { |
690 | 690 | throw new \PHPExcel\Exception('Invalid index for setting print range.'); |
691 | 691 | } |
692 | - $printAreas[$index-1] = $value; |
|
692 | + $printAreas[$index - 1] = $value; |
|
693 | 693 | $this->printArea = implode(',', $printAreas); |
694 | 694 | } |
695 | 695 | } elseif ($method == self::SETPRINTRANGE_INSERT) { |
696 | 696 | if ($index == 0) { |
697 | - $this->printArea .= ($this->printArea == '') ? $value : ','.$value; |
|
697 | + $this->printArea .= ($this->printArea == '') ? $value : ',' . $value; |
|
698 | 698 | } else { |
699 | 699 | $printAreas = explode(',', $this->printArea); |
700 | 700 | if ($index < 0) { |
@@ -101,7 +101,7 @@ |
||
101 | 101 | /** |
102 | 102 | * Set Row Height |
103 | 103 | * |
104 | - * @param double $pValue |
|
104 | + * @param integer $pValue |
|
105 | 105 | * @return RowDimension |
106 | 106 | */ |
107 | 107 | public function setRowHeight($pValue = -1) |
@@ -45,11 +45,11 @@ |
||
45 | 45 | */ |
46 | 46 | private $height = -1; |
47 | 47 | |
48 | - /** |
|
49 | - * ZeroHeight for Row? |
|
50 | - * |
|
51 | - * @var bool |
|
52 | - */ |
|
48 | + /** |
|
49 | + * ZeroHeight for Row? |
|
50 | + * |
|
51 | + * @var bool |
|
52 | + */ |
|
53 | 53 | private $zeroHeight = false; |
54 | 54 | |
55 | 55 | /** |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | * Set whether a separator line should be included as the first line of the file |
259 | 259 | * |
260 | 260 | * @param boolean $pValue Use separator line? Defaults to false |
261 | - * @return PHPExcel_Writer_CSV |
|
261 | + * @return CSV |
|
262 | 262 | */ |
263 | 263 | public function setIncludeSeparatorLine($pValue = false) |
264 | 264 | { |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | /** |
315 | 315 | * Write line to CSV file |
316 | 316 | * |
317 | - * @param mixed $pFileHandle PHP filehandle |
|
317 | + * @param resource $pFileHandle PHP filehandle |
|
318 | 318 | * @param array $pValues Array containing values in a row |
319 | 319 | * @throws Exception |
320 | 320 | */ |
@@ -41,28 +41,28 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @var string |
43 | 43 | */ |
44 | - private $delimiter = ','; |
|
44 | + private $delimiter = ','; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Enclosure |
48 | 48 | * |
49 | 49 | * @var string |
50 | 50 | */ |
51 | - private $enclosure = '"'; |
|
51 | + private $enclosure = '"'; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Line ending |
55 | 55 | * |
56 | 56 | * @var string |
57 | 57 | */ |
58 | - private $lineEnding = PHP_EOL; |
|
58 | + private $lineEnding = PHP_EOL; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Sheet index to write |
62 | 62 | * |
63 | 63 | * @var int |
64 | 64 | */ |
65 | - private $sheetIndex = 0; |
|
65 | + private $sheetIndex = 0; |
|
66 | 66 | |
67 | 67 | /** |
68 | 68 | * Whether to write a BOM (for UTF8). |
@@ -119,10 +119,10 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | if ($this->excelCompatibility) { |
122 | - $this->setUseBOM(true); // Enforce UTF-8 BOM Header |
|
123 | - $this->setIncludeSeparatorLine(true); // Set separator line |
|
124 | - $this->setEnclosure('"'); // Set enclosure to " |
|
125 | - $this->setDelimiter(";"); // Set delimiter to a semi-colon |
|
122 | + $this->setUseBOM(true); // Enforce UTF-8 BOM Header |
|
123 | + $this->setIncludeSeparatorLine(true); // Set separator line |
|
124 | + $this->setEnclosure('"'); // Set enclosure to " |
|
125 | + $this->setDelimiter(";"); // Set delimiter to a semi-colon |
|
126 | 126 | $this->setLineEnding("\r\n"); |
127 | 127 | } |
128 | 128 | if ($this->useBOM) { |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | // Write rows to file |
142 | 142 | for ($row = 1; $row <= $maxRow; ++$row) { |
143 | 143 | // Convert the row to an array... |
144 | - $cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row, '', $this->preCalculateFormulas); |
|
144 | + $cellsArray = $sheet->rangeToArray('A' . $row . ':' . $maxCol . $row, '', $this->preCalculateFormulas); |
|
145 | 145 | // ... and write to the file |
146 | 146 | $this->writeLine($fileHandle, $cellsArray[0]); |
147 | 147 | } |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | /** |
398 | 398 | * Get PHPExcel object |
399 | 399 | * |
400 | - * @return PHPExcel |
|
400 | + * @return \PHPExcel\Spreadsheet |
|
401 | 401 | * @throws \PHPExcel\Writer\Exception |
402 | 402 | */ |
403 | 403 | public function getPHPExcel() |
@@ -516,7 +516,7 @@ discard block |
||
516 | 516 | * Set Office2003 compatibility |
517 | 517 | * |
518 | 518 | * @param boolean $pValue Office2003 compatibility? |
519 | - * @return PHPExcel_Writer_Excel2007 |
|
519 | + * @return Excel2007 |
|
520 | 520 | */ |
521 | 521 | public function setOffice2003Compatibility($pValue = false) |
522 | 522 | { |
@@ -139,8 +139,8 @@ |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | $hashTablesArray = array( 'stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
142 | - 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
143 | - 'styleHashTable' |
|
142 | + 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
143 | + 'styleHashTable' |
|
144 | 144 | ); |
145 | 145 | |
146 | 146 | // Set HashTable variables |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @var Excel2007\WriterPart[] |
43 | 43 | */ |
44 | - private $writerParts = array(); |
|
44 | + private $writerParts = array(); |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Private Spreadsheet |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * |
56 | 56 | * @var string[] |
57 | 57 | */ |
58 | - private $stringTable = array(); |
|
58 | + private $stringTable = array(); |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Private unique \PHPExcel\Style\Conditional HashTable |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | * |
91 | 91 | * @var \PHPExcel\HashTable |
92 | 92 | */ |
93 | - private $bordersHashTable ; |
|
93 | + private $bordersHashTable; |
|
94 | 94 | |
95 | 95 | /** |
96 | 96 | * Private unique \PHPExcel\Style\NumberFormat HashTable |
@@ -138,14 +138,14 @@ discard block |
||
138 | 138 | $this->writerParts[$writer] = new $class($this); |
139 | 139 | } |
140 | 140 | |
141 | - $hashTablesArray = array( 'stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
|
142 | - 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
141 | + $hashTablesArray = array('stylesConditionalHashTable', 'fillHashTable', 'fontHashTable', |
|
142 | + 'bordersHashTable', 'numFmtHashTable', 'drawingHashTable', |
|
143 | 143 | 'styleHashTable' |
144 | 144 | ); |
145 | 145 | |
146 | 146 | // Set HashTable variables |
147 | 147 | foreach ($hashTablesArray as $tableName) { |
148 | - $this->$tableName = new \PHPExcel\HashTable(); |
|
148 | + $this->$tableName = new \PHPExcel\HashTable(); |
|
149 | 149 | } |
150 | 150 | } |
151 | 151 | |
@@ -233,9 +233,9 @@ discard block |
||
233 | 233 | |
234 | 234 | //if hasMacros, add the vbaProject.bin file, Certificate file(if exists) |
235 | 235 | if ($this->spreadSheet->hasMacros()) { |
236 | - $macrosCode=$this->spreadSheet->getMacrosCode(); |
|
236 | + $macrosCode = $this->spreadSheet->getMacrosCode(); |
|
237 | 237 | if (!is_null($macrosCode)) {// we have the code ? |
238 | - $objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin |
|
238 | + $objZip->addFromString('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin |
|
239 | 239 | if ($this->spreadSheet->hasMacrosCertificate()) {//signed macros ? |
240 | 240 | // Yes : add the certificate file and the related rels file |
241 | 241 | $objZip->addFromString('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate()); |
@@ -245,16 +245,16 @@ discard block |
||
245 | 245 | } |
246 | 246 | //a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels) |
247 | 247 | if ($this->spreadSheet->hasRibbon()) { |
248 | - $tmpRibbonTarget=$this->spreadSheet->getRibbonXMLData('target'); |
|
248 | + $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target'); |
|
249 | 249 | $objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data')); |
250 | 250 | if ($this->spreadSheet->hasRibbonBinObjects()) { |
251 | - $tmpRootPath=dirname($tmpRibbonTarget).'/'; |
|
252 | - $ribbonBinObjects=$this->spreadSheet->getRibbonBinObjects('data');//the files to write |
|
251 | + $tmpRootPath = dirname($tmpRibbonTarget) . '/'; |
|
252 | + $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write |
|
253 | 253 | foreach ($ribbonBinObjects as $aPath => $aContent) { |
254 | - $objZip->addFromString($tmpRootPath.$aPath, $aContent); |
|
254 | + $objZip->addFromString($tmpRootPath . $aPath, $aContent); |
|
255 | 255 | } |
256 | 256 | //the rels for files |
257 | - $objZip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet)); |
|
257 | + $objZip->addFromString($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet)); |
|
258 | 258 | } |
259 | 259 | } |
260 | 260 |
@@ -566,7 +566,7 @@ |
||
566 | 566 | /** |
567 | 567 | * Get an array of all drawings |
568 | 568 | * |
569 | - * @param PHPExcel $pPHPExcel |
|
569 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
570 | 570 | * @return \PHPExcel\Worksheet\Drawing[] All drawings in PHPExcel |
571 | 571 | * @throws \PHPExcel\Writer\Exception |
572 | 572 | */ |
@@ -583,7 +583,7 @@ |
||
583 | 583 | while ($iterator->valid()) { |
584 | 584 | $aDrawings[] = $iterator->current(); |
585 | 585 | |
586 | - $iterator->next(); |
|
586 | + $iterator->next(); |
|
587 | 587 | } |
588 | 588 | } |
589 | 589 |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | // Loop through charts and write the chart position |
73 | 73 | if ($chartCount > 0) { |
74 | 74 | for ($c = 0; $c < $chartCount; ++$c) { |
75 | - $this->writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c+$i); |
|
75 | + $this->writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c + $i); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $objWriter->writeAttribute('macro', ''); |
118 | 118 | $objWriter->startElement('xdr:nvGraphicFramePr'); |
119 | 119 | $objWriter->startElement('xdr:cNvPr'); |
120 | - $objWriter->writeAttribute('name', 'Chart '.$pRelationId); |
|
120 | + $objWriter->writeAttribute('name', 'Chart ' . $pRelationId); |
|
121 | 121 | $objWriter->writeAttribute('id', 1025 * $pRelationId); |
122 | 122 | $objWriter->endElement(); |
123 | 123 | $objWriter->startElement('xdr:cNvGraphicFramePr'); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | $objWriter->startElement('c:chart'); |
144 | 144 | $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart'); |
145 | 145 | $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'); |
146 | - $objWriter->writeAttribute('r:id', 'rId'.$pRelationId); |
|
146 | + $objWriter->writeAttribute('r:id', 'rId' . $pRelationId); |
|
147 | 147 | $objWriter->endElement(); |
148 | 148 | $objWriter->endElement(); |
149 | 149 | $objWriter->endElement(); |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | // xdr:oneCellAnchor |
170 | 170 | $objWriter->startElement('xdr:oneCellAnchor'); |
171 | 171 | // Image location |
172 | - $aCoordinates = \PHPExcel\Cell::coordinateFromString($pDrawing->getCoordinates()); |
|
173 | - $aCoordinates[0] = \PHPExcel\Cell::columnIndexFromString($aCoordinates[0]); |
|
172 | + $aCoordinates = \PHPExcel\Cell::coordinateFromString($pDrawing->getCoordinates()); |
|
173 | + $aCoordinates[0] = \PHPExcel\Cell::columnIndexFromString($aCoordinates[0]); |
|
174 | 174 | |
175 | 175 | // xdr:from |
176 | 176 | $objWriter->startElement('xdr:from'); |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | public function allDrawings(\PHPExcel\SpreadSheet $pPHPExcel = null) |
574 | 574 | { |
575 | 575 | // Get an array of all drawings |
576 | - $aDrawings = array(); |
|
576 | + $aDrawings = array(); |
|
577 | 577 | |
578 | 578 | // Loop through PHPExcel |
579 | 579 | $sheetCount = $pPHPExcel->getSheetCount(); |
@@ -565,7 +565,7 @@ |
||
565 | 565 | /** |
566 | 566 | * Get an array of all styles |
567 | 567 | * |
568 | - * @param PHPExcel $pPHPExcel |
|
568 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
569 | 569 | * @return PHPExcel_Style[] All styles in PHPExcel |
570 | 570 | * @throws \PHPExcel\Writer\Exception |
571 | 571 | */ |
@@ -389,19 +389,19 @@ discard block |
||
389 | 389 | // xf |
390 | 390 | $objWriter->startElement('xf'); |
391 | 391 | $objWriter->writeAttribute('xfId', 0); |
392 | - $objWriter->writeAttribute('fontId', (int)$this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode())); |
|
392 | + $objWriter->writeAttribute('fontId', (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode())); |
|
393 | 393 | if ($pStyle->getQuotePrefix()) { |
394 | 394 | $objWriter->writeAttribute('quotePrefix', 1); |
395 | 395 | } |
396 | 396 | |
397 | 397 | if ($pStyle->getNumberFormat()->getBuiltInFormatCode() === false) { |
398 | - $objWriter->writeAttribute('numFmtId', (int)($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164)); |
|
398 | + $objWriter->writeAttribute('numFmtId', (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164)); |
|
399 | 399 | } else { |
400 | - $objWriter->writeAttribute('numFmtId', (int)$pStyle->getNumberFormat()->getBuiltInFormatCode()); |
|
400 | + $objWriter->writeAttribute('numFmtId', (int) $pStyle->getNumberFormat()->getBuiltInFormatCode()); |
|
401 | 401 | } |
402 | 402 | |
403 | - $objWriter->writeAttribute('fillId', (int)$this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode())); |
|
404 | - $objWriter->writeAttribute('borderId', (int)$this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode())); |
|
403 | + $objWriter->writeAttribute('fillId', (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode())); |
|
404 | + $objWriter->writeAttribute('borderId', (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode())); |
|
405 | 405 | |
406 | 406 | // Apply styles? |
407 | 407 | $objWriter->writeAttribute('applyFont', ($pPHPExcel->getDefaultStyle()->getFont()->getHashCode() != $pStyle->getFont()->getHashCode()) ? '1' : '0'); |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | /** @var \PHPExcel\Style $style */ |
624 | 624 | foreach ($aStyles as $style) { |
625 | 625 | if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) { |
626 | - $aFills[ $style->getFill()->getHashCode() ] = $style->getFill(); |
|
626 | + $aFills[$style->getFill()->getHashCode()] = $style->getFill(); |
|
627 | 627 | } |
628 | 628 | } |
629 | 629 | |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | /** @var \PHPExcel\Style $style */ |
647 | 647 | foreach ($aStyles as $style) { |
648 | 648 | if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) { |
649 | - $aFonts[ $style->getFont()->getHashCode() ] = $style->getFont(); |
|
649 | + $aFonts[$style->getFont()->getHashCode()] = $style->getFont(); |
|
650 | 650 | } |
651 | 651 | } |
652 | 652 | |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | /** @var \PHPExcel\Style $style */ |
670 | 670 | foreach ($aStyles as $style) { |
671 | 671 | if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) { |
672 | - $aBorders[ $style->getBorders()->getHashCode() ] = $style->getBorders(); |
|
672 | + $aBorders[$style->getBorders()->getHashCode()] = $style->getBorders(); |
|
673 | 673 | } |
674 | 674 | } |
675 | 675 | |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | /** @var \PHPExcel\Style $style */ |
693 | 693 | foreach ($aStyles as $style) { |
694 | 694 | if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) { |
695 | - $aNumFmts[ $style->getNumberFormat()->getHashCode() ] = $style->getNumberFormat(); |
|
695 | + $aNumFmts[$style->getNumberFormat()->getHashCode()] = $style->getNumberFormat(); |
|
696 | 696 | } |
697 | 697 | } |
698 | 698 |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * Write BookViews |
123 | 123 | * |
124 | 124 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
125 | - * @param PHPExcel $pPHPExcel |
|
125 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
126 | 126 | * @throws \PHPExcel\Writer\Exception |
127 | 127 | */ |
128 | 128 | private function writeBookViews(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * Write WorkbookProtection |
153 | 153 | * |
154 | 154 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
155 | - * @param PHPExcel $pPHPExcel |
|
155 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
156 | 156 | * @throws \PHPExcel\Writer\Exception |
157 | 157 | */ |
158 | 158 | private function writeWorkbookProtection(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * Write sheets |
203 | 203 | * |
204 | 204 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
205 | - * @param PHPExcel $pPHPExcel |
|
205 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
206 | 206 | * @throws \PHPExcel\Writer\Exception |
207 | 207 | */ |
208 | 208 | private function writeSheets(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * Write Defined Names |
256 | 256 | * |
257 | 257 | * @param \PHPExcel\Shared\XMLWriter $objWriter XML Writer |
258 | - * @param PHPExcel $pPHPExcel |
|
258 | + * @param \PHPExcel\Spreadsheet $pPHPExcel |
|
259 | 259 | * @throws \PHPExcel\Writer\Exception |
260 | 260 | */ |
261 | 261 | private function writeDefinedNames(\PHPExcel\Shared\XMLWriter $objWriter, \PHPExcel\SpreadSheet $pPHPExcel = null) |
@@ -67,6 +67,7 @@ |
||
67 | 67 | |
68 | 68 | /** |
69 | 69 | * Process the object to be written |
70 | + * @return string |
|
70 | 71 | */ |
71 | 72 | public function close() |
72 | 73 | { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $innerData = ''; |
93 | 93 | |
94 | 94 | // write the dgg |
95 | - $recVer = 0x0; |
|
95 | + $recVer = 0x0; |
|
96 | 96 | $recInstance = 0x0000; |
97 | 97 | $recType = 0xF006; |
98 | 98 | |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | $length = strlen($data); |
207 | 207 | |
208 | 208 | $recVerInstance = $recVer; |
209 | - $recVerInstance |= $recInstance << 4; |
|
209 | + $recVerInstance |= $recInstance << 4; |
|
210 | 210 | |
211 | 211 | $header = pack('vvV', $recVerInstance, $recType, $length); |
212 | 212 | |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | $length = strlen($innerData); |
238 | 238 | |
239 | 239 | $recVerInstance = $recVer; |
240 | - $recVerInstance |= $recInstance << 4; |
|
240 | + $recVerInstance |= $recInstance << 4; |
|
241 | 241 | |
242 | 242 | $header = pack('vvV', $recVerInstance, $recType, $length); |
243 | 243 | |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $length = strlen($innerData); |
265 | 265 | |
266 | 266 | $recVerInstance = $recVer; |
267 | - $recVerInstance |= $recInstance << 4; |
|
267 | + $recVerInstance |= $recInstance << 4; |
|
268 | 268 | |
269 | 269 | $header = pack('vvV', $recVerInstance, $recType, $length); |
270 | 270 | |
@@ -406,13 +406,13 @@ discard block |
||
406 | 406 | if ($this->object->getOPTCollection()) { |
407 | 407 | $optData = ''; |
408 | 408 | |
409 | - $recVer = 0x3; |
|
409 | + $recVer = 0x3; |
|
410 | 410 | $recInstance = count($this->object->getOPTCollection()); |
411 | 411 | $recType = 0xF00B; |
412 | 412 | foreach ($this->object->getOPTCollection() as $property => $value) { |
413 | 413 | $optData .= pack('vV', $property, $value); |
414 | 414 | } |
415 | - $length = strlen($optData); |
|
415 | + $length = strlen($optData); |
|
416 | 416 | |
417 | 417 | $recVerInstance = $recVer; |
418 | 418 | $recVerInstance |= $recInstance << 4; |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | if ($this->object->getStartCoordinates()) { |
426 | 426 | $clientAnchorData = ''; |
427 | 427 | |
428 | - $recVer = 0x0; |
|
428 | + $recVer = 0x0; |
|
429 | 429 | $recInstance = 0x0; |
430 | 430 | $recType = 0xF010; |
431 | 431 | |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | |
454 | 454 | $clientAnchorData = pack('vvvvvvvvv', $this->object->getSpFlag(), $c1, $startOffsetX, $r1, $startOffsetY, $c2, $endOffsetX, $r2, $endOffsetY); |
455 | 455 | |
456 | - $length = strlen($clientAnchorData); |
|
456 | + $length = strlen($clientAnchorData); |
|
457 | 457 | |
458 | 458 | $recVerInstance = $recVer; |
459 | 459 | $recVerInstance |= $recInstance << 4; |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | if (!$this->object->getSpgr()) { |
467 | 467 | $clientDataData = ''; |
468 | 468 | |
469 | - $recVer = 0x0; |
|
469 | + $recVer = 0x0; |
|
470 | 470 | $recInstance = 0x0; |
471 | 471 | $recType = 0xF011; |
472 | 472 |