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

Combine Dependabot Changes

Browse Source 
Someting seemed to be wrong with push setup. We'll see if it's fixed.
This commit is contained in:
oleibman
2026-05-01 19:17:45 -07:00
parent 5483cf930d
commit 5c8c20686f
7 changed files with 126 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+110 -34
View File
@@ -781,6 +781,75 @@
},
"time": "2026-01-02T16:01:13+00:00"
},
{
"name": "ergebnis/agent-detector",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/ergebnis/agent-detector.git",
"reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
"reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
"shasum": ""
},
"require": {
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.50.0",
"ergebnis/license": "^2.7.0",
"ergebnis/php-cs-fixer-config": "^6.60.2",
"ergebnis/phpstan-rules": "^2.13.1",
"ergebnis/phpunit-slow-test-detector": "^2.24.0",
"ergebnis/rector-rules": "^1.16.0",
"fakerphp/faker": "^1.24.1",
"infection/infection": "^0.26.6",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan": "^2.1.46",
"phpstan/phpstan-deprecation-rules": "^2.0.4",
"phpstan/phpstan-phpunit": "^2.0.16",
"phpstan/phpstan-strict-rules": "^2.0.10",
"phpunit/phpunit": "^9.6.34",
"rector/rector": "^2.4.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.0-dev"
},
"composer-normalize": {
"indent-size": 2,
"indent-style": "space"
}
},
"autoload": {
"psr-4": {
"Ergebnis\\AgentDetector\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Andreas Möller",
"email": "am@localheinz.com",
"homepage": "https://localheinz.com"
}
],
"description": "Provides a detector for detecting the presence of an agent.",
"homepage": "https://github.com/ergebnis/agent-detector",
"support": {
"issues": "https://github.com/ergebnis/agent-detector/issues",
"security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
"source": "https://github.com/ergebnis/agent-detector"
},
"time": "2026-04-10T13:45:13+00:00"
},
{
"name": "evenement/evenement",
"version": "v3.0.2",
@@ -891,22 +960,23 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.94.2",
"version": "v3.95.1",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63"
"reference": "a9727678fbd12997f1d9de8f4a37824ed9df1065"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7787ceff91365ba7d623ec410b8f429cdebb4f63",
"reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a9727678fbd12997f1d9de8f4a37824ed9df1065",
"reference": "a9727678fbd12997f1d9de8f4a37824ed9df1065",
"shasum": ""
},
"require": {
"clue/ndjson-react": "^1.3",
"composer/semver": "^3.4",
"composer/xdebug-handler": "^3.0.5",
"ergebnis/agent-detector": "^1.1.1",
"ext-filter": "*",
"ext-hash": "*",
"ext-json": "*",
@@ -931,18 +1001,18 @@
"symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
},
"require-dev": {
"facile-it/paraunit": "^1.3.1 || ^2.7.1",
"infection/infection": "^0.32.3",
"justinrainbow/json-schema": "^6.6.4",
"facile-it/paraunit": "^1.3.1 || ^2.8.0",
"infection/infection": "^0.32.6",
"justinrainbow/json-schema": "^6.8.0",
"keradus/cli-executor": "^2.3",
"mikey179/vfsstream": "^1.6.12",
"php-coveralls/php-coveralls": "^2.9.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.7",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.7",
"phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.51",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.8",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.8",
"phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.55",
"symfony/polyfill-php85": "^1.33",
"symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.4",
"symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.1"
"symfony/var-dumper": "^5.4.48 || ^6.4.32 || ^7.4.4 || ^8.0.8",
"symfony/yaml": "^5.4.45 || ^6.4.30 || ^7.4.1 || ^8.0.8"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -983,7 +1053,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.94.2"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.1"
},
"funding": [
{
@@ -991,7 +1061,7 @@
"type": "github"
}
],
"time": "2026-02-20T16:13:53+00:00"
"time": "2026-04-12T17:00:09+00:00"
},
{
"name": "masterminds/html5",
@@ -1062,16 +1132,16 @@
},
{
"name": "mitoteam/jpgraph",
"version": "10.5.2",
"version": "10.5.4",
"source": {
"type": "git",
"url": "https://github.com/mitoteam/jpgraph.git",
"reference": "8bb38880ef4c2e0cc0daa59c2bb722979d1b1bf0"
"reference": "62658af06f619bd65a40fb4a2b26df7bdc36818a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/8bb38880ef4c2e0cc0daa59c2bb722979d1b1bf0",
"reference": "8bb38880ef4c2e0cc0daa59c2bb722979d1b1bf0",
"url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/62658af06f619bd65a40fb4a2b26df7bdc36818a",
"reference": "62658af06f619bd65a40fb4a2b26df7bdc36818a",
"shasum": ""
},
"require": {
@@ -1111,9 +1181,9 @@
],
"support": {
"issues": "https://github.com/mitoteam/jpgraph/issues",
"source": "https://github.com/mitoteam/jpgraph/tree/10.5.2"
"source": "https://github.com/mitoteam/jpgraph/tree/10.5.4"
},
"time": "2025-12-08T10:10:34+00:00"
"time": "2026-04-06T04:38:38+00:00"
},
{
"name": "mpdf/mpdf",
@@ -1639,11 +1709,11 @@
},
{
"name": "phpstan/phpstan",
"version": "2.1.46",
"version": "2.1.54",
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
"reference": "a193923fc2d6325ef4e741cf3af8c3e8f54dbf25",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
"reference": "8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
"shasum": ""
},
"require": {
@@ -1688,7 +1758,7 @@
"type": "github"
}
],
"time": "2026-04-01T09:25:14+00:00"
"time": "2026-04-29T13:31:09+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
@@ -5564,22 +5634,28 @@
},
{
"name": "tecnickcom/tcpdf",
"version": "6.11.2",
"version": "6.11.3",
"source": {
"type": "git",
"url": "https://github.com/tecnickcom/TCPDF.git",
"reference": "e1e2ade18e574e963473f53271591edd8c0033ec"
"reference": "b18f6119161019916c5bb07cb8da5205ae5c1b63"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e1e2ade18e574e963473f53271591edd8c0033ec",
"reference": "e1e2ade18e574e963473f53271591edd8c0033ec",
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/b18f6119161019916c5bb07cb8da5205ae5c1b63",
"reference": "b18f6119161019916c5bb07cb8da5205ae5c1b63",
"shasum": ""
},
"require": {
"ext-curl": "*",
"php": ">=7.1.0"
},
"suggest": {
"ext-gd": "Enables additional image handling in some workflows.",
"ext-imagick": "Enables additional image format support when available.",
"ext-zlib": "Recommended for compressed streams and related features.",
"tecnickcom/tc-lib-pdf": "Modern replacement for TCPDF for new projects."
},
"type": "library",
"autoload": {
"classmap": [
@@ -5610,8 +5686,8 @@
"role": "lead"
}
],
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
"homepage": "http://www.tcpdf.org/",
"description": "Deprecated legacy PDF engine for PHP. For new projects use tecnickcom/tc-lib-pdf.",
"homepage": "https://tcpdf.org",
"keywords": [
"PDFD32000-2008",
"TCPDF",
@@ -5623,15 +5699,15 @@
],
"support": {
"issues": "https://github.com/tecnickcom/TCPDF/issues",
"source": "https://github.com/tecnickcom/TCPDF/tree/6.11.2"
"source": "https://github.com/tecnickcom/TCPDF"
},
"funding": [
{
"url": "https://www.paypal.com/donate/?hosted_button_id=NZUEC5XS8MFBJ",
"type": "custom"
"type": "paypal"
}
],
"time": "2026-03-03T08:58:10+00:00"
"time": "2026-04-21T17:00:18+00:00"
},
{
"name": "thecodingmachine/safe",
@@ -5857,5 +5933,5 @@
"platform-overrides": {
"php": "8.1.99"
},
"plugin-api-version": "2.9.0"
"plugin-api-version": "2.6.0"
}
samples/Engineering/Convert-Online.php
+1 -1
View File
@@ -86,7 +86,7 @@ if (isset($post['quantity'], $post['fromUnit'], $post['toUnit'])) {
$toUnit = $post['toUnit'];
if (!is_numeric($quantity)) {
$helper->log('Quantity is not numeric');
} elseif (isset($units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
} elseif (isset($post['category'], $units[$post['category']][$fromUnit], $units[$post['category']][$toUnit])) {
/** @var float|string */
$result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/CellValue.php
+2 -1
View File
@@ -192,7 +192,8 @@ class CellValue extends WizardAbstract implements WizardInterface
$retVal = true;
$array = array_merge(array_keys(self::SINGLE_OPERATORS), array_keys(self::RANGE_OPERATORS));
foreach ($array as $value) {
$retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true);
// PhpStan is correct about next statement, but we want to test anyhow
$retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true); // @phpstan-ignore-line
}
return $retVal;
src/PhpSpreadsheet/Style/ConditionalFormatting/Wizard/TextValue.php
+2 -1
View File
@@ -169,7 +169,8 @@ class TextValue extends WizardAbstract implements WizardInterface
$retVal = true;
$array = array_keys(self::OPERATORS);
foreach ($array as $value) {
$retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true);
// PhpStan is correct about next statement, but we want to test anyhow
$retVal = $retVal && in_array($value, self::MAGIC_OPERATIONS, true); // @phpstan-ignore-line
}
return $retVal;
src/PhpSpreadsheet/Worksheet/Worksheet.php
+2 -1
View File
@@ -796,7 +796,8 @@ class Worksheet
$this->activePane = $holdActivePane;
}
if ($activeSheet !== null && $activeSheet >= 0) {
$this->getParent()?->setActiveSheetIndex($activeSheet);
// Not sure what PhpStan doesn't like about next stmt
$this->getParent()?->setActiveSheetIndex($activeSheet); // @phpstan-ignore-line
}
$this->setSelectedCells($selectedCells);
tests/PhpSpreadsheetTests/Chart/ChartCloneTest.php
+1 -2
View File
@@ -154,8 +154,7 @@ class ChartCloneTest extends AbstractFunctional
self::assertCount(1, $oldLabels);
self::assertCount(3, $oldLabels[0]->getTrendLines());
$plotGroup = $chart->getPlotArea()?->getPlotGroup();
self::assertNotNull($plotGroup);
$plotGroup = $chart->getPlotArea()->getPlotGroup();
self::assertCount(1, $plotGroup);
$plotLabels = $plotGroup[0]->getPlotLabels();
self::assertCount(1, $plotLabels);
tests/PhpSpreadsheetTests/Writer/Html/RepeatedRowsTest.php
+8 -8
View File
@@ -31,13 +31,13 @@ class RepeatedRowsTest extends Functional\AbstractFunctional
$divs = $body->getElementsByTagName('div');
$tbl = $divs->item(0)?->getElementsByTagName('table');
self::assertSame('', $tbl?->item(0)?->getAttribute('style'));
$thd = $divs->item(0)?->getElementsByTagName('thead');
$thd = $divs->item(0)->getElementsByTagName('thead');
self::assertCount(1, $thd);
$trw = $thd?->item(0)?->getElementsByTagName('tr');
$trw = $thd->item(0)?->getElementsByTagName('tr');
self::assertCount(2, $trw);
$tbd = $divs->item(0)?->getElementsByTagName('tbody');
$tbd = $divs->item(0)->getElementsByTagName('tbody');
self::assertCount(1, $tbd);
$trw = $tbd?->item(0)?->getElementsByTagName('tr');
$trw = $tbd->item(0)?->getElementsByTagName('tr');
self::assertCount(98, $trw);
$rls = $this->writeAndReload($spreadsheet, 'Html');
@@ -100,13 +100,13 @@ class RepeatedRowsTest extends Functional\AbstractFunctional
$divs = $body->getElementsByTagName('div');
$tbl = $divs->item(0)?->getElementsByTagName('table');
self::assertSame('border-collapse:collapse', $tbl?->item(0)?->getAttribute('style'));
$thd = $divs->item(0)?->getElementsByTagName('thead');
$thd = $divs->item(0)->getElementsByTagName('thead');
self::assertCount(1, $thd);
$trw = $thd?->item(0)?->getElementsByTagName('tr');
$trw = $thd->item(0)?->getElementsByTagName('tr');
self::assertCount(2, $trw);
$tbd = $divs->item(0)?->getElementsByTagName('tbody');
$tbd = $divs->item(0)->getElementsByTagName('tbody');
self::assertCount(1, $tbd);
$trw = $tbd?->item(0)?->getElementsByTagName('tr');
$trw = $tbd->item(0)?->getElementsByTagName('tr');
self::assertCount(98, $trw);
$rls = $this->writeAndReload($spreadsheet, 'Html');