Merge pull request #4349 from oleibman/updstan

Upgrade Phpstan
PHPOffice · Feb 8, 2025 · 9d1ad14 · 9d1ad14
2 parents 2d4b9f3 + 4bbbbac
commit 9d1ad14
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 52 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/infra/LocaleGenerator.php b/infra/LocaleGenerator.php
@@ -348,7 +348,7 @@ protected function mapFunctionNameRows(): void
 
                     continue;
                 }
-                if ($cell->getValue() != '') {
+                if ($cell->getValue() !== '') {
                     if (is_bool($cell->getValue())) {
                         $this->log($cell->getRow() . ' -> ' . ($cell->getValue() ? 'TRUE' : 'FALSE'));
                         $this->functionNameMap[($cell->getValue() ? 'TRUE' : 'FALSE')] = $cell->getRow();

diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php
@@ -317,7 +317,7 @@ protected static function filterTestInSimpleDataSet(mixed $cellValue, array $dat
     {
         $dataSetValues = $dataSet['filterValues'];
         $blanks = $dataSet['blanks'];
-        if (($cellValue == '') || ($cellValue === null)) {
+        if (($cellValue === '') || ($cellValue === null)) {
             return $blanks;
         }
 
@@ -333,7 +333,7 @@ protected static function filterTestInDateGroupSet(mixed $cellValue, array $data
     {
         $dateSet = $dataSet['filterValues'];
         $blanks = $dataSet['blanks'];
-        if (($cellValue == '') || ($cellValue === null)) {
+        if (($cellValue === '') || ($cellValue === null)) {
             return $blanks;
         }
         $timeZone = new DateTimeZone('UTC');
@@ -379,7 +379,7 @@ protected static function filterTestInCustomDataSet(mixed $cellValue, array $rul
 
         if (!$customRuleForBlanks) {
             //    Blank cells are always ignored, so return a FALSE
-            if (($cellValue == '') || ($cellValue === null)) {
+            if (($cellValue === '') || ($cellValue === null)) {
                 return false;
             }
         }
@@ -424,7 +424,7 @@ protected static function filterTestInCustomDataSet(mixed $cellValue, array $rul
                 }
             } elseif ($ruleValue == '') {
                 $retVal = match ($ruleOperator) {
-                    Rule::AUTOFILTER_COLUMN_RULE_EQUAL => ($cellValue == '') || ($cellValue === null),
+                    Rule::AUTOFILTER_COLUMN_RULE_EQUAL => ($cellValue === '') || ($cellValue === null),
                     Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL => ($cellValue != '') && ($cellValue !== null),
                     default => true,
                 };
@@ -486,7 +486,7 @@ protected static function filterTestInCustomDataSet(mixed $cellValue, array $rul
     protected static function filterTestInPeriodDateSet(mixed $cellValue, array $monthSet): bool
     {
         //    Blank cells are always ignored, so return a FALSE
-        if (($cellValue == '') || ($cellValue === null)) {
+        if (($cellValue === '') || ($cellValue === null)) {
             return false;
         }
 

diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -2395,11 +2395,8 @@ public function processBitmapGd(GdImage $image): array
                 $data .= str_repeat("\x00", 4 - 3 * $width % 4);
             }
         }
-        // Phpstan says this always throws an exception before getting here.
-        // I don't see why, but I think this is code is never exercised
-        // in unit tests, so I can't say for sure it's wrong.
 
-        return [$width, $height, strlen($data), $data]; //* @phpstan-ignore-line
+        return [$width, $height, strlen($data), $data];
     }
 
     /**