aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2025-04-23 11:53:05 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2025-04-23 11:53:05 +0000
commit264785ff96b0e5a0f0077272bd6d4417463cbe89 (patch)
tree2c64d572f70bd940210763c661d17c156e8a7ef5
parent5ec3f8589984253b5554c32e24a39366dde96ad9 (diff)
update phpoffice/phpspreadsheet to v4.2.0, fixes #5526
Closes #5526 Merge request studip/studip!4148
-rw-r--r--app/controllers/course/members.php4
-rw-r--r--app/controllers/course/statusgroups.php4
-rw-r--r--app/controllers/institute/members.php5
-rw-r--r--composer.json2
-rw-r--r--composer.lock105
5 files changed, 94 insertions, 26 deletions
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 39f7810..73244ca 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -17,10 +17,6 @@
require_once 'lib/messaging.inc.php'; //Funktionen des Nachrichtensystems
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Csv;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-
class Course_MembersController extends AuthenticatedController
{
diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php
index 834a661..02dd331 100644
--- a/app/controllers/course/statusgroups.php
+++ b/app/controllers/course/statusgroups.php
@@ -13,10 +13,6 @@
* @since 3.5
*/
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Csv;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-
require_once 'lib/messaging.inc.php'; //Funktionen des Nachrichtensystems
class Course_StatusgroupsController extends AuthenticatedController
diff --git a/app/controllers/institute/members.php b/app/controllers/institute/members.php
index 3f312dc..106f3bf 100644
--- a/app/controllers/institute/members.php
+++ b/app/controllers/institute/members.php
@@ -7,11 +7,6 @@
* @todo test datafields!
*/
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Csv;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-
-
class Institute_MembersController extends AuthenticatedController
{
protected $allow_nobody = true;
diff --git a/composer.json b/composer.json
index 7a076ef..5c5d401 100644
--- a/composer.json
+++ b/composer.json
@@ -115,7 +115,7 @@
"willdurand/negotiation": "^3.1",
"monolog/monolog": "3.9.0",
"ksubileau/color-thief-php": "^2.0",
- "phpoffice/phpspreadsheet": "2.1.0",
+ "phpoffice/phpspreadsheet": "4.2.0",
"psy/psysh": "0.12.3",
"okvpn/clock-lts": "^1.0",
"vlucas/phpdotenv": "^5.6",
diff --git a/composer.lock b/composer.lock
index 6a80a35..3afc792 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": "5bc6d59baeb63299dd27cbd803e0134b",
+ "content-hash": "af2beae2dc81b5b603977100991f2c4f",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -297,6 +297,85 @@
"time": "2021-04-28T07:37:03+00:00"
},
{
+ "name": "composer/pcre",
+ "version": "3.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/pcre.git",
+ "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+ "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4 || ^8.0"
+ },
+ "conflict": {
+ "phpstan/phpstan": "<1.11.10"
+ },
+ "require-dev": {
+ "phpstan/phpstan": "^1.12 || ^2",
+ "phpstan/phpstan-strict-rules": "^1 || ^2",
+ "phpunit/phpunit": "^8 || ^9"
+ },
+ "type": "library",
+ "extra": {
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
+ },
+ "branch-alias": {
+ "dev-main": "3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\Pcre\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+ "keywords": [
+ "PCRE",
+ "preg",
+ "regex",
+ "regular expression"
+ ],
+ "support": {
+ "issues": "https://github.com/composer/pcre/issues",
+ "source": "https://github.com/composer/pcre/tree/3.3.2"
+ },
+ "funding": [
+ {
+ "url": "https://packagist.com",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-11-12T16:29:46+00:00"
+ },
+ {
"name": "defuse/php-encryption",
"version": "v2.4.0",
"source": {
@@ -3403,19 +3482,20 @@
},
{
"name": "phpoffice/phpspreadsheet",
- "version": "2.1.0",
+ "version": "4.2.0",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
- "reference": "dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e"
+ "reference": "5f6d7410e5fd72cac1aa67d4f05f4fe664d01ba6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e",
- "reference": "dbed77bd3a0f68f96c0dd68ad4499d5674fecc3e",
+ "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/5f6d7410e5fd72cac1aa67d4f05f4fe664d01ba6",
+ "reference": "5f6d7410e5fd72cac1aa67d4f05f4fe664d01ba6",
"shasum": ""
},
"require": {
+ "composer/pcre": "^1||^2||^3",
"ext-ctype": "*",
"ext-dom": "*",
"ext-fileinfo": "*",
@@ -3432,21 +3512,22 @@
"maennchen/zipstream-php": "^2.1 || ^3.0",
"markbaker/complex": "^3.0",
"markbaker/matrix": "^3.0",
- "php": "^8.0",
+ "php": "^8.1",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",
- "dompdf/dompdf": "^2.0",
+ "dompdf/dompdf": "^2.0 || ^3.0",
"friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.3",
"mpdf/mpdf": "^8.1.1",
"phpcompatibility/php-compatibility": "^9.3",
- "phpstan/phpstan": "^1.1",
- "phpstan/phpstan-phpunit": "^1.0",
- "phpunit/phpunit": "^9.6",
+ "phpstan/phpstan": "^1.1 || ^2.0",
+ "phpstan/phpstan-deprecation-rules": "^1.0 || ^2.0",
+ "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
+ "phpunit/phpunit": "^10.5",
"squizlabs/php_codesniffer": "^3.7",
"tecnickcom/tcpdf": "^6.5"
},
@@ -3501,9 +3582,9 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
- "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/2.1.0"
+ "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/4.2.0"
},
- "time": "2024-05-11T04:17:56+00:00"
+ "time": "2025-04-17T02:41:45+00:00"
},
{
"name": "phpoption/phpoption",