@@ -99,7 +99,7 @@ |
||
99 | 99 | $length = strlen($data); |
100 | 100 | $header = pack('vv', $record, $length); |
101 | 101 | |
102 | - return $header . $data; |
|
102 | + return $header.$data; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | // Worksheets |
83 | 83 | $sheetCount = $spreadsheet->getSheetCount(); |
84 | 84 | for ($i = 0; $i < $sheetCount; ++$i) { |
85 | - $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'); |
|
85 | + $this->writeOverrideContentType($objWriter, '/xl/worksheets/sheet'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | // Shared strings |
@@ -99,13 +99,13 @@ discard block |
||
99 | 99 | |
100 | 100 | // We need a drawing relationship for the worksheet if we have either drawings or charts |
101 | 101 | if (($drawingCount > 0) || ($chartCount > 0) || $hasUnparsedDrawing) { |
102 | - $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml'); |
|
102 | + $this->writeOverrideContentType($objWriter, '/xl/drawings/drawing'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml'); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | // If we have charts, then we need a chart relationship for every individual chart |
106 | 106 | if ($chartCount > 0) { |
107 | 107 | for ($c = 0; $c < $chartCount; ++$c) { |
108 | - $this->writeOverrideContentType($objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'); |
|
108 | + $this->writeOverrideContentType($objWriter, '/xl/charts/chart'.$chart++.'.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | // Comments |
114 | 114 | for ($i = 0; $i < $sheetCount; ++$i) { |
115 | 115 | if (count($spreadsheet->getSheet($i)->getComments()) > 0) { |
116 | - $this->writeOverrideContentType($objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml'); |
|
116 | + $this->writeOverrideContentType($objWriter, '/xl/comments'.($i + 1).'.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml'); |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | // we need to write "Extension" but not already write for media content |
147 | 147 | $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types'), array_keys($aMediaContentTypes)); |
148 | 148 | foreach ($tabRibbonTypes as $aRibbonType) { |
149 | - $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor |
|
149 | + $mimeType = 'image/.'.$aRibbonType; //we wrote $mimeType like customUI Editor |
|
150 | 150 | $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType); |
151 | 151 | } |
152 | 152 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | if ($sheetState !== 'visible' && $sheetState != '') { |
229 | 229 | $objWriter->writeAttribute('state', $sheetState); |
230 | 230 | } |
231 | - $objWriter->writeAttribute('r:id', 'rId' . $pRelId); |
|
231 | + $objWriter->writeAttribute('r:id', 'rId'.$pRelId); |
|
232 | 232 | $objWriter->endElement(); |
233 | 233 | } else { |
234 | 234 | throw new WriterException('Invalid parameters passed.'); |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | $range = Coordinate::splitRange($pNamedRange->getRange()); |
307 | 307 | $iMax = count($range); |
308 | 308 | for ($i = 0; $i < $iMax; ++$i) { |
309 | - $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteReference($range[$i][0]); |
|
309 | + $range[$i][0] = '\''.str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()).'\'!'.Coordinate::absoluteReference($range[$i][0]); |
|
310 | 310 | if (isset($range[$i][1])) { |
311 | 311 | $range[$i][1] = Coordinate::absoluteReference($range[$i][1]); |
312 | 312 | } |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | $range[1] = Coordinate::absoluteCoordinate($range[1]); |
346 | 346 | $range = implode(':', $range); |
347 | 347 | |
348 | - $objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range); |
|
348 | + $objWriter->writeRawData('\''.str_replace("'", "''", $pSheet->getTitle()).'\'!'.$range); |
|
349 | 349 | |
350 | 350 | $objWriter->endElement(); |
351 | 351 | } |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) { |
374 | 374 | $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft(); |
375 | 375 | |
376 | - $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1]; |
|
376 | + $settingString .= '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!$'.$repeat[0].':$'.$repeat[1]; |
|
377 | 377 | } |
378 | 378 | |
379 | 379 | // Rows to repeat |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | |
385 | 385 | $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop(); |
386 | 386 | |
387 | - $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1]; |
|
387 | + $settingString .= '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!$'.$repeat[0].':$'.$repeat[1]; |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | $objWriter->writeRawData($settingString); |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | foreach ($printArea as $printAreaRect) { |
416 | 416 | $printAreaRect[0] = Coordinate::absoluteReference($printAreaRect[0]); |
417 | 417 | $printAreaRect[1] = Coordinate::absoluteReference($printAreaRect[1]); |
418 | - $chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect); |
|
418 | + $chunks[] = '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!'.implode(':', $printAreaRect); |
|
419 | 419 | } |
420 | 420 | |
421 | 421 | $objWriter->writeRawData(implode(',', $chunks)); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $objWriter->writeAttribute('macro', ''); |
112 | 112 | $objWriter->startElement('xdr:nvGraphicFramePr'); |
113 | 113 | $objWriter->startElement('xdr:cNvPr'); |
114 | - $objWriter->writeAttribute('name', 'Chart ' . $pRelationId); |
|
114 | + $objWriter->writeAttribute('name', 'Chart '.$pRelationId); |
|
115 | 115 | $objWriter->writeAttribute('id', 1025 * $pRelationId); |
116 | 116 | $objWriter->endElement(); |
117 | 117 | $objWriter->startElement('xdr:cNvGraphicFramePr'); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $objWriter->startElement('c:chart'); |
138 | 138 | $objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart'); |
139 | 139 | $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'); |
140 | - $objWriter->writeAttribute('r:id', 'rId' . $pRelationId); |
|
140 | + $objWriter->writeAttribute('r:id', 'rId'.$pRelationId); |
|
141 | 141 | $objWriter->endElement(); |
142 | 142 | $objWriter->endElement(); |
143 | 143 | $objWriter->endElement(); |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | // a:blip |
218 | 218 | $objWriter->startElement('a:blip'); |
219 | 219 | $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'); |
220 | - $objWriter->writeAttribute('r:embed', 'rId' . $pRelationId); |
|
220 | + $objWriter->writeAttribute('r:embed', 'rId'.$pRelationId); |
|
221 | 221 | $objWriter->endElement(); |
222 | 222 | |
223 | 223 | // a:stretch |
@@ -455,13 +455,13 @@ discard block |
||
455 | 455 | // v:shape |
456 | 456 | $objWriter->startElement('v:shape'); |
457 | 457 | $objWriter->writeAttribute('id', $pReference); |
458 | - $objWriter->writeAttribute('o:spid', '_x0000_s' . $id); |
|
458 | + $objWriter->writeAttribute('o:spid', '_x0000_s'.$id); |
|
459 | 459 | $objWriter->writeAttribute('type', '#_x0000_t75'); |
460 | 460 | $objWriter->writeAttribute('style', "position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1"); |
461 | 461 | |
462 | 462 | // v:imagedata |
463 | 463 | $objWriter->startElement('v:imagedata'); |
464 | - $objWriter->writeAttribute('o:relid', 'rId' . $pReference); |
|
464 | + $objWriter->writeAttribute('o:relid', 'rId'.$pReference); |
|
465 | 465 | $objWriter->writeAttribute('o:title', $pImage->getName()); |
466 | 466 | $objWriter->endElement(); |
467 | 467 | |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | |
514 | 514 | $objWriter->startElement('a:hlinkClick'); |
515 | 515 | $objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'); |
516 | - $objWriter->writeAttribute('r:id', 'rId' . $hlinkClickId); |
|
516 | + $objWriter->writeAttribute('r:id', 'rId'.$hlinkClickId); |
|
517 | 517 | $objWriter->endElement(); |
518 | 518 | } |
519 | 519 | } |
@@ -182,15 +182,15 @@ |
||
182 | 182 | |
183 | 183 | // v:shape |
184 | 184 | $objWriter->startElement('v:shape'); |
185 | - $objWriter->writeAttribute('id', '_x0000_s' . $id); |
|
185 | + $objWriter->writeAttribute('id', '_x0000_s'.$id); |
|
186 | 186 | $objWriter->writeAttribute('type', '#_x0000_t202'); |
187 | - $objWriter->writeAttribute('style', 'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden')); |
|
188 | - $objWriter->writeAttribute('fillcolor', '#' . $pComment->getFillColor()->getRGB()); |
|
187 | + $objWriter->writeAttribute('style', 'position:absolute;margin-left:'.$pComment->getMarginLeft().';margin-top:'.$pComment->getMarginTop().';width:'.$pComment->getWidth().';height:'.$pComment->getHeight().';z-index:1;visibility:'.($pComment->getVisible() ? 'visible' : 'hidden')); |
|
188 | + $objWriter->writeAttribute('fillcolor', '#'.$pComment->getFillColor()->getRGB()); |
|
189 | 189 | $objWriter->writeAttribute('o:insetmode', 'auto'); |
190 | 190 | |
191 | 191 | // v:fill |
192 | 192 | $objWriter->startElement('v:fill'); |
193 | - $objWriter->writeAttribute('color2', '#' . $pComment->getFillColor()->getRGB()); |
|
193 | + $objWriter->writeAttribute('color2', '#'.$pComment->getFillColor()->getRGB()); |
|
194 | 194 | $objWriter->endElement(); |
195 | 195 | |
196 | 196 | // v:shadow |
@@ -125,31 +125,31 @@ discard block |
||
125 | 125 | $elements = $pRichText->getRichTextElements(); |
126 | 126 | foreach ($elements as $element) { |
127 | 127 | // r |
128 | - $objWriter->startElement($prefix . 'r'); |
|
128 | + $objWriter->startElement($prefix.'r'); |
|
129 | 129 | |
130 | 130 | // rPr |
131 | 131 | if ($element instanceof Run) { |
132 | 132 | // rPr |
133 | - $objWriter->startElement($prefix . 'rPr'); |
|
133 | + $objWriter->startElement($prefix.'rPr'); |
|
134 | 134 | |
135 | 135 | // rFont |
136 | - $objWriter->startElement($prefix . 'rFont'); |
|
136 | + $objWriter->startElement($prefix.'rFont'); |
|
137 | 137 | $objWriter->writeAttribute('val', $element->getFont()->getName()); |
138 | 138 | $objWriter->endElement(); |
139 | 139 | |
140 | 140 | // Bold |
141 | - $objWriter->startElement($prefix . 'b'); |
|
141 | + $objWriter->startElement($prefix.'b'); |
|
142 | 142 | $objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false')); |
143 | 143 | $objWriter->endElement(); |
144 | 144 | |
145 | 145 | // Italic |
146 | - $objWriter->startElement($prefix . 'i'); |
|
146 | + $objWriter->startElement($prefix.'i'); |
|
147 | 147 | $objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false')); |
148 | 148 | $objWriter->endElement(); |
149 | 149 | |
150 | 150 | // Superscript / subscript |
151 | 151 | if ($element->getFont()->getSuperscript() || $element->getFont()->getSubscript()) { |
152 | - $objWriter->startElement($prefix . 'vertAlign'); |
|
152 | + $objWriter->startElement($prefix.'vertAlign'); |
|
153 | 153 | if ($element->getFont()->getSuperscript()) { |
154 | 154 | $objWriter->writeAttribute('val', 'superscript'); |
155 | 155 | } elseif ($element->getFont()->getSubscript()) { |
@@ -159,22 +159,22 @@ discard block |
||
159 | 159 | } |
160 | 160 | |
161 | 161 | // Strikethrough |
162 | - $objWriter->startElement($prefix . 'strike'); |
|
162 | + $objWriter->startElement($prefix.'strike'); |
|
163 | 163 | $objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false')); |
164 | 164 | $objWriter->endElement(); |
165 | 165 | |
166 | 166 | // Color |
167 | - $objWriter->startElement($prefix . 'color'); |
|
167 | + $objWriter->startElement($prefix.'color'); |
|
168 | 168 | $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB()); |
169 | 169 | $objWriter->endElement(); |
170 | 170 | |
171 | 171 | // Size |
172 | - $objWriter->startElement($prefix . 'sz'); |
|
172 | + $objWriter->startElement($prefix.'sz'); |
|
173 | 173 | $objWriter->writeAttribute('val', $element->getFont()->getSize()); |
174 | 174 | $objWriter->endElement(); |
175 | 175 | |
176 | 176 | // Underline |
177 | - $objWriter->startElement($prefix . 'u'); |
|
177 | + $objWriter->startElement($prefix.'u'); |
|
178 | 178 | $objWriter->writeAttribute('val', $element->getFont()->getUnderline()); |
179 | 179 | $objWriter->endElement(); |
180 | 180 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | } |
183 | 183 | |
184 | 184 | // t |
185 | - $objWriter->startElement($prefix . 't'); |
|
185 | + $objWriter->startElement($prefix.'t'); |
|
186 | 186 | $objWriter->writeAttribute('xml:space', 'preserve'); |
187 | 187 | $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($element->getText())); |
188 | 188 | $objWriter->endElement(); |
@@ -214,10 +214,10 @@ discard block |
||
214 | 214 | $elements = $pRichText->getRichTextElements(); |
215 | 215 | foreach ($elements as $element) { |
216 | 216 | // r |
217 | - $objWriter->startElement($prefix . 'r'); |
|
217 | + $objWriter->startElement($prefix.'r'); |
|
218 | 218 | |
219 | 219 | // rPr |
220 | - $objWriter->startElement($prefix . 'rPr'); |
|
220 | + $objWriter->startElement($prefix.'rPr'); |
|
221 | 221 | |
222 | 222 | // Bold |
223 | 223 | $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0)); |
@@ -240,14 +240,14 @@ discard block |
||
240 | 240 | $objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike')); |
241 | 241 | |
242 | 242 | // rFont |
243 | - $objWriter->startElement($prefix . 'latin'); |
|
243 | + $objWriter->startElement($prefix.'latin'); |
|
244 | 244 | $objWriter->writeAttribute('typeface', $element->getFont()->getName()); |
245 | 245 | $objWriter->endElement(); |
246 | 246 | |
247 | 247 | $objWriter->endElement(); |
248 | 248 | |
249 | 249 | // t |
250 | - $objWriter->startElement($prefix . 't'); |
|
250 | + $objWriter->startElement($prefix.'t'); |
|
251 | 251 | $objWriter->writeRawData(StringHelper::controlCharacterPHP2OOXML($element->getText())); |
252 | 252 | $objWriter->endElement(); |
253 | 253 |
@@ -834,7 +834,7 @@ |
||
834 | 834 | private function writeColourScheme($objWriter) |
835 | 835 | { |
836 | 836 | foreach (self::$colourScheme as $colourName => $colourValue) { |
837 | - $objWriter->startElement('a:' . $colourName); |
|
837 | + $objWriter->startElement('a:'.$colourName); |
|
838 | 838 | |
839 | 839 | $objWriter->startElement('a:srgbClr'); |
840 | 840 | $objWriter->writeAttribute('val', $colourValue); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $objWriter, |
142 | 142 | ($i + 1 + 3), |
143 | 143 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet', |
144 | - 'worksheets/sheet' . ($i + 1) . '.xml' |
|
144 | + 'worksheets/sheet'.($i + 1).'.xml' |
|
145 | 145 | ); |
146 | 146 | } |
147 | 147 | // Relationships for vbaProject if needed |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | } |
209 | 209 | |
210 | 210 | if (($pWorksheet->getDrawingCollection()->count() > 0) || (count($charts) > 0) || $drawingOriginalIds) { |
211 | - $relPath = '../drawings/drawing' . $pWorksheetId . '.xml'; |
|
211 | + $relPath = '../drawings/drawing'.$pWorksheetId.'.xml'; |
|
212 | 212 | $rId = ++$d; |
213 | 213 | |
214 | 214 | if (isset($drawingOriginalIds[$relPath])) { |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | if (!$hyperlink->isInternal()) { |
230 | 230 | $this->writeRelationship( |
231 | 231 | $objWriter, |
232 | - '_hyperlink_' . $i, |
|
232 | + '_hyperlink_'.$i, |
|
233 | 233 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink', |
234 | 234 | $hyperlink->getUrl(), |
235 | 235 | 'External' |
@@ -244,16 +244,16 @@ discard block |
||
244 | 244 | if (count($pWorksheet->getComments()) > 0) { |
245 | 245 | $this->writeRelationship( |
246 | 246 | $objWriter, |
247 | - '_comments_vml' . $i, |
|
247 | + '_comments_vml'.$i, |
|
248 | 248 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing', |
249 | - '../drawings/vmlDrawing' . $pWorksheetId . '.vml' |
|
249 | + '../drawings/vmlDrawing'.$pWorksheetId.'.vml' |
|
250 | 250 | ); |
251 | 251 | |
252 | 252 | $this->writeRelationship( |
253 | 253 | $objWriter, |
254 | - '_comments' . $i, |
|
254 | + '_comments'.$i, |
|
255 | 255 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments', |
256 | - '../comments' . $pWorksheetId . '.xml' |
|
256 | + '../comments'.$pWorksheetId.'.xml' |
|
257 | 257 | ); |
258 | 258 | } |
259 | 259 | |
@@ -262,9 +262,9 @@ discard block |
||
262 | 262 | if (count($pWorksheet->getHeaderFooter()->getImages()) > 0) { |
263 | 263 | $this->writeRelationship( |
264 | 264 | $objWriter, |
265 | - '_headerfooter_vml' . $i, |
|
265 | + '_headerfooter_vml'.$i, |
|
266 | 266 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing', |
267 | - '../drawings/vmlDrawingHF' . $pWorksheetId . '.vml' |
|
267 | + '../drawings/vmlDrawingHF'.$pWorksheetId.'.vml' |
|
268 | 268 | ); |
269 | 269 | } |
270 | 270 | |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | $objWriter, |
336 | 336 | $i, |
337 | 337 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image', |
338 | - '../media/' . str_replace(' ', '', $drawing->getIndexedFilename()) |
|
338 | + '../media/'.str_replace(' ', '', $drawing->getIndexedFilename()) |
|
339 | 339 | ); |
340 | 340 | |
341 | 341 | $i = $this->writeDrawingHyperLink($objWriter, $drawing, $i); |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | $objWriter, |
355 | 355 | $i++, |
356 | 356 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart', |
357 | - '../charts/chart' . ++$chartRef . '.xml' |
|
357 | + '../charts/chart'.++$chartRef.'.xml' |
|
358 | 358 | ); |
359 | 359 | } |
360 | 360 | } |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | $objWriter, |
399 | 399 | $key, |
400 | 400 | 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image', |
401 | - '../media/' . $value->getIndexedFilename() |
|
401 | + '../media/'.$value->getIndexedFilename() |
|
402 | 402 | ); |
403 | 403 | } |
404 | 404 | |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | if ($pType != '' && $pTarget != '') { |
424 | 424 | // Write relationship |
425 | 425 | $objWriter->startElement('Relationship'); |
426 | - $objWriter->writeAttribute('Id', 'rId' . $pId); |
|
426 | + $objWriter->writeAttribute('Id', 'rId'.$pId); |
|
427 | 427 | $objWriter->writeAttribute('Type', $pType); |
428 | 428 | $objWriter->writeAttribute('Target', $pTarget); |
429 | 429 |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | $catIsMultiLevelSeries = $valIsMultiLevelSeries = false; |
234 | 234 | $plotGroupingType = ''; |
235 | 235 | foreach ($chartTypes as $chartType) { |
236 | - $objWriter->startElement('c:' . $chartType); |
|
236 | + $objWriter->startElement('c:'.$chartType); |
|
237 | 237 | |
238 | 238 | $groupCount = $plotArea->getPlotGroupCount(); |
239 | 239 | for ($i = 0; $i < $groupCount; ++$i) { |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | |
834 | 834 | if ($xAxis->getFillProperty('value') !== null) { |
835 | 835 | $objWriter->startElement('a:solidFill'); |
836 | - $objWriter->startElement('a:' . $xAxis->getFillProperty('type')); |
|
836 | + $objWriter->startElement('a:'.$xAxis->getFillProperty('type')); |
|
837 | 837 | $objWriter->writeAttribute('val', $xAxis->getFillProperty('value')); |
838 | 838 | $objWriter->startElement('a:alpha'); |
839 | 839 | $objWriter->writeAttribute('val', $xAxis->getFillProperty('alpha')); |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | |
851 | 851 | if ($xAxis->getLineProperty('value') !== null) { |
852 | 852 | $objWriter->startElement('a:solidFill'); |
853 | - $objWriter->startElement('a:' . $xAxis->getLineProperty('type')); |
|
853 | + $objWriter->startElement('a:'.$xAxis->getLineProperty('type')); |
|
854 | 854 | $objWriter->writeAttribute('val', $xAxis->getLineProperty('value')); |
855 | 855 | $objWriter->startElement('a:alpha'); |
856 | 856 | $objWriter->writeAttribute('val', $xAxis->getLineProperty('alpha')); |
@@ -1329,13 +1329,13 @@ discard block |
||
1329 | 1329 | |
1330 | 1330 | $objWriter->endElement(); |
1331 | 1331 | } else { |
1332 | - $objWriter->startElement('c:' . $dataType . 'Ref'); |
|
1332 | + $objWriter->startElement('c:'.$dataType.'Ref'); |
|
1333 | 1333 | |
1334 | 1334 | $objWriter->startElement('c:f'); |
1335 | 1335 | $objWriter->writeRawData($plotSeriesValues->getDataSource()); |
1336 | 1336 | $objWriter->endElement(); |
1337 | 1337 | |
1338 | - $objWriter->startElement('c:' . $dataType . 'Cache'); |
|
1338 | + $objWriter->startElement('c:'.$dataType.'Cache'); |
|
1339 | 1339 | |
1340 | 1340 | if (($groupType != DataSeries::TYPE_PIECHART) && ($groupType != DataSeries::TYPE_PIECHART_3D) && ($groupType != DataSeries::TYPE_DONUTCHART)) { |
1341 | 1341 | if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) { |