@@ -316,10 +316,10 @@ |
||
316 | 316 | // Note that we don't care about colours for fill type NONE, but could have duplicate NONEs with |
317 | 317 | // different hashes if we don't explicitly prevent this |
318 | 318 | return md5( |
319 | - $this->getFillType() . |
|
320 | - $this->getRotation() . |
|
321 | - ($this->getFillType() !== self::FILL_NONE ? $this->getStartColor()->getHashCode() : '') . |
|
322 | - ($this->getFillType() !== self::FILL_NONE ? $this->getEndColor()->getHashCode() : '') . |
|
319 | + $this->getFillType(). |
|
320 | + $this->getRotation(). |
|
321 | + ($this->getFillType() !== self::FILL_NONE ? $this->getStartColor()->getHashCode() : ''). |
|
322 | + ($this->getFillType() !== self::FILL_NONE ? $this->getEndColor()->getHashCode() : ''). |
|
323 | 323 | __CLASS__ |
324 | 324 | ); |
325 | 325 | } |
@@ -541,15 +541,15 @@ |
||
541 | 541 | } |
542 | 542 | |
543 | 543 | return md5( |
544 | - $this->name . |
|
545 | - $this->size . |
|
546 | - ($this->bold ? 't' : 'f') . |
|
547 | - ($this->italic ? 't' : 'f') . |
|
548 | - ($this->superscript ? 't' : 'f') . |
|
549 | - ($this->subscript ? 't' : 'f') . |
|
550 | - $this->underline . |
|
551 | - ($this->strikethrough ? 't' : 'f') . |
|
552 | - $this->color->getHashCode() . |
|
544 | + $this->name. |
|
545 | + $this->size. |
|
546 | + ($this->bold ? 't' : 'f'). |
|
547 | + ($this->italic ? 't' : 'f'). |
|
548 | + ($this->superscript ? 't' : 'f'). |
|
549 | + ($this->subscript ? 't' : 'f'). |
|
550 | + $this->underline. |
|
551 | + ($this->strikethrough ? 't' : 'f'). |
|
552 | + $this->color->getHashCode(). |
|
553 | 553 | __CLASS__ |
554 | 554 | ); |
555 | 555 | } |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | return $worksheet; |
838 | 838 | } |
839 | 839 | |
840 | - throw new Exception('Workbook does not contain sheet:' . $pValue); |
|
840 | + throw new Exception('Workbook does not contain sheet:'.$pValue); |
|
841 | 841 | } |
842 | 842 | |
843 | 843 | /** |
@@ -916,7 +916,7 @@ discard block |
||
916 | 916 | $this->namedRanges[$namedRange->getName()] = $namedRange; |
917 | 917 | } else { |
918 | 918 | // local scope |
919 | - $this->namedRanges[$namedRange->getScope()->getTitle() . '!' . $namedRange->getName()] = $namedRange; |
|
919 | + $this->namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange; |
|
920 | 920 | } |
921 | 921 | |
922 | 922 | return true; |
@@ -941,8 +941,8 @@ discard block |
||
941 | 941 | } |
942 | 942 | |
943 | 943 | // then look for local defined name (has priority over global defined name if both names exist) |
944 | - if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) { |
|
945 | - $returnValue = $this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]; |
|
944 | + if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange])) { |
|
945 | + $returnValue = $this->namedRanges[$pSheet->getTitle().'!'.$namedRange]; |
|
946 | 946 | } |
947 | 947 | } |
948 | 948 | |
@@ -964,8 +964,8 @@ discard block |
||
964 | 964 | unset($this->namedRanges[$namedRange]); |
965 | 965 | } |
966 | 966 | } else { |
967 | - if (isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) { |
|
968 | - unset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]); |
|
967 | + if (isset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange])) { |
|
968 | + unset($this->namedRanges[$pSheet->getTitle().'!'.$namedRange]); |
|
969 | 969 | } |
970 | 970 | } |
971 | 971 |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | } |
415 | 415 | } else { |
416 | 416 | // String values are always tested for equality, factoring in for wildcards (hence a regexp test) |
417 | - $retVal = preg_match('/^' . $rule['value'] . '$/i', $cellValue); |
|
417 | + $retVal = preg_match('/^'.$rule['value'].'$/i', $cellValue); |
|
418 | 418 | } |
419 | 419 | // If there are multiple conditions, then we need to test both using the appropriate join operator |
420 | 420 | switch ($join) { |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | |
600 | 600 | private function calculateTopTenValue($columnID, $startRow, $endRow, $ruleType, $ruleValue) |
601 | 601 | { |
602 | - $range = $columnID . $startRow . ':' . $columnID . $endRow; |
|
602 | + $range = $columnID.$startRow.':'.$columnID.$endRow; |
|
603 | 603 | $dataValues = Functions::flattenArray($this->workSheet->rangeToArray($range, null, true, false)); |
604 | 604 | |
605 | 605 | $dataValues = array_filter($dataValues); |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')) { |
684 | 684 | $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]); |
685 | 685 | } |
686 | - $dateTime = $date . $time; |
|
686 | + $dateTime = $date.$time; |
|
687 | 687 | $arguments['date'][] = $date; |
688 | 688 | $arguments['time'][] = $time; |
689 | 689 | $arguments['dateTime'][] = $dateTime; |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) { |
733 | 733 | // Number (Average) based |
734 | 734 | // Calculate the average |
735 | - $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')'; |
|
735 | + $averageFormula = '=AVERAGE('.$columnID.($rangeStart[1] + 1).':'.$columnID.$rangeEnd[1].')'; |
|
736 | 736 | $average = Calculation::getInstance()->calculateFormula($averageFormula, null, $this->workSheet->getCell('A1')); |
737 | 737 | // Set above/below rule based on greaterThan or LessTan |
738 | 738 | $operator = ($dynamicRuleType === AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | for ($row = $rangeStart[1] + 1; $row <= $rangeEnd[1]; ++$row) { |
816 | 816 | $result = true; |
817 | 817 | foreach ($columnFilterTests as $columnID => $columnFilterTest) { |
818 | - $cellValue = $this->workSheet->getCell($columnID . $row)->getCalculatedValue(); |
|
818 | + $cellValue = $this->workSheet->getCell($columnID.$row)->getCalculatedValue(); |
|
819 | 819 | // Execute the filter test |
820 | 820 | $result = $result && |
821 | 821 | call_user_func_array( |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $fileName = $this->getFilename(); |
46 | 46 | $fileName = str_replace(' ', '_', $fileName); |
47 | 47 | |
48 | - return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension(); |
|
48 | + return str_replace('.'.$this->getExtension(), '', $fileName).$this->getImageIndex().'.'.$this->getExtension(); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | public function getHashCode() |
109 | 109 | { |
110 | 110 | return md5( |
111 | - $this->path . |
|
112 | - parent::getHashCode() . |
|
111 | + $this->path. |
|
112 | + parent::getHashCode(). |
|
113 | 113 | __CLASS__ |
114 | 114 | ); |
115 | 115 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $this->imageResource = null; |
54 | 54 | $this->renderingFunction = self::RENDERING_DEFAULT; |
55 | 55 | $this->mimeType = self::MIMETYPE_DEFAULT; |
56 | - $this->uniqueName = md5(rand(0, 9999) . time() . rand(0, 9999)); |
|
56 | + $this->uniqueName = md5(rand(0, 9999).time().rand(0, 9999)); |
|
57 | 57 | |
58 | 58 | // Initialize parent |
59 | 59 | parent::__construct(); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $extension = explode('/', $extension); |
149 | 149 | $extension = $extension[1]; |
150 | 150 | |
151 | - return $this->uniqueName . $this->getImageIndex() . '.' . $extension; |
|
151 | + return $this->uniqueName.$this->getImageIndex().'.'.$extension; |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | public function getHashCode() |
160 | 160 | { |
161 | 161 | return md5( |
162 | - $this->renderingFunction . |
|
163 | - $this->mimeType . |
|
164 | - $this->uniqueName . |
|
165 | - parent::getHashCode() . |
|
162 | + $this->renderingFunction. |
|
163 | + $this->mimeType. |
|
164 | + $this->uniqueName. |
|
165 | + parent::getHashCode(). |
|
166 | 166 | __CLASS__ |
167 | 167 | ); |
168 | 168 | } |
@@ -12,12 +12,12 @@ |
||
12 | 12 | public function getHashCode() |
13 | 13 | { |
14 | 14 | return md5( |
15 | - $this->getPath() . |
|
16 | - $this->name . |
|
17 | - $this->offsetX . |
|
18 | - $this->offsetY . |
|
19 | - $this->width . |
|
20 | - $this->height . |
|
15 | + $this->getPath(). |
|
16 | + $this->name. |
|
17 | + $this->offsetX. |
|
18 | + $this->offsetY. |
|
19 | + $this->width. |
|
20 | + $this->height. |
|
21 | 21 | __CLASS__ |
22 | 22 | ); |
23 | 23 | } |
@@ -261,13 +261,13 @@ |
||
261 | 261 | public function getHashCode() |
262 | 262 | { |
263 | 263 | return md5( |
264 | - ($this->visible ? 't' : 'f') . |
|
265 | - $this->blurRadius . |
|
266 | - $this->distance . |
|
267 | - $this->direction . |
|
268 | - $this->alignment . |
|
269 | - $this->color->getHashCode() . |
|
270 | - $this->alpha . |
|
264 | + ($this->visible ? 't' : 'f'). |
|
265 | + $this->blurRadius. |
|
266 | + $this->distance. |
|
267 | + $this->direction. |
|
268 | + $this->alignment. |
|
269 | + $this->color->getHashCode(). |
|
270 | + $this->alpha. |
|
271 | 271 | __CLASS__ |
272 | 272 | ); |
273 | 273 | } |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | } |
701 | 701 | } elseif ($method == self::SETPRINTRANGE_INSERT) { |
702 | 702 | if ($index == 0) { |
703 | - $this->printArea .= ($this->printArea == '') ? $value : ',' . $value; |
|
703 | + $this->printArea .= ($this->printArea == '') ? $value : ','.$value; |
|
704 | 704 | } else { |
705 | 705 | $printAreas = explode(',', $this->printArea); |
706 | 706 | if ($index < 0) { |
@@ -767,7 +767,7 @@ discard block |
||
767 | 767 | public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) |
768 | 768 | { |
769 | 769 | return $this->setPrintArea( |
770 | - Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2, |
|
770 | + Coordinate::stringFromColumnIndex($column1).$row1.':'.Coordinate::stringFromColumnIndex($column2).$row2, |
|
771 | 771 | $index, |
772 | 772 | $method |
773 | 773 | ); |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1) |
795 | 795 | { |
796 | 796 | return $this->setPrintArea( |
797 | - Coordinate::stringFromColumnIndex($column1) . $row1 . ':' . Coordinate::stringFromColumnIndex($column2) . $row2, |
|
797 | + Coordinate::stringFromColumnIndex($column1).$row1.':'.Coordinate::stringFromColumnIndex($column2).$row2, |
|
798 | 798 | $index, |
799 | 799 | self::SETPRINTRANGE_INSERT |
800 | 800 | ); |