Eliminate Some Scrutinizer 'Major' Problems Part 2 (#3122)
* Eliminate Some Scrutinizer 'Major' Problems Part 2
Mostly Scrutinizer bizarre false positives. From Calculation/Engineering/Bessell (and several others):
```php
private static function besselI2(float $x, int $ord): float
{
if ($x === 0.0) {
return 0.0;
}
```
Scrutinizer complains that `$x` can never equal 0.0 here. Huh???
Another example repeated several times, from Calculation/Engineering/BesselJ:
```php
$bool = false;
foreach (whatever) {
...
$bool = !$bool;
...
}
```
Scrutinizer complains about the `!$bool` assignment because it says `$bool` is always false. Again, huh???
* Change Logical Not Handling
From a suggestion from @MarkBaker, sidestep bug in Scrutinizer by recoding
```php
$jsum = !$jsum
```
as:
```php
$jsum = $jsum === false;
```
This commit is contained in:
oleibman
GitHub
parent
e4e99b8a73
commit
f1d73d8dba
|
|
@ -72,10 +72,10 @@ class Date
|
|||
$baseYear = SharedDateHelper::getExcelCalendar();
|
||||
|
||||
try {
|
||||
$year = self::getYear($year, $baseYear);
|
||||
$year = self::getYear($year, $baseYear); // must be int - Scrutinizer is wrong
|
||||
$month = self::getMonth($month);
|
||||
$day = self::getDay($day);
|
||||
self::adjustYearMonth($year, $month, $baseYear);
|
||||
self::adjustYearMonth(/** @scrutinizer ignore-type */ $year, $month, $baseYear);
|
||||
} catch (Exception $e) {
|
||||
return $e->getMessage();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,12 +47,12 @@ class Difference
|
|||
// Execute function
|
||||
$PHPStartDateObject = SharedDateHelper::excelToDateTimeObject($startDate);
|
||||
$startDays = (int) $PHPStartDateObject->format('j');
|
||||
$startMonths = (int) $PHPStartDateObject->format('n');
|
||||
//$startMonths = (int) $PHPStartDateObject->format('n');
|
||||
$startYears = (int) $PHPStartDateObject->format('Y');
|
||||
|
||||
$PHPEndDateObject = SharedDateHelper::excelToDateTimeObject($endDate);
|
||||
$endDays = (int) $PHPEndDateObject->format('j');
|
||||
$endMonths = (int) $PHPEndDateObject->format('n');
|
||||
//$endMonths = (int) $PHPEndDateObject->format('n');
|
||||
$endYears = (int) $PHPEndDateObject->format('Y');
|
||||
|
||||
$PHPDiffDateObject = $PHPEndDateObject->diff($PHPStartDateObject);
|
||||
|
|
@ -138,7 +138,7 @@ class Difference
|
|||
$PHPEndDateObject->modify('+1 year');
|
||||
|
||||
// Get the result
|
||||
$retVal = $PHPEndDateObject->diff($PHPStartDateObject)->days;
|
||||
$retVal = (int) $PHPEndDateObject->diff($PHPStartDateObject)->days;
|
||||
|
||||
// Adjust for leap years cases
|
||||
$isLeapEndYear = $PHPEndDateObject->format('L');
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class TimeValue
|
|||
if ($retType === Functions::RETURNDATE_EXCEL) {
|
||||
$retValue = (float) $excelDateValue;
|
||||
} elseif ($retType === Functions::RETURNDATE_UNIX_TIMESTAMP) {
|
||||
$retValue = (int) $phpDateValue = SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
|
||||
$retValue = (int) SharedDateHelper::excelToTimestamp($excelDateValue + 25569) - 3600;
|
||||
} else {
|
||||
$retValue = new DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,9 +111,16 @@ class BesselI
|
|||
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 === 0.0) {
|
||||
if ($x === self::$zeroPointZero) {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ class BesselJ
|
|||
if ($jsum === true) {
|
||||
$sum += $bj;
|
||||
}
|
||||
$jsum = !$jsum;
|
||||
$jsum = $jsum === false;
|
||||
if ($j === $ord) {
|
||||
$ans = $bjp;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class ErfC
|
|||
$a = $n = 1;
|
||||
$b = $c = $value;
|
||||
$d = ($value * $value) + 0.5;
|
||||
$q1 = $q2 = $b / $d;
|
||||
$q2 = $b / $d;
|
||||
do {
|
||||
$t = $a * $n + $b * $value;
|
||||
$a = $b;
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class Periodic
|
|||
$rr = 1.0 + $reinvestmentRate;
|
||||
$fr = 1.0 + $financeRate;
|
||||
|
||||
$npvPos = $npvNeg = 0.0;
|
||||
$npvPos = $npvNeg = self::$zeroPointZero;
|
||||
foreach ($values as $i => $v) {
|
||||
if ($v >= 0) {
|
||||
$npvPos += $v / $rr ** $i;
|
||||
|
|
@ -121,7 +121,7 @@ class Periodic
|
|||
}
|
||||
}
|
||||
|
||||
if (($npvNeg === 0.0) || ($npvPos === 0.0) || ($reinvestmentRate <= -1.0)) {
|
||||
if (($npvNeg === self::$zeroPointZero) || ($npvPos === self::$zeroPointZero) || ($reinvestmentRate <= -1.0)) {
|
||||
return ExcelError::VALUE();
|
||||
}
|
||||
|
||||
|
|
@ -131,6 +131,13 @@ class Periodic
|
|||
return is_finite($mirr) ? $mirr : ExcelError::VALUE();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sop to Scrutinizer.
|
||||
*
|
||||
* @var float
|
||||
*/
|
||||
private static $zeroPointZero = 0.0;
|
||||
|
||||
/**
|
||||
* NPV.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -261,6 +261,7 @@ class Coupons
|
|||
self::validateCouponPeriod($settlement, $maturity);
|
||||
$frequency = FinancialValidations::validateFrequency($frequency);
|
||||
$basis = FinancialValidations::validateBasis($basis);
|
||||
self::doNothing($basis);
|
||||
} catch (Exception $e) {
|
||||
return $e->getMessage();
|
||||
}
|
||||
|
|
@ -315,6 +316,7 @@ class Coupons
|
|||
self::validateCouponPeriod($settlement, $maturity);
|
||||
$frequency = FinancialValidations::validateFrequency($frequency);
|
||||
$basis = FinancialValidations::validateBasis($basis);
|
||||
self::doNothing($basis);
|
||||
} catch (Exception $e) {
|
||||
return $e->getMessage();
|
||||
}
|
||||
|
|
@ -375,6 +377,7 @@ class Coupons
|
|||
self::validateCouponPeriod($settlement, $maturity);
|
||||
$frequency = FinancialValidations::validateFrequency($frequency);
|
||||
$basis = FinancialValidations::validateBasis($basis);
|
||||
self::doNothing($basis);
|
||||
} catch (Exception $e) {
|
||||
return $e->getMessage();
|
||||
}
|
||||
|
|
@ -414,4 +417,10 @@ class Coupons
|
|||
throw new Exception(ExcelError::NAN());
|
||||
}
|
||||
}
|
||||
|
||||
/** @param mixed $basis */
|
||||
private static function doNothing($basis): bool
|
||||
{
|
||||
return $basis;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
|
|||
|
||||
class Depreciation
|
||||
{
|
||||
/** @var float */
|
||||
private static $zeroPointZero = 0.0;
|
||||
|
||||
/**
|
||||
* DB.
|
||||
*
|
||||
|
|
@ -51,7 +54,7 @@ class Depreciation
|
|||
return $e->getMessage();
|
||||
}
|
||||
|
||||
if ($cost === 0.0) {
|
||||
if ($cost === self::$zeroPointZero) {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
|
|
@ -161,7 +164,7 @@ class Depreciation
|
|||
return $e->getMessage();
|
||||
}
|
||||
|
||||
if ($life === 0.0) {
|
||||
if ($life === self::$zeroPointZero) {
|
||||
return ExcelError::DIV0();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ class AccruedInterest
|
|||
$basis = FinancialConstants::BASIS_DAYS_PER_YEAR_NASD,
|
||||
$calcMethod = self::ACCRINT_CALCMODE_ISSUE_TO_SETTLEMENT
|
||||
) {
|
||||
self::doNothing($calcMethod);
|
||||
$issue = Functions::flattenSingleValue($issue);
|
||||
$firstInterest = Functions::flattenSingleValue($firstInterest);
|
||||
$settlement = Functions::flattenSingleValue($settlement);
|
||||
|
|
@ -73,6 +74,7 @@ class AccruedInterest
|
|||
$rate = SecurityValidations::validateRate($rate);
|
||||
$parValue = SecurityValidations::validateParValue($parValue);
|
||||
$frequency = SecurityValidations::validateFrequency($frequency);
|
||||
self::doNothing($frequency);
|
||||
$basis = SecurityValidations::validateBasis($basis);
|
||||
} catch (Exception $e) {
|
||||
return $e->getMessage();
|
||||
|
|
@ -148,4 +150,10 @@ class AccruedInterest
|
|||
|
||||
return $parValue * $rate * $daysBetweenIssueAndSettlement;
|
||||
}
|
||||
|
||||
/** @param mixed $arg */
|
||||
private static function doNothing($arg): bool
|
||||
{
|
||||
return (bool) $arg;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -576,7 +576,7 @@ class Functions
|
|||
$flattened = [];
|
||||
$stack = array_values($array);
|
||||
|
||||
while ($stack) {
|
||||
while (!empty($stack)) {
|
||||
$value = array_shift($stack);
|
||||
|
||||
if (is_array($value)) {
|
||||
|
|
|
|||
|
|
@ -463,8 +463,8 @@ class Chart
|
|||
/**
|
||||
* Set the offset position within the Top Left cell for the chart.
|
||||
*
|
||||
* @param int $xOffset
|
||||
* @param int $yOffset
|
||||
* @param ?int $xOffset
|
||||
* @param ?int $yOffset
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
|
|
@ -587,8 +587,8 @@ class Chart
|
|||
/**
|
||||
* Set the offset position within the Bottom Right cell for the chart.
|
||||
*
|
||||
* @param int $xOffset
|
||||
* @param int $yOffset
|
||||
* @param ?int $xOffset
|
||||
* @param ?int $yOffset
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -496,7 +496,7 @@ class DataSeriesValues extends Properties
|
|||
if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
|
||||
$this->dataValues = Functions::flattenArray($newDataValues);
|
||||
} else {
|
||||
$newArray = array_values(array_shift($newDataValues));
|
||||
$newArray = array_values(array_shift(/** @scrutinizer ignore-type */ $newDataValues));
|
||||
foreach ($newArray as $i => $newDataSet) {
|
||||
$newArray[$i] = [$newDataSet];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -539,7 +539,7 @@ abstract class Properties
|
|||
/**
|
||||
* Set Soft Edges Size.
|
||||
*
|
||||
* @param float $size
|
||||
* @param ?float $size
|
||||
*/
|
||||
public function setSoftEdges($size): void
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class Settings
|
|||
* Class name of the chart renderer used for rendering charts
|
||||
* eg: PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph.
|
||||
*
|
||||
* @var string
|
||||
* @var ?string
|
||||
*/
|
||||
private static $chartRenderer;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue