@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | // Try opening the ZIP file |
216 | 216 | if ($zip->open($pFilename, ZipArchive::OVERWRITE) !== true) { |
217 | 217 | if ($zip->open($pFilename, ZipArchive::CREATE) !== true) { |
218 | - throw new WriterException('Could not open ' . $pFilename . ' for writing.'); |
|
218 | + throw new WriterException('Could not open '.$pFilename.' for writing.'); |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target'); |
242 | 242 | $zip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data')); |
243 | 243 | if ($this->spreadSheet->hasRibbonBinObjects()) { |
244 | - $tmpRootPath = dirname($tmpRibbonTarget) . '/'; |
|
244 | + $tmpRootPath = dirname($tmpRibbonTarget).'/'; |
|
245 | 245 | $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write |
246 | 246 | foreach ($ribbonBinObjects as $aPath => $aContent) { |
247 | - $zip->addFromString($tmpRootPath . $aPath, $aContent); |
|
247 | + $zip->addFromString($tmpRootPath.$aPath, $aContent); |
|
248 | 248 | } |
249 | 249 | //the rels for files |
250 | - $zip->addFromString($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet)); |
|
250 | + $zip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet)); |
|
251 | 251 | } |
252 | 252 | } |
253 | 253 | |
@@ -278,12 +278,12 @@ discard block |
||
278 | 278 | $chartCount = 0; |
279 | 279 | // Add worksheets |
280 | 280 | for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) { |
281 | - $zip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts)); |
|
281 | + $zip->addFromString('xl/worksheets/sheet'.($i + 1).'.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts)); |
|
282 | 282 | if ($this->includeCharts) { |
283 | 283 | $charts = $this->spreadSheet->getSheet($i)->getChartCollection(); |
284 | 284 | if (count($charts) > 0) { |
285 | 285 | foreach ($charts as $chart) { |
286 | - $zip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas)); |
|
286 | + $zip->addFromString('xl/charts/chart'.($chartCount + 1).'.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas)); |
|
287 | 287 | ++$chartCount; |
288 | 288 | } |
289 | 289 | } |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | // Add worksheet relationships (drawings, ...) |
295 | 295 | for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) { |
296 | 296 | // Add relationships |
297 | - $zip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts)); |
|
297 | + $zip->addFromString('xl/worksheets/_rels/sheet'.($i + 1).'.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts)); |
|
298 | 298 | |
299 | 299 | // Add unparsedLoadedData |
300 | 300 | $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName(); |
@@ -319,13 +319,13 @@ discard block |
||
319 | 319 | // Add drawing and image relationship parts |
320 | 320 | if (($drawingCount > 0) || ($chartCount > 0)) { |
321 | 321 | // Drawing relationships |
322 | - $zip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts)); |
|
322 | + $zip->addFromString('xl/drawings/_rels/drawing'.($i + 1).'.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts)); |
|
323 | 323 | |
324 | 324 | // Drawings |
325 | - $zip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts)); |
|
325 | + $zip->addFromString('xl/drawings/drawing'.($i + 1).'.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts)); |
|
326 | 326 | } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) { |
327 | 327 | // Drawings |
328 | - $zip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts)); |
|
328 | + $zip->addFromString('xl/drawings/drawing'.($i + 1).'.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts)); |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | // Add unparsed drawings |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']); |
335 | 335 | if ($drawingFile !== false) { |
336 | 336 | $drawingFile = ltrim($drawingFile, '.'); |
337 | - $zip->addFromString('xl' . $drawingFile, $drawingXml); |
|
337 | + $zip->addFromString('xl'.$drawingFile, $drawingXml); |
|
338 | 338 | } |
339 | 339 | } |
340 | 340 | } |
@@ -342,10 +342,10 @@ discard block |
||
342 | 342 | // Add comment relationship parts |
343 | 343 | if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) { |
344 | 344 | // VML Comments |
345 | - $zip->addFromString('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i))); |
|
345 | + $zip->addFromString('xl/drawings/vmlDrawing'.($i + 1).'.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i))); |
|
346 | 346 | |
347 | 347 | // Comments |
348 | - $zip->addFromString('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i))); |
|
348 | + $zip->addFromString('xl/comments'.($i + 1).'.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i))); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | // Add unparsed relationship parts |
@@ -358,14 +358,14 @@ discard block |
||
358 | 358 | // Add header/footer relationship parts |
359 | 359 | if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) { |
360 | 360 | // VML Drawings |
361 | - $zip->addFromString('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i))); |
|
361 | + $zip->addFromString('xl/drawings/vmlDrawingHF'.($i + 1).'.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i))); |
|
362 | 362 | |
363 | 363 | // VML Drawing relationships |
364 | - $zip->addFromString('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i))); |
|
364 | + $zip->addFromString('xl/drawings/_rels/vmlDrawingHF'.($i + 1).'.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i))); |
|
365 | 365 | |
366 | 366 | // Media |
367 | 367 | foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) { |
368 | - $zip->addFromString('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath())); |
|
368 | + $zip->addFromString('xl/media/'.$image->getIndexedFilename(), file_get_contents($image->getPath())); |
|
369 | 369 | } |
370 | 370 | } |
371 | 371 | } |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | $imageContents = file_get_contents($imagePath); |
389 | 389 | } |
390 | 390 | |
391 | - $zip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents); |
|
391 | + $zip->addFromString('xl/media/'.str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents); |
|
392 | 392 | } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) { |
393 | 393 | ob_start(); |
394 | 394 | call_user_func( |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | $imageContents = ob_get_contents(); |
399 | 399 | ob_end_clean(); |
400 | 400 | |
401 | - $zip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents); |
|
401 | + $zip->addFromString('xl/media/'.str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents); |
|
402 | 402 | } |
403 | 403 | } |
404 | 404 |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | // Style XF |
190 | 190 | $style = $cell->getXfIndex(); |
191 | 191 | if ($style !== null) { |
192 | - $objWriter->writeAttribute('table:style-name', self::CELL_STYLE_PREFIX . $style); |
|
192 | + $objWriter->writeAttribute('table:style-name', self::CELL_STYLE_PREFIX.$style); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | switch ($cell->getDataType()) { |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | // don't do anything |
213 | 213 | } |
214 | 214 | } |
215 | - $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue()); |
|
215 | + $objWriter->writeAttribute('table:formula', 'of:'.$cell->getValue()); |
|
216 | 216 | if (is_numeric($formulaValue)) { |
217 | 217 | $objWriter->writeAttribute('office:value-type', 'float'); |
218 | 218 | } else { |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | { |
285 | 285 | foreach ($spreadsheet->getCellXfCollection() as $style) { |
286 | 286 | $writer->startElement('style:style'); |
287 | - $writer->writeAttribute('style:name', self::CELL_STYLE_PREFIX . $style->getIndex()); |
|
287 | + $writer->writeAttribute('style:name', self::CELL_STYLE_PREFIX.$style->getIndex()); |
|
288 | 288 | $writer->writeAttribute('style:family', 'table-cell'); |
289 | 289 | $writer->writeAttribute('style:parent-style-name', 'Default'); |
290 | 290 |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | } |
111 | 111 | if ($this->includeSeparatorLine) { |
112 | 112 | // Write the separator line if required |
113 | - fwrite($fileHandle, 'sep=' . $this->getDelimiter() . $this->lineEnding); |
|
113 | + fwrite($fileHandle, 'sep='.$this->getDelimiter().$this->lineEnding); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | // Identify the range that we need to extract from the worksheet |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | // Write rows to file |
121 | 121 | for ($row = 1; $row <= $maxRow; ++$row) { |
122 | 122 | // Convert the row to an array... |
123 | - $cellsArray = $sheet->rangeToArray('A' . $row . ':' . $maxCol . $row, '', $this->preCalculateFormulas); |
|
123 | + $cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row, '', $this->preCalculateFormulas); |
|
124 | 124 | // ... and write to the file |
125 | 125 | $this->writeLine($fileHandle, $cellsArray[0]); |
126 | 126 | } |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | |
321 | 321 | foreach ($pValues as $element) { |
322 | 322 | // Escape enclosures |
323 | - $element = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $element); |
|
323 | + $element = str_replace($this->enclosure, $this->enclosure.$this->enclosure, $element); |
|
324 | 324 | |
325 | 325 | // Add delimiter |
326 | 326 | if ($writeDelimiter) { |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | // Add enclosed string |
333 | - $line .= $this->enclosure . $element . $this->enclosure; |
|
333 | + $line .= $this->enclosure.$element.$this->enclosure; |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | // Add line ending |
@@ -197,14 +197,14 @@ discard block |
||
197 | 197 | $this->documentSummaryInformation = $this->writeDocumentSummaryInformation(); |
198 | 198 | // initialize OLE Document Summary Information |
199 | 199 | if (isset($this->documentSummaryInformation) && !empty($this->documentSummaryInformation)) { |
200 | - $OLE_DocumentSummaryInformation = new File(OLE::ascToUcs(chr(5) . 'DocumentSummaryInformation')); |
|
200 | + $OLE_DocumentSummaryInformation = new File(OLE::ascToUcs(chr(5).'DocumentSummaryInformation')); |
|
201 | 201 | $OLE_DocumentSummaryInformation->append($this->documentSummaryInformation); |
202 | 202 | } |
203 | 203 | |
204 | 204 | $this->summaryInformation = $this->writeSummaryInformation(); |
205 | 205 | // initialize OLE Summary Information |
206 | 206 | if (isset($this->summaryInformation) && !empty($this->summaryInformation)) { |
207 | - $OLE_SummaryInformation = new File(OLE::ascToUcs(chr(5) . 'SummaryInformation')); |
|
207 | + $OLE_SummaryInformation = new File(OLE::ascToUcs(chr(5).'SummaryInformation')); |
|
208 | 208 | $OLE_SummaryInformation->append($this->summaryInformation); |
209 | 209 | } |
210 | 210 | |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | // create an Drawing Object for the dropdown |
335 | 335 | $oDrawing = new BaseDrawing(); |
336 | 336 | // get the coordinates of drawing |
337 | - $cDrawing = Coordinate::stringFromColumnIndex($iInc) . $rangeBounds[0][1]; |
|
337 | + $cDrawing = Coordinate::stringFromColumnIndex($iInc).$rangeBounds[0][1]; |
|
338 | 338 | $oDrawing->setCoordinates($cDrawing); |
339 | 339 | $oDrawing->setWorksheet($sheet); |
340 | 340 | |
@@ -640,7 +640,7 @@ discard block |
||
640 | 640 | $dataProp .= pack('v', 0x000A); |
641 | 641 | $dataProp .= pack('v', 0x0000); |
642 | 642 | // value |
643 | - $dataProp .= 'Worksheet' . chr(0); |
|
643 | + $dataProp .= 'Worksheet'.chr(0); |
|
644 | 644 | |
645 | 645 | $dataSection[] = [ |
646 | 646 | 'summary' => ['pack' => 'V', 'data' => 0x0D], |
@@ -355,46 +355,46 @@ discard block |
||
355 | 355 | { |
356 | 356 | // Construct HTML |
357 | 357 | $properties = $this->spreadsheet->getProperties(); |
358 | - $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL; |
|
359 | - $html .= '<html>' . PHP_EOL; |
|
360 | - $html .= ' <head>' . PHP_EOL; |
|
361 | - $html .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL; |
|
362 | - $html .= ' <meta name="generator" content="PhpSpreadsheet, https://github.com/PHPOffice/PhpSpreadsheet">' . PHP_EOL; |
|
358 | + $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'.PHP_EOL; |
|
359 | + $html .= '<html>'.PHP_EOL; |
|
360 | + $html .= ' <head>'.PHP_EOL; |
|
361 | + $html .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.PHP_EOL; |
|
362 | + $html .= ' <meta name="generator" content="PhpSpreadsheet, https://github.com/PHPOffice/PhpSpreadsheet">'.PHP_EOL; |
|
363 | 363 | if ($properties->getTitle() > '') { |
364 | - $html .= ' <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL; |
|
364 | + $html .= ' <title>'.htmlspecialchars($properties->getTitle()).'</title>'.PHP_EOL; |
|
365 | 365 | } |
366 | 366 | if ($properties->getCreator() > '') { |
367 | - $html .= ' <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL; |
|
367 | + $html .= ' <meta name="author" content="'.htmlspecialchars($properties->getCreator()).'" />'.PHP_EOL; |
|
368 | 368 | } |
369 | 369 | if ($properties->getTitle() > '') { |
370 | - $html .= ' <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL; |
|
370 | + $html .= ' <meta name="title" content="'.htmlspecialchars($properties->getTitle()).'" />'.PHP_EOL; |
|
371 | 371 | } |
372 | 372 | if ($properties->getDescription() > '') { |
373 | - $html .= ' <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL; |
|
373 | + $html .= ' <meta name="description" content="'.htmlspecialchars($properties->getDescription()).'" />'.PHP_EOL; |
|
374 | 374 | } |
375 | 375 | if ($properties->getSubject() > '') { |
376 | - $html .= ' <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL; |
|
376 | + $html .= ' <meta name="subject" content="'.htmlspecialchars($properties->getSubject()).'" />'.PHP_EOL; |
|
377 | 377 | } |
378 | 378 | if ($properties->getKeywords() > '') { |
379 | - $html .= ' <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL; |
|
379 | + $html .= ' <meta name="keywords" content="'.htmlspecialchars($properties->getKeywords()).'" />'.PHP_EOL; |
|
380 | 380 | } |
381 | 381 | if ($properties->getCategory() > '') { |
382 | - $html .= ' <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL; |
|
382 | + $html .= ' <meta name="category" content="'.htmlspecialchars($properties->getCategory()).'" />'.PHP_EOL; |
|
383 | 383 | } |
384 | 384 | if ($properties->getCompany() > '') { |
385 | - $html .= ' <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL; |
|
385 | + $html .= ' <meta name="company" content="'.htmlspecialchars($properties->getCompany()).'" />'.PHP_EOL; |
|
386 | 386 | } |
387 | 387 | if ($properties->getManager() > '') { |
388 | - $html .= ' <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL; |
|
388 | + $html .= ' <meta name="manager" content="'.htmlspecialchars($properties->getManager()).'" />'.PHP_EOL; |
|
389 | 389 | } |
390 | 390 | |
391 | 391 | if ($pIncludeStyles) { |
392 | 392 | $html .= $this->generateStyles(true); |
393 | 393 | } |
394 | 394 | |
395 | - $html .= ' </head>' . PHP_EOL; |
|
396 | - $html .= '' . PHP_EOL; |
|
397 | - $html .= ' <body>' . PHP_EOL; |
|
395 | + $html .= ' </head>'.PHP_EOL; |
|
396 | + $html .= ''.PHP_EOL; |
|
397 | + $html .= ' <body>'.PHP_EOL; |
|
398 | 398 | |
399 | 399 | return $html; |
400 | 400 | } |
@@ -460,13 +460,13 @@ discard block |
||
460 | 460 | while ($row++ < $rowMax) { |
461 | 461 | // <thead> ? |
462 | 462 | if ($row == $theadStart) { |
463 | - $html .= ' <thead>' . PHP_EOL; |
|
463 | + $html .= ' <thead>'.PHP_EOL; |
|
464 | 464 | $cellType = 'th'; |
465 | 465 | } |
466 | 466 | |
467 | 467 | // <tbody> ? |
468 | 468 | if ($row == $tbodyStart) { |
469 | - $html .= ' <tbody>' . PHP_EOL; |
|
469 | + $html .= ' <tbody>'.PHP_EOL; |
|
470 | 470 | $cellType = 'td'; |
471 | 471 | } |
472 | 472 | |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | while ($column <= $dimension[1][0]) { |
480 | 480 | // Cell exists? |
481 | 481 | if ($sheet->cellExistsByColumnAndRow($column, $row)) { |
482 | - $rowData[$column] = Coordinate::stringFromColumnIndex($column) . $row; |
|
482 | + $rowData[$column] = Coordinate::stringFromColumnIndex($column).$row; |
|
483 | 483 | } else { |
484 | 484 | $rowData[$column] = ''; |
485 | 485 | } |
@@ -490,13 +490,13 @@ discard block |
||
490 | 490 | |
491 | 491 | // </thead> ? |
492 | 492 | if ($row == $theadEnd) { |
493 | - $html .= ' </thead>' . PHP_EOL; |
|
493 | + $html .= ' </thead>'.PHP_EOL; |
|
494 | 494 | } |
495 | 495 | } |
496 | 496 | $html .= $this->extendRowsForChartsAndImages($sheet, $row); |
497 | 497 | |
498 | 498 | // Close table body. |
499 | - $html .= ' </tbody>' . PHP_EOL; |
|
499 | + $html .= ' </tbody>'.PHP_EOL; |
|
500 | 500 | |
501 | 501 | // Write table footer |
502 | 502 | $html .= $this->generateTableFooter(); |
@@ -540,14 +540,14 @@ discard block |
||
540 | 540 | // Loop all sheets |
541 | 541 | $sheetId = 0; |
542 | 542 | |
543 | - $html .= '<ul class="navigation">' . PHP_EOL; |
|
543 | + $html .= '<ul class="navigation">'.PHP_EOL; |
|
544 | 544 | |
545 | 545 | foreach ($sheets as $sheet) { |
546 | - $html .= ' <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL; |
|
546 | + $html .= ' <li class="sheet'.$sheetId.'"><a href="#sheet'.$sheetId.'">'.$sheet->getTitle().'</a></li>'.PHP_EOL; |
|
547 | 547 | ++$sheetId; |
548 | 548 | } |
549 | 549 | |
550 | - $html .= '</ul>' . PHP_EOL; |
|
550 | + $html .= '</ul>'.PHP_EOL; |
|
551 | 551 | } |
552 | 552 | |
553 | 553 | return $html; |
@@ -598,9 +598,9 @@ discard block |
||
598 | 598 | $html .= '<tr>'; |
599 | 599 | for ($col = 'A'; $col != $colMax; ++$col) { |
600 | 600 | $html .= '<td>'; |
601 | - $html .= $this->writeImageInCell($pSheet, $col . $row); |
|
601 | + $html .= $this->writeImageInCell($pSheet, $col.$row); |
|
602 | 602 | if ($this->includeCharts) { |
603 | - $html .= $this->writeChartInCell($pSheet, $col . $row); |
|
603 | + $html .= $this->writeChartInCell($pSheet, $col.$row); |
|
604 | 604 | } |
605 | 605 | $html .= '</td>'; |
606 | 606 | } |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | } |
637 | 637 | |
638 | 638 | // Prepend images root |
639 | - $filename = $this->getImagesRoot() . $filename; |
|
639 | + $filename = $this->getImagesRoot().$filename; |
|
640 | 640 | |
641 | 641 | // Strip off eventual '.' |
642 | 642 | if (substr($filename, 0, 1) == '.' && substr($filename, 0, 2) != './') { |
@@ -660,17 +660,17 @@ discard block |
||
660 | 660 | // base64 encode the binary data, then break it |
661 | 661 | // into chunks according to RFC 2045 semantics |
662 | 662 | $base64 = chunk_split(base64_encode($picture)); |
663 | - $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64; |
|
663 | + $imageData = 'data:'.$imageDetails['mime'].';base64,'.$base64; |
|
664 | 664 | } else { |
665 | 665 | $imageData = $filename; |
666 | 666 | } |
667 | 667 | } |
668 | 668 | |
669 | 669 | $html .= '<div style="position: relative;">'; |
670 | - $html .= '<img style="position: absolute; z-index: 1; left: ' . |
|
671 | - $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . |
|
672 | - $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . |
|
673 | - $imageData . '" border="0" />'; |
|
670 | + $html .= '<img style="position: absolute; z-index: 1; left: '. |
|
671 | + $drawing->getOffsetX().'px; top: '.$drawing->getOffsetY().'px; width: '. |
|
672 | + $drawing->getWidth().'px; height: '.$drawing->getHeight().'px;" src="'. |
|
673 | + $imageData.'" border="0" />'; |
|
674 | 674 | $html .= '</div>'; |
675 | 675 | } |
676 | 676 | } elseif ($drawing instanceof MemoryDrawing) { |
@@ -682,13 +682,13 @@ discard block |
||
682 | 682 | $contents = ob_get_contents(); // Instead, output above is saved to $contents |
683 | 683 | ob_end_clean(); // End the output buffer. |
684 | 684 | |
685 | - $dataUri = 'data:image/jpeg;base64,' . base64_encode($contents); |
|
685 | + $dataUri = 'data:image/jpeg;base64,'.base64_encode($contents); |
|
686 | 686 | |
687 | 687 | // Because of the nature of tables, width is more important than height. |
688 | 688 | // max-width: 100% ensures that image doesnt overflow containing cell |
689 | 689 | // width: X sets width of supplied image. |
690 | 690 | // As a result, images bigger than cell will be contained and images smaller will not get stretched |
691 | - $html .= '<img src="' . $dataUri . '" style="max-width:100%;width:' . $drawing->getWidth() . 'px;" />'; |
|
691 | + $html .= '<img src="'.$dataUri.'" style="max-width:100%;width:'.$drawing->getWidth().'px;" />'; |
|
692 | 692 | } |
693 | 693 | } |
694 | 694 | |
@@ -713,7 +713,7 @@ discard block |
||
713 | 713 | if ($chart instanceof Chart) { |
714 | 714 | $chartCoordinates = $chart->getTopLeftPosition(); |
715 | 715 | if ($chartCoordinates['cell'] == $coordinates) { |
716 | - $chartFileName = File::sysGetTempDir() . '/' . uniqid('', true) . '.png'; |
|
716 | + $chartFileName = File::sysGetTempDir().'/'.uniqid('', true).'.png'; |
|
717 | 717 | if (!$chart->render($chartFileName)) { |
718 | 718 | return; |
719 | 719 | } |
@@ -726,10 +726,10 @@ discard block |
||
726 | 726 | // base64 encode the binary data, then break it |
727 | 727 | // into chunks according to RFC 2045 semantics |
728 | 728 | $base64 = chunk_split(base64_encode($picture)); |
729 | - $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64; |
|
729 | + $imageData = 'data:'.$imageDetails['mime'].';base64,'.$base64; |
|
730 | 730 | |
731 | 731 | $html .= '<div style="position: relative;">'; |
732 | - $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" border="0" />' . PHP_EOL; |
|
732 | + $html .= '<img style="position: absolute; z-index: 1; left: '.$chartCoordinates['xOffset'].'px; top: '.$chartCoordinates['yOffset'].'px; width: '.$imageDetails[0].'px; height: '.$imageDetails[1].'px;" src="'.$imageData.'" border="0" />'.PHP_EOL; |
|
733 | 733 | $html .= '</div>'; |
734 | 734 | |
735 | 735 | unlink($chartFileName); |
@@ -761,20 +761,20 @@ discard block |
||
761 | 761 | |
762 | 762 | // Start styles |
763 | 763 | if ($generateSurroundingHTML) { |
764 | - $html .= ' <style type="text/css">' . PHP_EOL; |
|
765 | - $html .= ' html { ' . $this->assembleCSS($css['html']) . ' }' . PHP_EOL; |
|
764 | + $html .= ' <style type="text/css">'.PHP_EOL; |
|
765 | + $html .= ' html { '.$this->assembleCSS($css['html']).' }'.PHP_EOL; |
|
766 | 766 | } |
767 | 767 | |
768 | 768 | // Write all other styles |
769 | 769 | foreach ($css as $styleName => $styleDefinition) { |
770 | 770 | if ($styleName != 'html') { |
771 | - $html .= ' ' . $styleName . ' { ' . $this->assembleCSS($styleDefinition) . ' }' . PHP_EOL; |
|
771 | + $html .= ' '.$styleName.' { '.$this->assembleCSS($styleDefinition).' }'.PHP_EOL; |
|
772 | 772 | } |
773 | 773 | } |
774 | 774 | |
775 | 775 | // End styles |
776 | 776 | if ($generateSurroundingHTML) { |
777 | - $html .= ' </style>' . PHP_EOL; |
|
777 | + $html .= ' </style>'.PHP_EOL; |
|
778 | 778 | } |
779 | 779 | |
780 | 780 | // Return |
@@ -862,8 +862,8 @@ discard block |
||
862 | 862 | |
863 | 863 | // Calculate cell style hashes |
864 | 864 | foreach ($this->spreadsheet->getCellXfCollection() as $index => $style) { |
865 | - $css['td.style' . $index] = $this->createCSSStyle($style); |
|
866 | - $css['th.style' . $index] = $this->createCSSStyle($style); |
|
865 | + $css['td.style'.$index] = $this->createCSSStyle($style); |
|
866 | + $css['th.style'.$index] = $this->createCSSStyle($style); |
|
867 | 867 | } |
868 | 868 | |
869 | 869 | // Fetch sheets |
@@ -888,7 +888,7 @@ discard block |
||
888 | 888 | $column = -1; |
889 | 889 | while ($column++ < $highestColumnIndex) { |
890 | 890 | $this->columnWidths[$sheetIndex][$column] = 42; // approximation |
891 | - $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt'; |
|
891 | + $css['table.sheet'.$sheetIndex.' col.col'.$column]['width'] = '42pt'; |
|
892 | 892 | } |
893 | 893 | |
894 | 894 | // col elements, loop through columnDimensions and set width |
@@ -897,11 +897,11 @@ discard block |
||
897 | 897 | $width = SharedDrawing::pixelsToPoints($width); |
898 | 898 | $column = Coordinate::columnIndexFromString($columnDimension->getColumnIndex()) - 1; |
899 | 899 | $this->columnWidths[$sheetIndex][$column] = $width; |
900 | - $css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt'; |
|
900 | + $css['table.sheet'.$sheetIndex.' col.col'.$column]['width'] = $width.'pt'; |
|
901 | 901 | |
902 | 902 | if ($columnDimension->getVisible() === false) { |
903 | - $css['table.sheet' . $sheetIndex . ' .column' . $column]['visibility'] = 'collapse'; |
|
904 | - $css['table.sheet' . $sheetIndex . ' .column' . $column]['display'] = 'none'; // target IE6+7 |
|
903 | + $css['table.sheet'.$sheetIndex.' .column'.$column]['visibility'] = 'collapse'; |
|
904 | + $css['table.sheet'.$sheetIndex.' .column'.$column]['display'] = 'none'; // target IE6+7 |
|
905 | 905 | } |
906 | 906 | } |
907 | 907 | } |
@@ -910,17 +910,17 @@ discard block |
||
910 | 910 | $rowDimension = $sheet->getDefaultRowDimension(); |
911 | 911 | |
912 | 912 | // table.sheetN tr { } |
913 | - $css['table.sheet' . $sheetIndex . ' tr'] = []; |
|
913 | + $css['table.sheet'.$sheetIndex.' tr'] = []; |
|
914 | 914 | |
915 | 915 | if ($rowDimension->getRowHeight() == -1) { |
916 | 916 | $pt_height = SharedFont::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont()); |
917 | 917 | } else { |
918 | 918 | $pt_height = $rowDimension->getRowHeight(); |
919 | 919 | } |
920 | - $css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt'; |
|
920 | + $css['table.sheet'.$sheetIndex.' tr']['height'] = $pt_height.'pt'; |
|
921 | 921 | if ($rowDimension->getVisible() === false) { |
922 | - $css['table.sheet' . $sheetIndex . ' tr']['display'] = 'none'; |
|
923 | - $css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden'; |
|
922 | + $css['table.sheet'.$sheetIndex.' tr']['display'] = 'none'; |
|
923 | + $css['table.sheet'.$sheetIndex.' tr']['visibility'] = 'hidden'; |
|
924 | 924 | } |
925 | 925 | |
926 | 926 | // Calculate row heights |
@@ -928,17 +928,17 @@ discard block |
||
928 | 928 | $row = $rowDimension->getRowIndex() - 1; |
929 | 929 | |
930 | 930 | // table.sheetN tr.rowYYYYYY { } |
931 | - $css['table.sheet' . $sheetIndex . ' tr.row' . $row] = []; |
|
931 | + $css['table.sheet'.$sheetIndex.' tr.row'.$row] = []; |
|
932 | 932 | |
933 | 933 | if ($rowDimension->getRowHeight() == -1) { |
934 | 934 | $pt_height = SharedFont::getDefaultRowHeightByFont($this->spreadsheet->getDefaultStyle()->getFont()); |
935 | 935 | } else { |
936 | 936 | $pt_height = $rowDimension->getRowHeight(); |
937 | 937 | } |
938 | - $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt'; |
|
938 | + $css['table.sheet'.$sheetIndex.' tr.row'.$row]['height'] = $pt_height.'pt'; |
|
939 | 939 | if ($rowDimension->getVisible() === false) { |
940 | - $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none'; |
|
941 | - $css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden'; |
|
940 | + $css['table.sheet'.$sheetIndex.' tr.row'.$row]['display'] = 'none'; |
|
941 | + $css['table.sheet'.$sheetIndex.' tr.row'.$row]['visibility'] = 'hidden'; |
|
942 | 942 | } |
943 | 943 | } |
944 | 944 | } |
@@ -987,7 +987,7 @@ discard block |
||
987 | 987 | if ($textAlign = $this->mapHAlign($pStyle->getHorizontal())) { |
988 | 988 | $css['text-align'] = $textAlign; |
989 | 989 | if (in_array($textAlign, ['left', 'right'])) { |
990 | - $css['padding-' . $textAlign] = (string) ((int) $pStyle->getIndent() * 9) . 'px'; |
|
990 | + $css['padding-'.$textAlign] = (string) ((int) $pStyle->getIndent() * 9).'px'; |
|
991 | 991 | } |
992 | 992 | } |
993 | 993 | |
@@ -1021,9 +1021,9 @@ discard block |
||
1021 | 1021 | $css['font-style'] = 'italic'; |
1022 | 1022 | } |
1023 | 1023 | |
1024 | - $css['color'] = '#' . $pStyle->getColor()->getRGB(); |
|
1025 | - $css['font-family'] = '\'' . $pStyle->getName() . '\''; |
|
1026 | - $css['font-size'] = $pStyle->getSize() . 'pt'; |
|
1024 | + $css['color'] = '#'.$pStyle->getColor()->getRGB(); |
|
1025 | + $css['font-family'] = '\''.$pStyle->getName().'\''; |
|
1026 | + $css['font-size'] = $pStyle->getSize().'pt'; |
|
1027 | 1027 | |
1028 | 1028 | return $css; |
1029 | 1029 | } |
@@ -1061,7 +1061,7 @@ discard block |
||
1061 | 1061 | // Create CSS - add !important to non-none border styles for merged cells |
1062 | 1062 | $borderStyle = $this->mapBorderStyle($pStyle->getBorderStyle()); |
1063 | 1063 | |
1064 | - return $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important'); |
|
1064 | + return $borderStyle.' #'.$pStyle->getColor()->getRGB().(($borderStyle == 'none') ? '' : ' !important'); |
|
1065 | 1065 | } |
1066 | 1066 | |
1067 | 1067 | /** |
@@ -1078,7 +1078,7 @@ discard block |
||
1078 | 1078 | |
1079 | 1079 | // Create CSS |
1080 | 1080 | $value = $pStyle->getFillType() == Fill::FILL_NONE ? |
1081 | - 'white' : '#' . $pStyle->getStartColor()->getRGB(); |
|
1081 | + 'white' : '#'.$pStyle->getStartColor()->getRGB(); |
|
1082 | 1082 | $css['background-color'] = $value; |
1083 | 1083 | |
1084 | 1084 | return $css; |
@@ -1091,8 +1091,8 @@ discard block |
||
1091 | 1091 | { |
1092 | 1092 | // Construct HTML |
1093 | 1093 | $html = ''; |
1094 | - $html .= ' </body>' . PHP_EOL; |
|
1095 | - $html .= '</html>' . PHP_EOL; |
|
1094 | + $html .= ' </body>'.PHP_EOL; |
|
1095 | + $html .= '</html>'.PHP_EOL; |
|
1096 | 1096 | |
1097 | 1097 | return $html; |
1098 | 1098 | } |
@@ -1116,15 +1116,15 @@ discard block |
||
1116 | 1116 | |
1117 | 1117 | if (!$this->useInlineCss) { |
1118 | 1118 | $gridlines = $pSheet->getShowGridlines() ? ' gridlines' : ''; |
1119 | - $html .= ' <table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL; |
|
1119 | + $html .= ' <table border="0" cellpadding="0" cellspacing="0" id="sheet'.$sheetIndex.'" class="sheet'.$sheetIndex.$gridlines.'">'.PHP_EOL; |
|
1120 | 1120 | } else { |
1121 | 1121 | $style = isset($this->cssStyles['table']) ? |
1122 | 1122 | $this->assembleCSS($this->cssStyles['table']) : ''; |
1123 | 1123 | |
1124 | 1124 | if ($this->isPdf && $pSheet->getShowGridlines()) { |
1125 | - $html .= ' <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="1" style="' . $style . '">' . PHP_EOL; |
|
1125 | + $html .= ' <table border="1" cellpadding="1" id="sheet'.$sheetIndex.'" cellspacing="1" style="'.$style.'">'.PHP_EOL; |
|
1126 | 1126 | } else { |
1127 | - $html .= ' <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="0" style="' . $style . '">' . PHP_EOL; |
|
1127 | + $html .= ' <table border="0" cellpadding="1" id="sheet'.$sheetIndex.'" cellspacing="0" style="'.$style.'">'.PHP_EOL; |
|
1128 | 1128 | } |
1129 | 1129 | } |
1130 | 1130 | |
@@ -1134,11 +1134,11 @@ discard block |
||
1134 | 1134 | while ($i++ < $highestColumnIndex) { |
1135 | 1135 | if (!$this->isPdf) { |
1136 | 1136 | if (!$this->useInlineCss) { |
1137 | - $html .= ' <col class="col' . $i . '">' . PHP_EOL; |
|
1137 | + $html .= ' <col class="col'.$i.'">'.PHP_EOL; |
|
1138 | 1138 | } else { |
1139 | - $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ? |
|
1140 | - $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : ''; |
|
1141 | - $html .= ' <col style="' . $style . '">' . PHP_EOL; |
|
1139 | + $style = isset($this->cssStyles['table.sheet'.$sheetIndex.' col.col'.$i]) ? |
|
1140 | + $this->assembleCSS($this->cssStyles['table.sheet'.$sheetIndex.' col.col'.$i]) : ''; |
|
1141 | + $html .= ' <col style="'.$style.'">'.PHP_EOL; |
|
1142 | 1142 | } |
1143 | 1143 | } |
1144 | 1144 | } |
@@ -1151,7 +1151,7 @@ discard block |
||
1151 | 1151 | */ |
1152 | 1152 | private function generateTableFooter() |
1153 | 1153 | { |
1154 | - return ' </table>' . PHP_EOL; |
|
1154 | + return ' </table>'.PHP_EOL; |
|
1155 | 1155 | } |
1156 | 1156 | |
1157 | 1157 | /** |
@@ -1179,7 +1179,7 @@ discard block |
||
1179 | 1179 | $breaks = $pSheet->getBreaks(); |
1180 | 1180 | |
1181 | 1181 | // check if a break is needed before this row |
1182 | - if (isset($breaks['A' . $pRow])) { |
|
1182 | + if (isset($breaks['A'.$pRow])) { |
|
1183 | 1183 | // close table: </table> |
1184 | 1184 | $html .= $this->generateTableFooter(); |
1185 | 1185 | |
@@ -1193,30 +1193,30 @@ discard block |
||
1193 | 1193 | |
1194 | 1194 | // Write row start |
1195 | 1195 | if (!$this->useInlineCss) { |
1196 | - $html .= ' <tr class="row' . $pRow . '">' . PHP_EOL; |
|
1196 | + $html .= ' <tr class="row'.$pRow.'">'.PHP_EOL; |
|
1197 | 1197 | } else { |
1198 | - $style = isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) |
|
1199 | - ? $this->assembleCSS($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : ''; |
|
1198 | + $style = isset($this->cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]) |
|
1199 | + ? $this->assembleCSS($this->cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]) : ''; |
|
1200 | 1200 | |
1201 | - $html .= ' <tr style="' . $style . '">' . PHP_EOL; |
|
1201 | + $html .= ' <tr style="'.$style.'">'.PHP_EOL; |
|
1202 | 1202 | } |
1203 | 1203 | |
1204 | 1204 | // Write cells |
1205 | 1205 | $colNum = 0; |
1206 | 1206 | foreach ($pValues as $cellAddress) { |
1207 | 1207 | $cell = ($cellAddress > '') ? $pSheet->getCell($cellAddress) : ''; |
1208 | - $coordinate = Coordinate::stringFromColumnIndex($colNum + 1) . ($pRow + 1); |
|
1208 | + $coordinate = Coordinate::stringFromColumnIndex($colNum + 1).($pRow + 1); |
|
1209 | 1209 | if (!$this->useInlineCss) { |
1210 | - $cssClass = 'column' . $colNum; |
|
1210 | + $cssClass = 'column'.$colNum; |
|
1211 | 1211 | } else { |
1212 | 1212 | $cssClass = []; |
1213 | 1213 | if ($cellType == 'th') { |
1214 | - if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum])) { |
|
1215 | - $this->cssStyles['table.sheet' . $sheetIndex . ' th.column' . $colNum]; |
|
1214 | + if (isset($this->cssStyles['table.sheet'.$sheetIndex.' th.column'.$colNum])) { |
|
1215 | + $this->cssStyles['table.sheet'.$sheetIndex.' th.column'.$colNum]; |
|
1216 | 1216 | } |
1217 | 1217 | } else { |
1218 | - if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) { |
|
1219 | - $this->cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum]; |
|
1218 | + if (isset($this->cssStyles['table.sheet'.$sheetIndex.' td.column'.$colNum])) { |
|
1219 | + $this->cssStyles['table.sheet'.$sheetIndex.' td.column'.$colNum]; |
|
1220 | 1220 | } |
1221 | 1221 | } |
1222 | 1222 | } |
@@ -1239,7 +1239,7 @@ discard block |
||
1239 | 1239 | foreach ($elements as $element) { |
1240 | 1240 | // Rich text start? |
1241 | 1241 | if ($element instanceof Run) { |
1242 | - $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">'; |
|
1242 | + $cellData .= '<span style="'.$this->assembleCSS($this->createCSSStyleFont($element->getFont())).'">'; |
|
1243 | 1243 | |
1244 | 1244 | if ($element->getFont()->getSuperscript()) { |
1245 | 1245 | $cellData .= '<sup>'; |
@@ -1278,9 +1278,9 @@ discard block |
||
1278 | 1278 | } |
1279 | 1279 | $cellData = htmlspecialchars($cellData); |
1280 | 1280 | if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) { |
1281 | - $cellData = '<sup>' . $cellData . '</sup>'; |
|
1281 | + $cellData = '<sup>'.$cellData.'</sup>'; |
|
1282 | 1282 | } elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubscript()) { |
1283 | - $cellData = '<sub>' . $cellData . '</sub>'; |
|
1283 | + $cellData = '<sub>'.$cellData.'</sub>'; |
|
1284 | 1284 | } |
1285 | 1285 | } |
1286 | 1286 | |
@@ -1293,32 +1293,32 @@ discard block |
||
1293 | 1293 | |
1294 | 1294 | // Extend CSS class? |
1295 | 1295 | if (!$this->useInlineCss) { |
1296 | - $cssClass .= ' style' . $cell->getXfIndex(); |
|
1297 | - $cssClass .= ' ' . $cell->getDataType(); |
|
1296 | + $cssClass .= ' style'.$cell->getXfIndex(); |
|
1297 | + $cssClass .= ' '.$cell->getDataType(); |
|
1298 | 1298 | } else { |
1299 | 1299 | if ($cellType == 'th') { |
1300 | - if (isset($this->cssStyles['th.style' . $cell->getXfIndex()])) { |
|
1301 | - $cssClass = array_merge($cssClass, $this->cssStyles['th.style' . $cell->getXfIndex()]); |
|
1300 | + if (isset($this->cssStyles['th.style'.$cell->getXfIndex()])) { |
|
1301 | + $cssClass = array_merge($cssClass, $this->cssStyles['th.style'.$cell->getXfIndex()]); |
|
1302 | 1302 | } |
1303 | 1303 | } else { |
1304 | - if (isset($this->cssStyles['td.style' . $cell->getXfIndex()])) { |
|
1305 | - $cssClass = array_merge($cssClass, $this->cssStyles['td.style' . $cell->getXfIndex()]); |
|
1304 | + if (isset($this->cssStyles['td.style'.$cell->getXfIndex()])) { |
|
1305 | + $cssClass = array_merge($cssClass, $this->cssStyles['td.style'.$cell->getXfIndex()]); |
|
1306 | 1306 | } |
1307 | 1307 | } |
1308 | 1308 | |
1309 | 1309 | // General horizontal alignment: Actual horizontal alignment depends on dataType |
1310 | 1310 | $sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex()); |
1311 | 1311 | if ($sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL |
1312 | - && isset($this->cssStyles['.' . $cell->getDataType()]['text-align']) |
|
1312 | + && isset($this->cssStyles['.'.$cell->getDataType()]['text-align']) |
|
1313 | 1313 | ) { |
1314 | - $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align']; |
|
1314 | + $cssClass['text-align'] = $this->cssStyles['.'.$cell->getDataType()]['text-align']; |
|
1315 | 1315 | } |
1316 | 1316 | } |
1317 | 1317 | } |
1318 | 1318 | |
1319 | 1319 | // Hyperlink? |
1320 | 1320 | if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) { |
1321 | - $cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>'; |
|
1321 | + $cellData = '<a href="'.htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()).'" title="'.htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()).'">'.$cellData.'</a>'; |
|
1322 | 1322 | } |
1323 | 1323 | |
1324 | 1324 | // Should the cell be written or is it swallowed by a rowspan or colspan? |
@@ -1335,18 +1335,18 @@ discard block |
||
1335 | 1335 | |
1336 | 1336 | // Also apply style from last cell in merge to fix borders - |
1337 | 1337 | // relies on !important for non-none border declarations in createCSSStyleBorder |
1338 | - $endCellCoord = Coordinate::stringFromColumnIndex($colNum + $colSpan) . ($pRow + $rowSpan); |
|
1338 | + $endCellCoord = Coordinate::stringFromColumnIndex($colNum + $colSpan).($pRow + $rowSpan); |
|
1339 | 1339 | if (!$this->useInlineCss) { |
1340 | - $cssClass .= ' style' . $pSheet->getCell($endCellCoord)->getXfIndex(); |
|
1340 | + $cssClass .= ' style'.$pSheet->getCell($endCellCoord)->getXfIndex(); |
|
1341 | 1341 | } |
1342 | 1342 | } |
1343 | 1343 | |
1344 | 1344 | // Write |
1345 | 1345 | if ($writeCell) { |
1346 | 1346 | // Column start |
1347 | - $html .= ' <' . $cellType; |
|
1347 | + $html .= ' <'.$cellType; |
|
1348 | 1348 | if (!$this->useInlineCss) { |
1349 | - $html .= ' class="' . $cssClass . '"'; |
|
1349 | + $html .= ' class="'.$cssClass.'"'; |
|
1350 | 1350 | } else { |
1351 | 1351 | //** Necessary redundant code for the sake of \PhpOffice\PhpSpreadsheet\Writer\Pdf ** |
1352 | 1352 | // We must explicitly write the width of the <td> element because TCPDF |
@@ -1359,23 +1359,23 @@ discard block |
||
1359 | 1359 | $width += $this->columnWidths[$sheetIndex][$i]; |
1360 | 1360 | } |
1361 | 1361 | } |
1362 | - $cssClass['width'] = $width . 'pt'; |
|
1362 | + $cssClass['width'] = $width.'pt'; |
|
1363 | 1363 | |
1364 | 1364 | // We must also explicitly write the height of the <td> element because TCPDF |
1365 | 1365 | // does not recognize e.g. <tr style="height:50pt"> |
1366 | - if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) { |
|
1367 | - $height = $this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height']; |
|
1366 | + if (isset($this->cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]['height'])) { |
|
1367 | + $height = $this->cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]['height']; |
|
1368 | 1368 | $cssClass['height'] = $height; |
1369 | 1369 | } |
1370 | 1370 | //** end of redundant code ** |
1371 | 1371 | |
1372 | - $html .= ' style="' . $this->assembleCSS($cssClass) . '"'; |
|
1372 | + $html .= ' style="'.$this->assembleCSS($cssClass).'"'; |
|
1373 | 1373 | } |
1374 | 1374 | if ($colSpan > 1) { |
1375 | - $html .= ' colspan="' . $colSpan . '"'; |
|
1375 | + $html .= ' colspan="'.$colSpan.'"'; |
|
1376 | 1376 | } |
1377 | 1377 | if ($rowSpan > 1) { |
1378 | - $html .= ' rowspan="' . $rowSpan . '"'; |
|
1378 | + $html .= ' rowspan="'.$rowSpan.'"'; |
|
1379 | 1379 | } |
1380 | 1380 | $html .= '>'; |
1381 | 1381 | |
@@ -1393,7 +1393,7 @@ discard block |
||
1393 | 1393 | $html .= $cellData; |
1394 | 1394 | |
1395 | 1395 | // Column end |
1396 | - $html .= '</' . $cellType . '>' . PHP_EOL; |
|
1396 | + $html .= '</'.$cellType.'>'.PHP_EOL; |
|
1397 | 1397 | } |
1398 | 1398 | |
1399 | 1399 | // Next column |
@@ -1401,7 +1401,7 @@ discard block |
||
1401 | 1401 | } |
1402 | 1402 | |
1403 | 1403 | // Write row end |
1404 | - $html .= ' </tr>' . PHP_EOL; |
|
1404 | + $html .= ' </tr>'.PHP_EOL; |
|
1405 | 1405 | |
1406 | 1406 | // Return |
1407 | 1407 | return $html; |
@@ -1418,7 +1418,7 @@ discard block |
||
1418 | 1418 | { |
1419 | 1419 | $pairs = []; |
1420 | 1420 | foreach ($pValue as $property => $value) { |
1421 | - $pairs[] = $property . ':' . $value; |
|
1421 | + $pairs[] = $property.':'.$value; |
|
1422 | 1422 | } |
1423 | 1423 | $string = implode('; ', $pairs); |
1424 | 1424 | |
@@ -1546,7 +1546,7 @@ discard block |
||
1546 | 1546 | |
1547 | 1547 | // color span tag |
1548 | 1548 | if ($color !== null) { |
1549 | - $value = '<span style="color:' . $color . '">' . $value . '</span>'; |
|
1549 | + $value = '<span style="color:'.$color.'">'.$value.'</span>'; |
|
1550 | 1550 | } |
1551 | 1551 | |
1552 | 1552 | return $value; |
@@ -1647,23 +1647,23 @@ discard block |
||
1647 | 1647 | $htmlPage = '@page { '; |
1648 | 1648 | $htmlBody = 'body { '; |
1649 | 1649 | |
1650 | - $left = StringHelper::formatNumber($pSheet->getPageMargins()->getLeft()) . 'in; '; |
|
1651 | - $htmlPage .= 'margin-left: ' . $left; |
|
1652 | - $htmlBody .= 'margin-left: ' . $left; |
|
1653 | - $right = StringHelper::formatNumber($pSheet->getPageMargins()->getRight()) . 'in; '; |
|
1654 | - $htmlPage .= 'margin-right: ' . $right; |
|
1655 | - $htmlBody .= 'margin-right: ' . $right; |
|
1656 | - $top = StringHelper::formatNumber($pSheet->getPageMargins()->getTop()) . 'in; '; |
|
1657 | - $htmlPage .= 'margin-top: ' . $top; |
|
1658 | - $htmlBody .= 'margin-top: ' . $top; |
|
1659 | - $bottom = StringHelper::formatNumber($pSheet->getPageMargins()->getBottom()) . 'in; '; |
|
1660 | - $htmlPage .= 'margin-bottom: ' . $bottom; |
|
1661 | - $htmlBody .= 'margin-bottom: ' . $bottom; |
|
1650 | + $left = StringHelper::formatNumber($pSheet->getPageMargins()->getLeft()).'in; '; |
|
1651 | + $htmlPage .= 'margin-left: '.$left; |
|
1652 | + $htmlBody .= 'margin-left: '.$left; |
|
1653 | + $right = StringHelper::formatNumber($pSheet->getPageMargins()->getRight()).'in; '; |
|
1654 | + $htmlPage .= 'margin-right: '.$right; |
|
1655 | + $htmlBody .= 'margin-right: '.$right; |
|
1656 | + $top = StringHelper::formatNumber($pSheet->getPageMargins()->getTop()).'in; '; |
|
1657 | + $htmlPage .= 'margin-top: '.$top; |
|
1658 | + $htmlBody .= 'margin-top: '.$top; |
|
1659 | + $bottom = StringHelper::formatNumber($pSheet->getPageMargins()->getBottom()).'in; '; |
|
1660 | + $htmlPage .= 'margin-bottom: '.$bottom; |
|
1661 | + $htmlBody .= 'margin-bottom: '.$bottom; |
|
1662 | 1662 | |
1663 | 1663 | $htmlPage .= "}\n"; |
1664 | 1664 | $htmlBody .= "}\n"; |
1665 | 1665 | |
1666 | - return "<style>\n" . $htmlPage . $htmlBody . "</style>\n"; |
|
1666 | + return "<style>\n".$htmlPage.$htmlBody."</style>\n"; |
|
1667 | 1667 | } |
1668 | 1668 | |
1669 | 1669 | /** |
@@ -1681,7 +1681,7 @@ discard block |
||
1681 | 1681 | $result = ''; |
1682 | 1682 | if (!$this->isPdf && isset($pSheet->getComments()[$coordinate])) { |
1683 | 1683 | $result .= '<a class="comment-indicator"></a>'; |
1684 | - $result .= '<div class="comment">' . nl2br($pSheet->getComment($coordinate)->getText()->getPlainText()) . '</div>'; |
|
1684 | + $result .= '<div class="comment">'.nl2br($pSheet->getComment($coordinate)->getText()->getPlainText()).'</div>'; |
|
1685 | 1685 | $result .= PHP_EOL; |
1686 | 1686 | } |
1687 | 1687 |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use PhpOffice\PhpSpreadsheet\Chart\Chart; |
6 | 6 | use PhpOffice\PhpSpreadsheet\Style\NumberFormat; |
7 | 7 | |
8 | -require_once __DIR__ . '/Polyfill.php'; |
|
8 | +require_once __DIR__.'/Polyfill.php'; |
|
9 | 9 | |
10 | 10 | class JpGraph implements IRenderer |
11 | 11 | { |
@@ -843,7 +843,7 @@ discard block |
||
843 | 843 | |
844 | 844 | break; |
845 | 845 | default: |
846 | - echo $chartType . ' is not yet implemented<br />'; |
|
846 | + echo $chartType.' is not yet implemented<br />'; |
|
847 | 847 | |
848 | 848 | return false; |
849 | 849 | } |
@@ -132,7 +132,7 @@ |
||
132 | 132 | |
133 | 133 | protected function getTrueAlpha($alpha) |
134 | 134 | { |
135 | - return (string) 100 - $alpha . '000'; |
|
135 | + return (string) 100 - $alpha.'000'; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | protected function setColorProperties($color, $alpha, $type) |
@@ -362,7 +362,7 @@ |
||
362 | 362 | $calcEngine = Calculation::getInstance($worksheet->getParent()); |
363 | 363 | $newDataValues = Calculation::unwrapResult( |
364 | 364 | $calcEngine->_calculateFormulaValue( |
365 | - '=' . $this->dataSource, |
|
365 | + '='.$this->dataSource, |
|
366 | 366 | null, |
367 | 367 | $worksheet->getCell('A1') |
368 | 368 | ) |
@@ -291,15 +291,15 @@ |
||
291 | 291 | public function getHashCode() |
292 | 292 | { |
293 | 293 | return md5( |
294 | - $this->author . |
|
295 | - $this->text->getHashCode() . |
|
296 | - $this->width . |
|
297 | - $this->height . |
|
298 | - $this->marginLeft . |
|
299 | - $this->marginTop . |
|
300 | - ($this->visible ? 1 : 0) . |
|
301 | - $this->fillColor->getHashCode() . |
|
302 | - $this->alignment . |
|
294 | + $this->author. |
|
295 | + $this->text->getHashCode(). |
|
296 | + $this->width. |
|
297 | + $this->height. |
|
298 | + $this->marginLeft. |
|
299 | + $this->marginTop. |
|
300 | + ($this->visible ? 1 : 0). |
|
301 | + $this->fillColor->getHashCode(). |
|
302 | + $this->alignment. |
|
303 | 303 | __CLASS__ |
304 | 304 | ); |
305 | 305 | } |