Drop some tricks used for Scrutinizer false positives

Author: PowerKiKi

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -4184,14 +4184,8 @@ private function internalParseFormula($formula, ?Cell $cell = null): bool|array
                     $output[] = $stack->pop(); //    Pop the function and push onto the output
                     if (isset(self::$controlFunctions[$functionName])) {
                         $expectedArgumentCount = self::$controlFunctions[$functionName]['argumentCount'];
-                        // Scrutinizer says functionCall is unused after this assignment.
-                        // It might be right, but I'm too lazy to confirm.
-                        $functionCall = self::$controlFunctions[$functionName]['functionCall'];
-                        self::doNothing($functionCall);
                     } elseif (isset(self::$phpSpreadsheetFunctions[$functionName])) {
                         $expectedArgumentCount = self::$phpSpreadsheetFunctions[$functionName]['argumentCount'];
-                        $functionCall = self::$phpSpreadsheetFunctions[$functionName]['functionCall'];
-                        self::doNothing($functionCall);
                     } else {    // did we somehow push a non-function on the stack? this should never happen
                         return $this->raiseFormulaError('Formula Error: Internal error, non-function on stack');
                     }
@@ -4212,7 +4206,6 @@ private function internalParseFormula($formula, ?Cell $cell = null): bool|array
                         }
                     } elseif ($expectedArgumentCount != '*') {
                         $isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
-                        self::doNothing($isOperandOrFunction);
                         switch ($argMatch[2] ?? '') {
                             case '+':
                                 if ($argumentCount < $argMatch[1]) {
@@ -5717,11 +5710,6 @@ public function getSuppressFormulaErrors(): bool
         return $this->suppressFormulaErrorsNew;
     }
 
-    private static function doNothing(mixed $arg): bool
-    {
-        return (bool) $arg;
-    }
-
     /**
      * @return mixed
      */

src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php

@@ -72,7 +72,7 @@ public static function fromYMD($year, $month, $day)
         $baseYear = SharedDateHelper::getExcelCalendar();
 
         try {
-            $year = self::getYear($year, $baseYear); // must be int - Scrutinizer is wrong
+            $year = self::getYear($year, $baseYear);
             $month = self::getMonth($month);
             $day = self::getDay($day);
             self::adjustYearMonth($year, $month, $baseYear);

src/PhpSpreadsheet/Calculation/Engineering/BesselI.php

@@ -107,16 +107,9 @@ private static function besselI1(float $x): float
         return ($x < 0.0) ? -$ans : $ans;
     }
 
-    /**
-     * Sop to Scrutinizer.
-     *
-     * @var float
-     */
-    private static $zeroPointZero = 0.0;
-
     private static function besselI2(float $x, int $ord): float
     {
-        if ($x === self::$zeroPointZero) {
+        if ($x === 0.0) {
             return 0.0;
         }
 

src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/Periodic.php

@@ -110,7 +110,7 @@ public static function modifiedRate(mixed $values, mixed $financeRate, mixed $re
         $rr = 1.0 + $reinvestmentRate;
         $fr = 1.0 + $financeRate;
 
-        $npvPos = $npvNeg = self::$zeroPointZero;
+        $npvPos = $npvNeg = 0.0;
         foreach ($values as $i => $v) {
             if ($v >= 0) {
                 $npvPos += $v / $rr ** $i;
@@ -119,7 +119,7 @@ public static function modifiedRate(mixed $values, mixed $financeRate, mixed $re
             }
         }
 
-        if ($npvNeg === self::$zeroPointZero || $npvPos === self::$zeroPointZero) {
+        if ($npvNeg === 0.0 || $npvPos === 0.0) {
             return ExcelError::DIV0();
         }
 
@@ -129,13 +129,6 @@ public static function modifiedRate(mixed $values, mixed $financeRate, mixed $re
         return is_finite($mirr) ? $mirr : ExcelError::NAN();
     }
 
-    /**
-     * Sop to Scrutinizer.
-     *
-     * @var float
-     */
-    private static $zeroPointZero = 0.0;
-
     /**
      * NPV.
      *

src/PhpSpreadsheet/Calculation/Financial/Coupons.php

@@ -257,8 +257,7 @@ public static function COUPNCD(
             $maturity = FinancialValidations::validateMaturityDate($maturity);
             self::validateCouponPeriod($settlement, $maturity);
             $frequency = FinancialValidations::validateFrequency($frequency);
-            $basis = FinancialValidations::validateBasis($basis);
-            self::doNothing($basis);
+            FinancialValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -310,8 +309,7 @@ public static function COUPNUM(
             $maturity = FinancialValidations::validateMaturityDate($maturity);
             self::validateCouponPeriod($settlement, $maturity);
             $frequency = FinancialValidations::validateFrequency($frequency);
-            $basis = FinancialValidations::validateBasis($basis);
-            self::doNothing($basis);
+            FinancialValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -370,8 +368,7 @@ public static function COUPPCD(
             $maturity = FinancialValidations::validateMaturityDate($maturity);
             self::validateCouponPeriod($settlement, $maturity);
             $frequency = FinancialValidations::validateFrequency($frequency);
-            $basis = FinancialValidations::validateBasis($basis);
-            self::doNothing($basis);
+            FinancialValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
         }
@@ -411,9 +408,4 @@ private static function validateCouponPeriod(float $settlement, float $maturity)
             throw new Exception(ExcelError::NAN());
         }
     }
-
-    private static function doNothing(mixed $basis): bool
-    {
-        return $basis;
-    }
 }

src/PhpSpreadsheet/Calculation/Financial/Securities/AccruedInterest.php

@@ -53,7 +53,6 @@ public static function periodic(
         mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD,
         mixed $calcMethod = self::ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT
     ) {
-        self::doNothing($calcMethod);
         $issue = Functions::flattenSingleValue($issue);
         $firstInterest = Functions::flattenSingleValue($firstInterest);
         $settlement = Functions::flattenSingleValue($settlement);
@@ -72,8 +71,7 @@ public static function periodic(
             SecurityValidations::validateSecurityPeriod($issue, $settlement);
             $rate = SecurityValidations::validateRate($rate);
             $parValue = SecurityValidations::validateParValue($parValue);
-            $frequency = SecurityValidations::validateFrequency($frequency);
-            self::doNothing($frequency);
+            SecurityValidations::validateFrequency($frequency);
             $basis = SecurityValidations::validateBasis($basis);
         } catch (Exception $e) {
             return $e->getMessage();
@@ -149,9 +147,4 @@ public static function atMaturity(
 
         return $parValue * $rate * $daysBetweenIssueAndSettlement;
     }
-
-    private static function doNothing(mixed $arg): bool
-    {
-        return (bool) $arg;
-    }
 }

src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php

@@ -50,18 +50,6 @@ private static function calculateArabic(array $roman, &$sum = 0, $subtract = 0)
         return $sum;
     }
 
-    private static function mollifyScrutinizer(mixed $value): array
-    {
-        return is_array($value) ? $value : [];
-    }
-
-    private static function strSplit(string $roman): array
-    {
-        $rslt = str_split($roman);
-
-        return self::mollifyScrutinizer($rslt);
-    }
-
     /**
      * ARABIC.
      *
@@ -95,7 +83,7 @@ public static function evaluate(mixed $roman)
         }
 
         try {
-            $arabic = self::calculateArabic(self::strSplit($roman));
+            $arabic = self::calculateArabic(str_split($roman));
         } catch (Exception) {
             return ExcelError::VALUE(); // Invalid character detected
         }

src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php

@@ -137,7 +137,7 @@ public static function precise(mixed $number, $significance = 1): array|string|f
      */
     private static function ceilingMathTest(float $significance, float $number, int $mode): bool
     {
-        return ((float) $significance < 0) || ((float) $number < 0 && !empty($mode));
+        return ($significance < 0) || ($number < 0 && !empty($mode));
     }
 
     /**

src/PhpSpreadsheet/Calculation/Statistical/Conditional.php

@@ -222,7 +222,6 @@ private static function buildConditionSet(...$args): array
     {
         $conditions = self::buildConditions(1, ...$args);
 
-        // Scrutinizer thinks first parameter of array_map can't be null. It is wrong.
         return array_map(null, ...$conditions);
     }
 

src/PhpSpreadsheet/Chart/Legend.php

@@ -103,7 +103,6 @@ public function setPosition($position): bool
      */
     public function getPositionXL(): false|int
     {
-        // Scrutinizer thinks the following could return string. It is wrong.
         return array_search($this->position, self::POSITION_XLREF);
     }