diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php index e705c9e3..a6b470c1 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -947,7 +947,7 @@ class AutoFilter $ruleValue = 500; } - $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, $rangeEnd[1], $toptenRuleType, $ruleValue); + $maxVal = $this->calculateTopTenValue($columnID, $rangeStart[1] + 1, (int) $rangeEnd[1], $toptenRuleType, $ruleValue); $operator = ($toptenRuleType == Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterAverageTop10Test.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterAverageTop10Test.php index 33eca40b..79358823 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterAverageTop10Test.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterAverageTop10Test.php @@ -160,7 +160,6 @@ class AutoFilterAverageTop10Test extends SetupTeardown ) ->setRuleType(Rule::AUTOFILTER_RULETYPE_TOPTENFILTER); - $visible = $this->getVisible(); self::assertCount(500, $this->getVisible(), 'Top10 Filter limited to 500 items plus ties'); } } diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php index f9a51870..6784d226 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php @@ -5,7 +5,6 @@ namespace PhpOffice\PhpSpreadsheetTests\Worksheet\AutoFilter; use DateTimeImmutable; use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column; use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule; -use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; class AutoFilterWeekTest extends SetupTeardown { @@ -18,7 +17,7 @@ class AutoFilterWeekTest extends SetupTeardown ]; } - private function setCells(Worksheet $sheet): void + private function setCells(): void { $sheet = $this->getSheet(); $sheet->getCell('A1')->setValue('Date'); @@ -45,7 +44,7 @@ class AutoFilterWeekTest extends SetupTeardown $sheet = $this->getSheet(); $dtStart = new DateTimeImmutable(); $startDay = (int) $dtStart->format('d'); - self::setCells($sheet); + $this->setCells(); $maxRow = $this->maxRow; $autoFilter = $sheet->getAutoFilter(); diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php index 65fefb2f..c94cb3a4 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php @@ -37,7 +37,6 @@ class ColumnTest extends SetupTeardown Rule::AUTOFILTER_COLUMN_RULE_EQUAL, 3 ); - $autoFilterRuleObject = new Rule($columnFilter); $result = $columnFilter->getColumnIndex(); self::assertEquals('H', $result); } @@ -47,7 +46,7 @@ class ColumnTest extends SetupTeardown $this->expectException(PhpSpreadsheetException::class); $this->expectExceptionMessage('Column is outside of current autofilter range.'); $sheet = $this->initSheet(); - $columnFilter = $sheet->getAutoFilter()->getColumn('B'); + $sheet->getAutoFilter()->getColumn('B'); } public function testSetColumnIndex(): void @@ -60,7 +59,6 @@ class ColumnTest extends SetupTeardown Rule::AUTOFILTER_COLUMN_RULE_EQUAL, 3 ); - $autoFilterRuleObject = new Rule($columnFilter); $expectedResult = 'G'; $result = $columnFilter->setColumnIndex($expectedResult); @@ -89,7 +87,6 @@ class ColumnTest extends SetupTeardown Rule::AUTOFILTER_COLUMN_RULE_EQUAL, 3 ); - $autoFilterRuleObject = new Rule($columnFilter); $result = $columnFilter->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER); self::assertInstanceOf(Column::class, $result); @@ -202,10 +199,11 @@ class ColumnTest extends SetupTeardown 'maxVal' => 200, ]; - $result = $columnFilter->setAttributes($attributeSet); + $columnFilter->setAttributes($attributeSet); foreach ($attributeSet as $attributeName => $attributeValue) { $result = $columnFilter->getAttribute($attributeName); + self::assertSame($attributeValue, $result); } $result = $columnFilter->getAttribute('nonExistentAttribute'); self::assertNull($result); diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/DateGroupTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/DateGroupTest.php index 6d62ed1a..a89ebd5b 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/DateGroupTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/DateGroupTest.php @@ -49,7 +49,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([6], $this->getVisible()); } @@ -74,7 +73,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); $sheet->getCell('C5')->setValue(''); // make an empty cell in range self::assertEquals([6], $this->getVisible()); } @@ -100,7 +98,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([], $this->getVisible()); } @@ -122,7 +119,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([6], $this->getVisible()); } @@ -141,7 +137,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([], $this->getVisible()); } @@ -161,7 +156,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([14, 38, 62], $this->getVisible()); } @@ -182,7 +176,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([38], $this->getVisible()); } @@ -204,7 +197,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([38], $this->getVisible()); } @@ -226,7 +218,6 @@ class DateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([], $this->getVisible()); } } diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleCustomTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleCustomTest.php index 39103463..9f6b48bb 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleCustomTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleCustomTest.php @@ -40,7 +40,6 @@ class RuleCustomTest extends SetupTeardown 3 ) ->setRuleType(Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals($expectedResult, $this->getVisible()); } diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleDateGroupTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleDateGroupTest.php index 24e33797..3a32a9eb 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleDateGroupTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleDateGroupTest.php @@ -48,7 +48,6 @@ class RuleDateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([3, 5, 6, 7], $this->getVisible()); } @@ -68,7 +67,6 @@ class RuleDateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([3, 5, 6, 7], $this->getVisible()); } @@ -90,7 +88,6 @@ class RuleDateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([3, 5, 6, 7], $this->getVisible()); } @@ -111,7 +108,6 @@ class RuleDateGroupTest extends SetupTeardown ->setRuleType( 'xyz' ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([3, 5, 6, 7], $this->getVisible()); } @@ -131,7 +127,6 @@ class RuleDateGroupTest extends SetupTeardown ->setRuleType( Rule::AUTOFILTER_RULETYPE_DATEGROUP ); - $autoFilterRuleObject = new Rule($columnFilter); self::assertEquals([3, 6], $this->getVisible()); } }