geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-08-30 12:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4933 from oleibman/stan20260701

Browse Source 
Update Phpstan
This commit is contained in:
oleibman
2026-07-01 19:38:32 +00:00
committed by GitHub
parent af9601ebdb 9533f5903f
commit bccdf28672
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+15 -13
View File
@@ -1706,11 +1706,11 @@
},
{
"name": "phpstan/phpstan",
"version": "2.2.2",
"version": "2.2.3",
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5cc34d491a90e79c216d824f60fe21fd4d93bd6",
"reference": "e5cc34d491a90e79c216d824f60fe21fd4d93bd6",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/4048833dd47b377287818841877fb3087289509c",
"reference": "4048833dd47b377287818841877fb3087289509c",
"shasum": ""
},
"require": {
@@ -1766,7 +1766,7 @@
"type": "github"
}
],
"time": "2026-06-05T09:00:01+00:00"
"time": "2026-06-30T21:15:26+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -1820,21 +1820,22 @@
},
{
"name": "phpstan/phpstan-phpunit",
"version": "2.0.16",
"version": "2.0.17",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "6ab598e1bc106e6827fd346ae4a12b4a5d634c32"
"reference": "c2f977551f0736d60467b3d754b2e0cf4e337b3f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/6ab598e1bc106e6827fd346ae4a12b4a5d634c32",
"reference": "6ab598e1bc106e6827fd346ae4a12b4a5d634c32",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/c2f977551f0736d60467b3d754b2e0cf4e337b3f",
"reference": "c2f977551f0736d60467b3d754b2e0cf4e337b3f",
"shasum": ""
},
"require": {
"phar-io/version": "^3.2",
"php": "^7.4 || ^8.0",
"phpstan/phpstan": "^2.1.32"
"phpstan/phpstan": "^2.2.3"
},
"conflict": {
"phpunit/phpunit": "<7.0"
@@ -1844,7 +1845,8 @@
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/phpstan-deprecation-rules": "^2.0",
"phpstan/phpstan-strict-rules": "^2.0",
"phpunit/phpunit": "^9.6"
"phpunit/phpunit": "^9.6",
"shipmonk/name-collision-detector": "^2.1"
},
"type": "phpstan-extension",
"extra": {
@@ -1870,9 +1872,9 @@
],
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.16"
"source": "https://github.com/phpstan/phpstan-phpunit/tree/2.0.17"
},
"time": "2026-02-14T09:05:21+00:00"
"time": "2026-06-29T05:32:23+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -5949,5 +5951,5 @@
"platform-overrides": {
"php": "8.1.99"
},
"plugin-api-version": "2.9.0"
"plugin-api-version": "2.6.0"
}
src/PhpSpreadsheet/Calculation/Calculation.php
+1 -1
View File
@@ -1955,7 +1955,7 @@ class Calculation extends CalculationLocale
if ($breakNeeded) {
break;
}
$cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow); // @phpstan-ignore-line
$cellRef = Coordinate::stringFromColumnIndex(min($oCol) + 1) . min($oRow) . ':' . Coordinate::stringFromColumnIndex(max($oCol) + 1) . max($oRow);
if ($pCellParent !== null && $this->spreadsheet !== null) {
$cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($sheet1), false);
} else {
src/PhpSpreadsheet/Reader/Gnumeric/Styles.php
+2 -6
View File
@@ -130,14 +130,10 @@ class Styles
$styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
$styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_BOTH;
} elseif (isset($srssb->Diagonal)) {
// No idea what Phpstan objects to,
// especially since it has no problem with identical
// statement just above
$styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes()); // @phpstan-ignore-line
$styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
$styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_UP;
} elseif (isset($srssb->{'Rev-Diagonal'})) {
// No idea what Phpstan objects to
$styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->{'Rev-Diagonal'}->attributes()); // @phpstan-ignore-line
$styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->{'Rev-Diagonal'}->attributes());
$styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_DOWN;
}
}
src/PhpSpreadsheet/Style/NumberFormat/NumberFormatter.php
+1 -3
View File
@@ -55,10 +55,8 @@ class NumberFormatter extends BaseFormatter
$number = floor($numberFloat / $divisor);
$mask = substr_replace($mask, $blockValue, $offset, $size);
}
/** @var string $numberString */
$numberString = $number;
if ($number > 0) {
$mask = substr_replace($mask, $numberString, $offset, 0);
$mask = substr_replace($mask, "$number", $offset, 0);
}
$result = $mask;
}