Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scrutinizer 

24 minor problems, almost all of them unused code in tests.
This commit is contained in:
Owen Leibman 2021-06-15 09:33:02 -07:00 committed by Mark Baker
parent a735afc088
commit d88af46ab5
7 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpSpreadsheet/Worksheet/AutoFilter.php
View File

@ -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

1
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterAverageTop10Test.php
View File

@ -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');
}
}

5
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php
View File

@ -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();

8
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
View File

@ -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);

9
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/DateGroupTest.php
View File

@ -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());
}
}

1
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleCustomTest.php
View File

@ -40,7 +40,6 @@ class RuleCustomTest extends SetupTeardown
3
)
->setRuleType(Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
$autoFilterRuleObject = new Rule($columnFilter);
self::assertEquals($expectedResult, $this->getVisible());
}

5
tests/PhpSpreadsheetTests/Worksheet/AutoFilter/RuleDateGroupTest.php
View File

@ -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());
}
}