Skip to content

Commit cbffcbc

Browse files
committed
Drop some tricks used for Scrutinizer false positives
1 parent 2a0a53c commit cbffcbc

File tree

37 files changed

+29
-186
lines changed

37 files changed

+29
-186
lines changed

src/PhpSpreadsheet/Calculation/Calculation.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4184,14 +4184,8 @@ private function internalParseFormula($formula, ?Cell $cell = null): bool|array
41844184
$output[] = $stack->pop(); // Pop the function and push onto the output
41854185
if (isset(self::$controlFunctions[$functionName])) {
41864186
$expectedArgumentCount = self::$controlFunctions[$functionName]['argumentCount'];
4187-
// Scrutinizer says functionCall is unused after this assignment.
4188-
// It might be right, but I'm too lazy to confirm.
4189-
$functionCall = self::$controlFunctions[$functionName]['functionCall'];
4190-
self::doNothing($functionCall);
41914187
} elseif (isset(self::$phpSpreadsheetFunctions[$functionName])) {
41924188
$expectedArgumentCount = self::$phpSpreadsheetFunctions[$functionName]['argumentCount'];
4193-
$functionCall = self::$phpSpreadsheetFunctions[$functionName]['functionCall'];
4194-
self::doNothing($functionCall);
41954189
} else { // did we somehow push a non-function on the stack? this should never happen
41964190
return $this->raiseFormulaError('Formula Error: Internal error, non-function on stack');
41974191
}
@@ -4212,7 +4206,6 @@ private function internalParseFormula($formula, ?Cell $cell = null): bool|array
42124206
}
42134207
} elseif ($expectedArgumentCount != '*') {
42144208
$isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
4215-
self::doNothing($isOperandOrFunction);
42164209
switch ($argMatch[2] ?? '') {
42174210
case '+':
42184211
if ($argumentCount < $argMatch[1]) {
@@ -5717,11 +5710,6 @@ public function getSuppressFormulaErrors(): bool
57175710
return $this->suppressFormulaErrorsNew;
57185711
}
57195712

5720-
private static function doNothing(mixed $arg): bool
5721-
{
5722-
return (bool) $arg;
5723-
}
5724-
57255713
/**
57265714
* @return mixed
57275715
*/

src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static function fromYMD($year, $month, $day)
7272
$baseYear = SharedDateHelper::getExcelCalendar();
7373

7474
try {
75-
$year = self::getYear($year, $baseYear); // must be int - Scrutinizer is wrong
75+
$year = self::getYear($year, $baseYear);
7676
$month = self::getMonth($month);
7777
$day = self::getDay($day);
7878
self::adjustYearMonth($year, $month, $baseYear);

src/PhpSpreadsheet/Calculation/Engineering/BesselI.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,9 @@ private static function besselI1(float $x): float
107107
return ($x < 0.0) ? -$ans : $ans;
108108
}
109109

110-
/**
111-
* Sop to Scrutinizer.
112-
*
113-
* @var float
114-
*/
115-
private static $zeroPointZero = 0.0;
116-
117110
private static function besselI2(float $x, int $ord): float
118111
{
119-
if ($x === self::$zeroPointZero) {
112+
if ($x === 0.0) {
120113
return 0.0;
121114
}
122115

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static function modifiedRate(mixed $values, mixed $financeRate, mixed $re
110110
$rr = 1.0 + $reinvestmentRate;
111111
$fr = 1.0 + $financeRate;
112112

113-
$npvPos = $npvNeg = self::$zeroPointZero;
113+
$npvPos = $npvNeg = 0.0;
114114
foreach ($values as $i => $v) {
115115
if ($v >= 0) {
116116
$npvPos += $v / $rr ** $i;
@@ -119,7 +119,7 @@ public static function modifiedRate(mixed $values, mixed $financeRate, mixed $re
119119
}
120120
}
121121

122-
if ($npvNeg === self::$zeroPointZero || $npvPos === self::$zeroPointZero) {
122+
if ($npvNeg === 0.0 || $npvPos === 0.0) {
123123
return ExcelError::DIV0();
124124
}
125125

@@ -129,13 +129,6 @@ public static function modifiedRate(mixed $values, mixed $financeRate, mixed $re
129129
return is_finite($mirr) ? $mirr : ExcelError::NAN();
130130
}
131131

132-
/**
133-
* Sop to Scrutinizer.
134-
*
135-
* @var float
136-
*/
137-
private static $zeroPointZero = 0.0;
138-
139132
/**
140133
* NPV.
141134
*

src/PhpSpreadsheet/Calculation/Financial/Coupons.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ public static function COUPNCD(
257257
$maturity = FinancialValidations::validateMaturityDate($maturity);
258258
self::validateCouponPeriod($settlement, $maturity);
259259
$frequency = FinancialValidations::validateFrequency($frequency);
260-
$basis = FinancialValidations::validateBasis($basis);
261-
self::doNothing($basis);
260+
FinancialValidations::validateBasis($basis);
262261
} catch (Exception $e) {
263262
return $e->getMessage();
264263
}
@@ -310,8 +309,7 @@ public static function COUPNUM(
310309
$maturity = FinancialValidations::validateMaturityDate($maturity);
311310
self::validateCouponPeriod($settlement, $maturity);
312311
$frequency = FinancialValidations::validateFrequency($frequency);
313-
$basis = FinancialValidations::validateBasis($basis);
314-
self::doNothing($basis);
312+
FinancialValidations::validateBasis($basis);
315313
} catch (Exception $e) {
316314
return $e->getMessage();
317315
}
@@ -370,8 +368,7 @@ public static function COUPPCD(
370368
$maturity = FinancialValidations::validateMaturityDate($maturity);
371369
self::validateCouponPeriod($settlement, $maturity);
372370
$frequency = FinancialValidations::validateFrequency($frequency);
373-
$basis = FinancialValidations::validateBasis($basis);
374-
self::doNothing($basis);
371+
FinancialValidations::validateBasis($basis);
375372
} catch (Exception $e) {
376373
return $e->getMessage();
377374
}
@@ -411,9 +408,4 @@ private static function validateCouponPeriod(float $settlement, float $maturity)
411408
throw new Exception(ExcelError::NAN());
412409
}
413410
}
414-
415-
private static function doNothing(mixed $basis): bool
416-
{
417-
return $basis;
418-
}
419411
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public static function periodic(
5353
mixed $basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD,
5454
mixed $calcMethod = self::ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT
5555
) {
56-
self::doNothing($calcMethod);
5756
$issue = Functions::flattenSingleValue($issue);
5857
$firstInterest = Functions::flattenSingleValue($firstInterest);
5958
$settlement = Functions::flattenSingleValue($settlement);
@@ -72,8 +71,7 @@ public static function periodic(
7271
SecurityValidations::validateSecurityPeriod($issue, $settlement);
7372
$rate = SecurityValidations::validateRate($rate);
7473
$parValue = SecurityValidations::validateParValue($parValue);
75-
$frequency = SecurityValidations::validateFrequency($frequency);
76-
self::doNothing($frequency);
74+
SecurityValidations::validateFrequency($frequency);
7775
$basis = SecurityValidations::validateBasis($basis);
7876
} catch (Exception $e) {
7977
return $e->getMessage();
@@ -149,9 +147,4 @@ public static function atMaturity(
149147

150148
return $parValue * $rate * $daysBetweenIssueAndSettlement;
151149
}
152-
153-
private static function doNothing(mixed $arg): bool
154-
{
155-
return (bool) $arg;
156-
}
157150
}

src/PhpSpreadsheet/Calculation/MathTrig/Arabic.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,6 @@ private static function calculateArabic(array $roman, &$sum = 0, $subtract = 0)
5050
return $sum;
5151
}
5252

53-
private static function mollifyScrutinizer(mixed $value): array
54-
{
55-
return is_array($value) ? $value : [];
56-
}
57-
58-
private static function strSplit(string $roman): array
59-
{
60-
$rslt = str_split($roman);
61-
62-
return self::mollifyScrutinizer($rslt);
63-
}
64-
6553
/**
6654
* ARABIC.
6755
*
@@ -95,7 +83,7 @@ public static function evaluate(mixed $roman)
9583
}
9684

9785
try {
98-
$arabic = self::calculateArabic(self::strSplit($roman));
86+
$arabic = self::calculateArabic(str_split($roman));
9987
} catch (Exception) {
10088
return ExcelError::VALUE(); // Invalid character detected
10189
}

src/PhpSpreadsheet/Calculation/MathTrig/Ceiling.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public static function precise(mixed $number, $significance = 1): array|string|f
137137
*/
138138
private static function ceilingMathTest(float $significance, float $number, int $mode): bool
139139
{
140-
return ((float) $significance < 0) || ((float) $number < 0 && !empty($mode));
140+
return ($significance < 0) || ($number < 0 && !empty($mode));
141141
}
142142

143143
/**

src/PhpSpreadsheet/Calculation/Statistical/Conditional.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ private static function buildConditionSet(...$args): array
222222
{
223223
$conditions = self::buildConditions(1, ...$args);
224224

225-
// Scrutinizer thinks first parameter of array_map can't be null. It is wrong.
226225
return array_map(null, ...$conditions);
227226
}
228227

src/PhpSpreadsheet/Chart/Legend.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ public function setPosition($position): bool
103103
*/
104104
public function getPositionXL(): false|int
105105
{
106-
// Scrutinizer thinks the following could return string. It is wrong.
107106
return array_search($this->position, self::POSITION_XLREF);
108107
}
109108

0 commit comments

Comments
 (0)