From 9199e077786c55909966d62f88444e8cc0ac688c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:37:21 +0000
Subject: [PATCH] update phpoffice/phpspreadsheet to 2.1.0, fixes #4162
Closes #4162
Merge request studip/studip!3002
---
composer.json | 1 +
composer.lock | 48 ++++++++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/composer.json b/composer.json
index e26f5d0d3d5..11903584950 100644
--- a/composer.json
+++ b/composer.json
@@ -57,6 +57,7 @@
"symfony/polyfill-php82": "1.29.0",
"symfony/polyfill-php83": "1.29.0",
"phpoffice/phpspreadsheet": "^1.19",
+ "phpoffice/phpspreadsheet": "2.1.0",
"psy/psysh": "0.12.3",
"okvpn/clock-lts": "^1.0",
"vlucas/phpdotenv": "^5.6",
diff --git a/composer.lock b/composer.lock
index 747ee4866b0..8bcf26b85fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "7a93548fcbb49075da2a6c6662c9f5d0",
+ "content-hash": "7f25cddb2ee62fd59b0df2e23f6d513a",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -2348,16 +2348,16 @@
},
{
"name": "phpoffice/phpspreadsheet",
- "version": "1.19.0",
+ "version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
- "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf"
+ "reference": "dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
- "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf",
+ "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e",
+ "reference": "dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e",
"shasum": ""
},
"require": {
@@ -2374,33 +2374,33 @@
"ext-xmlwriter": "*",
"ext-zip": "*",
"ext-zlib": "*",
- "ezyang/htmlpurifier": "^4.13",
- "maennchen/zipstream-php": "^2.1",
+ "maennchen/zipstream-php": "^2.1 || ^3.0",
"markbaker/complex": "^3.0",
"markbaker/matrix": "^3.0",
- "php": "^7.2 || ^8.0",
+ "php": "^8.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
- "psr/simple-cache": "^1.0"
+ "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
},
"require-dev": {
- "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
- "dompdf/dompdf": "^1.0",
- "friendsofphp/php-cs-fixer": "^2.18",
- "jpgraph/jpgraph": "^4.0",
- "mpdf/mpdf": "^8.0",
+ "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
+ "dompdf/dompdf": "^2.0",
+ "friendsofphp/php-cs-fixer": "^3.2",
+ "mitoteam/jpgraph": "^10.3",
+ "mpdf/mpdf": "^8.1.1",
"phpcompatibility/php-compatibility": "^9.3",
- "phpstan/phpstan": "^0.12.82",
- "phpstan/phpstan-phpunit": "^0.12.18",
- "phpunit/phpunit": "^8.5",
- "squizlabs/php_codesniffer": "^3.5",
- "tecnickcom/tcpdf": "^6.3"
+ "phpstan/phpstan": "^1.1",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^9.6",
+ "squizlabs/php_codesniffer": "^3.7",
+ "tecnickcom/tcpdf": "^6.5"
},
"suggest": {
- "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
- "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
+ "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+ "ext-intl": "PHP Internationalization Functions",
+ "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
"mpdf/mpdf": "Option for rendering PDF with PDF Writer",
- "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
+ "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer"
},
"type": "library",
"autoload": {
@@ -2446,9 +2446,9 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
- "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0"
+ "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.1.0"
},
- "time": "2021-10-31T15:09:20+00:00"
+ "time": "2024-05-11T04:17:56+00:00"
},
{
"name": "phpoption/phpoption",
--
GitLab