Skip to content

Commit 4adafec

Browse files
oleibmanoleibman
authored
Eliminate Shared\JAMA (#3260)
* Eliminate Shared\JAMA The code under `Shared\JAMA` is called from exactly 3 places in Calculation, and exactly 1 other place (see next paragraph). These places are inadequately covered in the test suite, so it is not clear that the existing code works. In addition, see PR #2964 for commentary decrying the continued used of JAMA. I will also note that it has a pitiful 8.20% coverage in the test suite. There seems to already be a perfectly adequate equivalent in Calculation for those parts of JAMA which are used (e.g. we don't use any decompositions, so the fact that no decomposition code is present in Calculation is not a problem). This PR replaces the uses of JAMA within Calculation with `checkMatrixOperands`, and deletes Shared/JAMA entirely (which, among other thing, makes many Phpstan reported problems go away). The test suite is enhanced to ensure coverage of all the changed statements. A side benefit of deleting Shared/Jama is that the only function which PhpSpreadsheet has added to the global namespace (hypo in Maths.php) goes away. There is one additional use in Shared/Trend/PolynomialBestFit. That use is best replaced with Matrix/Matrix, which is already a requirement for PhpSpreadsheet. PolynomialBestFit has zero test coverage, and I didn't add any for this change. There seem to be existing errors which both Phpstan and Scrutinizer complain about, and I am quite convinced that they are not false positives. Fixing those problems will be a project for another day. Calculation has many calls to `Information\ErrorValue` and `Information\ExcelError`. It is inconsistent in how it does so - most invoke `Information\E...` but a small number take advantage of additional `use` statements to just invoke `E...`. I have made the usage consistent by changing the small number to act like the majority and eliminating the `use` statements. Some of the test cases exposed the fact that MAX, MAXA, MIN, and MINA do not properly handle error strings in their input. For example, if cell A1 contains 2, and A2 contains `=5/0`, `=MAX(A1, A2)` should return `#DIV/0!`. They are changed to handle them properly. `Shared\JAMA` was normally omitted from code coverage. Since it is being deleted, there is no longer a reason to explicitly exclude it. `Writer\PDF` was also on the exclude list, probably for historical reasons, but there is no reason to exclude it now (it is, in fact, 100% covered), so it will no longer be excluded. * Scrutinizer Eliminate some newly dead code.
1 parent de9c461 commit 4adafec

24 files changed

+274
-1991
lines changed

‎phpstan-baseline.neon

-85
Original file line numberDiff line numberDiff line change
@@ -1120,91 +1120,6 @@ parameters:
11201120
count: 1
11211121
path: src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
11221122

1123-
-
1124-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:__construct\\(\\) has parameter \\$args with no type specified\\.$#"
1125-
count: 1
1126-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1127-
1128-
-
1129-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayLeftDivide\\(\\) has parameter \\$args with no type specified\\.$#"
1130-
count: 1
1131-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1132-
1133-
-
1134-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayLeftDivideEquals\\(\\) has parameter \\$args with no type specified\\.$#"
1135-
count: 1
1136-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1137-
1138-
-
1139-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayRightDivide\\(\\) has parameter \\$args with no type specified\\.$#"
1140-
count: 1
1141-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1142-
1143-
-
1144-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayRightDivideEquals\\(\\) has parameter \\$args with no type specified\\.$#"
1145-
count: 1
1146-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1147-
1148-
-
1149-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayTimes\\(\\) has parameter \\$args with no type specified\\.$#"
1150-
count: 1
1151-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1152-
1153-
-
1154-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:arrayTimesEquals\\(\\) has parameter \\$args with no type specified\\.$#"
1155-
count: 1
1156-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1157-
1158-
-
1159-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:concat\\(\\) has parameter \\$args with no type specified\\.$#"
1160-
count: 1
1161-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1162-
1163-
-
1164-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:getMatrix\\(\\) has parameter \\$args with no type specified\\.$#"
1165-
count: 1
1166-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1167-
1168-
-
1169-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:minus\\(\\) has parameter \\$args with no type specified\\.$#"
1170-
count: 1
1171-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1172-
1173-
-
1174-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:minusEquals\\(\\) has parameter \\$args with no type specified\\.$#"
1175-
count: 1
1176-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1177-
1178-
-
1179-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:plus\\(\\) has parameter \\$args with no type specified\\.$#"
1180-
count: 1
1181-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1182-
1183-
-
1184-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:plusEquals\\(\\) has parameter \\$args with no type specified\\.$#"
1185-
count: 1
1186-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1187-
1188-
-
1189-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:power\\(\\) has parameter \\$args with no type specified\\.$#"
1190-
count: 1
1191-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1192-
1193-
-
1194-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:times\\(\\) has parameter \\$args with no type specified\\.$#"
1195-
count: 1
1196-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1197-
1198-
-
1199-
message: "#^Parameter \\#3 \\$c of method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:set\\(\\) expects float\\|int\\|null, string given\\.$#"
1200-
count: 2
1201-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1202-
1203-
-
1204-
message: "#^Unreachable statement \\- code above always terminates\\.$#"
1205-
count: 14
1206-
path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
1207-
12081123
-
12091124
message: "#^Cannot access offset 1 on array\\|false\\.$#"
12101125
count: 1

‎phpstan-conditional.php

-5
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@
7474
'path' => __DIR__ . '/src/PhpSpreadsheet/Calculation/TextData/Text.php',
7575
'count' => 1,
7676
];
77-
$config['parameters']['ignoreErrors'][] = [
78-
'message' => '#^Property PhpOffice\\PhpSpreadsheet\\Shared\\JAMA\\Matrix::$A (array) does not accept array<int, array<int, int>|false>|false.$#',
79-
'path' => __DIR__ . '/src/PhpSpreadsheet/Shared/JAMA/Matrix.php',
80-
'count' => 2,
81-
];
8277
} else {
8378
// Flagged in Php8+ - unsure how to correct code
8479
$config['parameters']['ignoreErrors'][] = [

‎phpunit.xml.dist

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
<include>
55
<directory suffix=".php">./src</directory>
66
</include>
7-
<exclude>
8-
<directory>./src/PhpSpreadsheet/Shared/JAMA</directory>
9-
<directory>./src/PhpSpreadsheet/Writer/PDF</directory>
10-
</exclude>
117
</coverage>
128
<php>
139
<ini name="memory_limit" value="2048M"/>

0 commit comments

Comments
 (0)