@@ -284,13 +284,13 @@ |
||
284 | 284 | public function getHashCode() |
285 | 285 | { |
286 | 286 | return md5( |
287 | - ($this->visible ? 't' : 'f'). |
|
288 | - $this->blurRadius. |
|
289 | - $this->distance. |
|
290 | - $this->direction. |
|
291 | - $this->alignment. |
|
292 | - $this->color->getHashCode(). |
|
293 | - $this->alpha. |
|
287 | + ($this->visible ? 't' : 'f') . |
|
288 | + $this->blurRadius . |
|
289 | + $this->distance . |
|
290 | + $this->direction . |
|
291 | + $this->alignment . |
|
292 | + $this->color->getHashCode() . |
|
293 | + $this->alpha . |
|
294 | 294 | __CLASS__ |
295 | 295 | ); |
296 | 296 | } |
@@ -187,9 +187,9 @@ |
||
187 | 187 | { |
188 | 188 | if ($this->position <= $this->startColumn) { |
189 | 189 | throw new \PhpOffice\PhpSpreadsheet\Exception( |
190 | - 'Column is already at the beginning of range ('. |
|
191 | - \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn).' - '. |
|
192 | - \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn).')' |
|
190 | + 'Column is already at the beginning of range (' . |
|
191 | + \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn) . ' - ' . |
|
192 | + \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn) . ')' |
|
193 | 193 | ); |
194 | 194 | } |
195 | 195 |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $fileName = $this->getFilename(); |
68 | 68 | $fileName = str_replace(' ', '_', $fileName); |
69 | 69 | |
70 | - return str_replace('.'.$this->getExtension(), '', $fileName).$this->getImageIndex().'.'.$this->getExtension(); |
|
70 | + return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension(); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | public function getHashCode() |
131 | 131 | { |
132 | 132 | return md5( |
133 | - $this->path. |
|
134 | - parent::getHashCode(). |
|
133 | + $this->path . |
|
134 | + parent::getHashCode() . |
|
135 | 135 | __CLASS__ |
136 | 136 | ); |
137 | 137 | } |
@@ -352,12 +352,12 @@ |
||
352 | 352 | public function getHashCode() |
353 | 353 | { |
354 | 354 | return md5( |
355 | - $this->path. |
|
356 | - $this->name. |
|
357 | - $this->offsetX. |
|
358 | - $this->offsetY. |
|
359 | - $this->width. |
|
360 | - $this->height. |
|
355 | + $this->path . |
|
356 | + $this->name . |
|
357 | + $this->offsetX . |
|
358 | + $this->offsetY . |
|
359 | + $this->width . |
|
360 | + $this->height . |
|
361 | 361 | __CLASS__ |
362 | 362 | ); |
363 | 363 | } |
@@ -182,9 +182,9 @@ |
||
182 | 182 | { |
183 | 183 | if ($this->position <= $this->startColumn) { |
184 | 184 | throw new \PhpOffice\PhpSpreadsheet\Exception( |
185 | - 'Column is already at the beginning of range ('. |
|
186 | - \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn).' - '. |
|
187 | - \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn).')' |
|
185 | + 'Column is already at the beginning of range (' . |
|
186 | + \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn) . ' - ' . |
|
187 | + \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($this->endColumn) . ')' |
|
188 | 188 | ); |
189 | 189 | } |
190 | 190 |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $this->imageResource = null; |
78 | 78 | $this->renderingFunction = self::RENDERING_DEFAULT; |
79 | 79 | $this->mimeType = self::MIMETYPE_DEFAULT; |
80 | - $this->uniqueName = md5(rand(0, 9999).time().rand(0, 9999)); |
|
80 | + $this->uniqueName = md5(rand(0, 9999) . time() . rand(0, 9999)); |
|
81 | 81 | |
82 | 82 | // Initialize parent |
83 | 83 | parent::__construct(); |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $extension = explode('/', $extension); |
173 | 173 | $extension = $extension[1]; |
174 | 174 | |
175 | - return $this->uniqueName.$this->getImageIndex().'.'.$extension; |
|
175 | + return $this->uniqueName . $this->getImageIndex() . '.' . $extension; |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | /** |
@@ -183,10 +183,10 @@ discard block |
||
183 | 183 | public function getHashCode() |
184 | 184 | { |
185 | 185 | return md5( |
186 | - $this->renderingFunction. |
|
187 | - $this->mimeType. |
|
188 | - $this->uniqueName. |
|
189 | - parent::getHashCode(). |
|
186 | + $this->renderingFunction . |
|
187 | + $this->mimeType . |
|
188 | + $this->uniqueName . |
|
189 | + parent::getHashCode() . |
|
190 | 190 | __CLASS__ |
191 | 191 | ); |
192 | 192 | } |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | } |
725 | 725 | } elseif ($method == self::SETPRINTRANGE_INSERT) { |
726 | 726 | if ($index == 0) { |
727 | - $this->printArea .= ($this->printArea == '') ? $value : ','.$value; |
|
727 | + $this->printArea .= ($this->printArea == '') ? $value : ',' . $value; |
|
728 | 728 | } else { |
729 | 729 | $printAreas = explode(',', $this->printArea); |
730 | 730 | if ($index < 0) { |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) |
792 | 792 | { |
793 | 793 | return $this->setPrintArea( |
794 | - \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column1).$row1.':'.\PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column2).$row2, |
|
794 | + \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column1) . $row1 . ':' . \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column2) . $row2, |
|
795 | 795 | $index, |
796 | 796 | $method |
797 | 797 | ); |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1) |
819 | 819 | { |
820 | 820 | return $this->setPrintArea( |
821 | - \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column1).$row1.':'.\PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column2).$row2, |
|
821 | + \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column1) . $row1 . ':' . \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($column2) . $row2, |
|
822 | 822 | $index, |
823 | 823 | self::SETPRINTRANGE_INSERT |
824 | 824 | ); |
@@ -500,16 +500,16 @@ |
||
500 | 500 | public function getHashCode() |
501 | 501 | { |
502 | 502 | return md5( |
503 | - $this->name. |
|
504 | - $this->description. |
|
505 | - $this->worksheet->getHashCode(). |
|
506 | - $this->coordinates. |
|
507 | - $this->offsetX. |
|
508 | - $this->offsetY. |
|
509 | - $this->width. |
|
510 | - $this->height. |
|
511 | - $this->rotation. |
|
512 | - $this->shadow->getHashCode(). |
|
503 | + $this->name . |
|
504 | + $this->description . |
|
505 | + $this->worksheet->getHashCode() . |
|
506 | + $this->coordinates . |
|
507 | + $this->offsetX . |
|
508 | + $this->offsetY . |
|
509 | + $this->width . |
|
510 | + $this->height . |
|
511 | + $this->rotation . |
|
512 | + $this->shadow->getHashCode() . |
|
513 | 513 | __CLASS__ |
514 | 514 | ); |
515 | 515 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | { |
166 | 166 | // Open file |
167 | 167 | if (!$this->canRead($pFilename)) { |
168 | - throw new Exception($pFilename.' is an Invalid Spreadsheet file.'); |
|
168 | + throw new Exception($pFilename . ' is an Invalid Spreadsheet file.'); |
|
169 | 169 | } |
170 | 170 | $this->openFile($pFilename); |
171 | 171 | $fileHandle = $this->fileHandle; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $this->skipBOM(); |
175 | 175 | $this->checkSeparator(); |
176 | 176 | |
177 | - $escapeEnclosures = ['\\'.$this->enclosure, $this->enclosure.$this->enclosure]; |
|
177 | + $escapeEnclosures = ['\\' . $this->enclosure, $this->enclosure . $this->enclosure]; |
|
178 | 178 | |
179 | 179 | $worksheetInfo = []; |
180 | 180 | $worksheetInfo[0]['worksheetName'] = 'Worksheet'; |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | |
234 | 234 | // Open file |
235 | 235 | if (!$this->canRead($pFilename)) { |
236 | - throw new Exception($pFilename.' is an Invalid Spreadsheet file.'); |
|
236 | + throw new Exception($pFilename . ' is an Invalid Spreadsheet file.'); |
|
237 | 237 | } |
238 | 238 | $this->openFile($pFilename); |
239 | 239 | $fileHandle = $this->fileHandle; |
@@ -249,8 +249,8 @@ discard block |
||
249 | 249 | $sheet = $spreadsheet->setActiveSheetIndex($this->sheetIndex); |
250 | 250 | |
251 | 251 | $escapeEnclosures = [ |
252 | - '\\'.$this->enclosure, |
|
253 | - $this->enclosure.$this->enclosure, |
|
252 | + '\\' . $this->enclosure, |
|
253 | + $this->enclosure . $this->enclosure, |
|
254 | 254 | ]; |
255 | 255 | |
256 | 256 | // Set our starting row based on whether we're in contiguous mode or not |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | } |
274 | 274 | |
275 | 275 | // Set cell value |
276 | - $sheet->getCell($columnLetter.$currentRow)->setValue($rowDatum); |
|
276 | + $sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum); |
|
277 | 277 | } |
278 | 278 | ++$columnLetter; |
279 | 279 | } |