From e8b666b380849ad14d1505046b09206317a6419e Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 15 May 2024 18:58:00 +0000
Subject: [PATCH] update slim/slim to 4.13.0 and slim/psr7 to 1.6.1, fixes
#4156
Closes #4156
Merge request studip/studip!2996
---
composer.json | 4 +--
composer.lock | 76 ++++++++++++++++++++++++++-------------------------
2 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/composer.json b/composer.json
index 46cd649722e..41904ab6e9d 100644
--- a/composer.json
+++ b/composer.json
@@ -43,8 +43,8 @@
"ext-mbstring": "*",
"ext-dom": "*",
"opis/json-schema": "^1.0",
- "slim/psr7": "^1.4",
- "slim/slim": "^4.7.1",
+ "slim/psr7": "1.6.1",
+ "slim/slim": "4.13.0",
"php-di/php-di": "^6.3.4",
"symfony/console": "^5.3.16",
"symfony/process": "^5.4",
diff --git a/composer.lock b/composer.lock
index 0f5572cc5c6..7f78a11670b 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": "4212f765bea5d1be5fa2d84d32040779",
+ "content-hash": "c12530d4c0a9fa774b713876e67f6876",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -3523,39 +3523,40 @@
},
{
"name": "slim/psr7",
- "version": "1.4",
+ "version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim-Psr7.git",
- "reference": "0dca983ca32a26f4a91fb11173b7b9eaee29e9d6"
+ "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/0dca983ca32a26f4a91fb11173b7b9eaee29e9d6",
- "reference": "0dca983ca32a26f4a91fb11173b7b9eaee29e9d6",
+ "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/72d2b2bac94ab4575d369f605dbfafbe168d3163",
+ "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163",
"shasum": ""
},
"require": {
"fig/http-message-util": "^1.1.5",
- "php": "^7.2 || ^8.0",
+ "php": "^7.4 || ^8.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
- "ralouphie/getallheaders": "^3",
- "symfony/polyfill-php80": "^1.22"
+ "ralouphie/getallheaders": "^3.0",
+ "symfony/polyfill-php80": "^1.26"
},
"provide": {
"psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"require-dev": {
- "adriansuter/php-autoload-override": "^1.2",
+ "adriansuter/php-autoload-override": "^1.3",
"ext-json": "*",
"http-interop/http-factory-tests": "^0.9.0",
- "php-http/psr7-integration-tests": "dev-master",
- "phpstan/phpstan": "^0.12",
- "phpunit/phpunit": "^8.5 || ^9.5",
- "squizlabs/php_codesniffer": "^3.6",
- "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
+ "php-http/psr7-integration-tests": "1.1",
+ "phpspec/prophecy": "^1.15",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpstan/phpstan": "^1.8",
+ "phpunit/phpunit": "^9.5",
+ "squizlabs/php_codesniffer": "^3.7"
},
"type": "library",
"autoload": {
@@ -3598,50 +3599,51 @@
],
"support": {
"issues": "https://github.com/slimphp/Slim-Psr7/issues",
- "source": "https://github.com/slimphp/Slim-Psr7/tree/1.4"
+ "source": "https://github.com/slimphp/Slim-Psr7/tree/1.6.1"
},
- "time": "2021-05-08T18:22:56+00:00"
+ "time": "2023-04-17T16:02:20+00:00"
},
{
"name": "slim/slim",
- "version": "4.8.1",
+ "version": "4.13.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
- "reference": "c8934c35d9d98b1a1df9f99ee69b77a59e0aa820"
+ "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slimphp/Slim/zipball/c8934c35d9d98b1a1df9f99ee69b77a59e0aa820",
- "reference": "c8934c35d9d98b1a1df9f99ee69b77a59e0aa820",
+ "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+ "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
"shasum": ""
},
"require": {
"ext-json": "*",
"nikic/fast-route": "^1.3",
- "php": "^7.2 || ^8.0",
+ "php": "^7.4 || ^8.0",
"psr/container": "^1.0 || ^2.0",
"psr/http-factory": "^1.0",
- "psr/http-message": "^1.0",
+ "psr/http-message": "^1.1 || ^2.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
- "psr/log": "^1.1"
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
},
"require-dev": {
- "adriansuter/php-autoload-override": "^1.2",
+ "adriansuter/php-autoload-override": "^1.4",
"ext-simplexml": "*",
- "guzzlehttp/psr7": "^1.8",
- "http-interop/http-factory-guzzle": "^1.0",
- "laminas/laminas-diactoros": "^2.4",
- "nyholm/psr7": "^1.4",
- "nyholm/psr7-server": "^1.0.1",
- "phpspec/prophecy": "^1.13",
- "phpstan/phpstan": "^0.12.85",
- "phpunit/phpunit": "^8.5.13 || ^9.3.8",
- "slim/http": "^1.2",
- "slim/psr7": "^1.3",
- "squizlabs/php_codesniffer": "^3.6",
- "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
+ "guzzlehttp/psr7": "^2.6",
+ "httpsoft/http-message": "^1.1",
+ "httpsoft/http-server-request": "^1.1",
+ "laminas/laminas-diactoros": "^2.17 || ^3",
+ "nyholm/psr7": "^1.8",
+ "nyholm/psr7-server": "^1.1",
+ "phpspec/prophecy": "^1.19",
+ "phpspec/prophecy-phpunit": "^2.1",
+ "phpstan/phpstan": "^1.10",
+ "phpunit/phpunit": "^9.6",
+ "slim/http": "^1.3",
+ "slim/psr7": "^1.6",
+ "squizlabs/php_codesniffer": "^3.9"
},
"suggest": {
"ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
@@ -3714,7 +3716,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-29T19:41:06+00:00"
+ "time": "2024-03-03T21:25:30+00:00"
},
{
"name": "spomky-labs/otphp",
--
GitLab