From 4ab6439de16f98287af3ceeb23a3b94343cfd494 Mon Sep 17 00:00:00 2001 From: Owen Leibman Date: Wed, 2 Jun 2021 21:49:12 -0700 Subject: [PATCH] Scrutinizer Fix 5 minor errors. --- src/PhpSpreadsheet/Worksheet/AutoFilter.php | 1 - .../Worksheet/AutoFilter/AutoFilterQuarterTest.php | 5 ++--- .../Worksheet/AutoFilter/AutoFilterWeekTest.php | 1 - .../Worksheet/AutoFilter/AutoFilterYearTest.php | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php index c75e20ba..6c23805d 100644 --- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -689,7 +689,6 @@ class AutoFilter private function dynamicFilterDateRange($dynamicRuleType, &$filterColumn) { $ruleValues = []; - $val = $maxVal = null; $callBack = [__CLASS__, self::DATE_FUNCTIONS[$dynamicRuleType]]; // What if not found? // Calculate start/end dates for the required date range based on current date // Val is lowest permitted value. diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterQuarterTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterQuarterTest.php index d75f1bc2..73c48c4a 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterQuarterTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterQuarterTest.php @@ -20,7 +20,7 @@ class AutoFilterQuarterTest extends TestCase ]; } - private static function setCells(Worksheet $sheet, int $startMonth): void + private static function setCells(Worksheet $sheet): void { $sheet->getCell('A1')->setValue('Date'); $sheet->getCell('A2')->setValue('=TODAY()'); @@ -45,8 +45,7 @@ class AutoFilterQuarterTest extends TestCase $sheet = $spreadsheet->getActiveSheet(); $dtStart = new DateTimeImmutable(); $startDay = (int) $dtStart->format('d'); - $startMonth = (int) $dtStart->format('m'); - self::setCells($sheet, $startMonth); + self::setCells($sheet); $maxRow = 9; $autoFilter = $spreadsheet->getActiveSheet()->getAutoFilter(); diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php index 3e8fcdb8..765bf11c 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterWeekTest.php @@ -46,7 +46,6 @@ class AutoFilterWeekTest extends TestCase $sheet = $spreadsheet->getActiveSheet(); $dtStart = new DateTimeImmutable(); $startDay = (int) $dtStart->format('d'); - $startMonth = (int) $dtStart->format('m'); self::setCells($sheet); $maxRow = 9; diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterYearTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterYearTest.php index 105608ae..8c416cc3 100644 --- a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterYearTest.php +++ b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/AutoFilterYearTest.php @@ -84,7 +84,6 @@ class AutoFilterYearTest extends TestCase $startDay = (int) $dtStart->format('d'); $startMonth = (int) $dtStart->format('m'); $sheet->getCell('A1')->setValue('Date'); - $year = (int) $dtStart->format('Y'); $sheet->getCell('A2')->setValue('=TODAY()'); $sheet->getCell('A3')->setValue('=DATE(YEAR(A2), 12, 31)'); $sheet->getCell('A4')->setValue('=A3 + 1');