From 391acb55874a90ca0cebab91e1d45f1f6864bb9f Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Thu, 20 Apr 2023 18:07:38 +0200
Subject: [PATCH] [TASK] Raise various dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Last round of dependency bumps raise min
versions. There is little reason to allow
lower verisons for those not-too-common
ones with first LTS realease, so
we declare them as minimum.
We skip enshrined/svg-sanitize due to
it's broken sec release, though.
firebase/php-jwt: new features, no reasons to stay low
guzzlehttp/guzzle: improved version constraints
nikic/php-parser: PHP fixes, no reason to stay low
phpdocumentor/type-resolver: minor raise, internal rewrite, have
it to find issues early
typo3fluid/fluid: minor bump, no reason to stay low
> composer req firebase/php-jwt:^6.4.0
> composer req --no-update firebase/php-jwt:^6.4.0 -d typo3/sysext/core
> composer req guzzlehttp/guzzle:^7.5.1
> composer req --no-update guzzlehttp/guzzle:^7.5.1 -d typo3/sysext/core
> composer req nikic/php-parser:^4.15.4
> composer req --no-update nikic/php-parser:^4.15.4 -d typo3/sysext/install
> composer req phpdocumentor/type-resolver:^1.7.1
> composer req --no-update phpdocumentor/type-resolver:^1.7.1 -d typo3/sysext/extbase
> composer req typo3fluid/fluid:^2.7.4
> composer req --no-update typo3fluid/fluid:^2.7.4 -d typo3/sysext/adminpanel
> composer req --no-update typo3fluid/fluid:^2.7.4 -d typo3/sysext/core
> composer req --no-update typo3fluid/fluid:^2.7.4 -d typo3/sysext/fluid
> composer req --no-update typo3fluid/fluid:^2.7.4 -d typo3/sysext/redirects
Resolves: #100693
Releases: main
Change-Id: I0f0312ca2e820c442fa3bb81b43f36e233c00be3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78777
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
---
composer.json | 10 +--
composer.lock | 122 +++++++++++++++++++-------
typo3/sysext/adminpanel/composer.json | 2 +-
typo3/sysext/core/composer.json | 6 +-
typo3/sysext/extbase/composer.json | 2 +-
typo3/sysext/fluid/composer.json | 2 +-
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
8 files changed, 101 insertions(+), 47 deletions(-)
diff --git a/composer.json b/composer.json
index 88dd7dec0dad..99d59cb2c614 100644
--- a/composer.json
+++ b/composer.json
@@ -57,15 +57,15 @@
"doctrine/lexer": "^2.0 || ^3.0",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.15.4",
- "firebase/php-jwt": "^6.3.1",
- "guzzlehttp/guzzle": "^7.5.0",
+ "firebase/php-jwt": "^6.4.0",
+ "guzzlehttp/guzzle": "^7.5.1",
"guzzlehttp/promises": "^1.5.2",
"guzzlehttp/psr7": "^2.5.0",
"lolli42/finediff": "^1.0.2",
"masterminds/html5": "^2.7.6",
- "nikic/php-parser": "^4.15.1",
+ "nikic/php-parser": "^4.15.4",
"phpdocumentor/reflection-docblock": "^5.2",
- "phpdocumentor/type-resolver": "^1.4",
+ "phpdocumentor/type-resolver": "^1.7.1",
"psr/container": "^2.0",
"psr/event-dispatcher": "^1.0",
"psr/http-client": "^1.0",
@@ -99,7 +99,7 @@
"typo3/cms-cli": "^3.1",
"typo3/cms-composer-installers": "^5.0",
"typo3/html-sanitizer": "^2.1.1",
- "typo3fluid/fluid": "^2.7.3"
+ "typo3fluid/fluid": "^2.7.4"
},
"require-dev": {
"bnf/phpstan-psr-container": "^1.0.1",
diff --git a/composer.lock b/composer.lock
index a8614b451ca5..139f09ce3f04 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": "98357dcbd4dc9d8591c59ae4e4ceee97",
+ "content-hash": "d26ebfcbfbabdd3a05a74e6c96f727a4",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -845,16 +845,16 @@
},
{
"name": "firebase/php-jwt",
- "version": "v6.3.2",
+ "version": "v6.4.0",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
- "reference": "ea7dda77098b96e666c5ef382452f94841e439cd"
+ "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/firebase/php-jwt/zipball/ea7dda77098b96e666c5ef382452f94841e439cd",
- "reference": "ea7dda77098b96e666c5ef382452f94841e439cd",
+ "url": "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
+ "reference": "4dd1e007f22a927ac77da5a3fbb067b42d3bc224",
"shasum": ""
},
"require": {
@@ -869,6 +869,7 @@
"psr/http-factory": "^1.0"
},
"suggest": {
+ "ext-sodium": "Support EdDSA (Ed25519) signatures",
"paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
},
"type": "library",
@@ -901,28 +902,28 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
- "source": "https://github.com/firebase/php-jwt/tree/v6.3.2"
+ "source": "https://github.com/firebase/php-jwt/tree/v6.4.0"
},
- "time": "2022-12-19T17:10:46+00:00"
+ "time": "2023-02-09T21:01:23+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.5.0",
+ "version": "7.5.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
+ "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
- "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b964ca597e86b752cd994f27293e9fa6b6a95ed9",
+ "reference": "b964ca597e86b752cd994f27293e9fa6b6a95ed9",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
- "guzzlehttp/psr7": "^1.9 || ^2.4",
+ "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1015,7 +1016,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+ "source": "https://github.com/guzzle/guzzle/tree/7.5.1"
},
"funding": [
{
@@ -1031,7 +1032,7 @@
"type": "tidelift"
}
],
- "time": "2022-08-28T15:39:27+00:00"
+ "time": "2023-04-17T16:30:08+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1369,16 +1370,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.15.1",
+ "version": "v4.15.4",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+ "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
- "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+ "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"shasum": ""
},
"require": {
@@ -1419,9 +1420,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
},
- "time": "2022-09-04T07:30:47+00:00"
+ "time": "2023-03-05T19:49:14+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -1535,25 +1536,33 @@
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.6.1",
+ "version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "77a32518733312af16a44300404e945338981de3"
+ "reference": "dfc078e8af9c99210337325ff5aa152872c98714"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
- "reference": "77a32518733312af16a44300404e945338981de3",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714",
+ "reference": "dfc078e8af9c99210337325ff5aa152872c98714",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0",
- "phpdocumentor/reflection-common": "^2.0"
+ "doctrine/deprecations": "^1.0",
+ "php": "^7.4 || ^8.0",
+ "phpdocumentor/reflection-common": "^2.0",
+ "phpstan/phpdoc-parser": "^1.13"
},
"require-dev": {
"ext-tokenizer": "*",
- "psalm/phar": "^4.8"
+ "phpbench/phpbench": "^1.2",
+ "phpstan/extension-installer": "^1.1",
+ "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan-phpunit": "^1.1",
+ "phpunit/phpunit": "^9.5",
+ "rector/rector": "^0.13.9",
+ "vimeo/psalm": "^4.25"
},
"type": "library",
"extra": {
@@ -1579,9 +1588,54 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1"
+ },
+ "time": "2023-03-27T19:02:04+00:00"
+ },
+ {
+ "name": "phpstan/phpdoc-parser",
+ "version": "1.20.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpstan/phpdoc-parser.git",
+ "reference": "10553ab3f0337ff1a71433c3417d7eb2a3eec1fd"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/10553ab3f0337ff1a71433c3417d7eb2a3eec1fd",
+ "reference": "10553ab3f0337ff1a71433c3417d7eb2a3eec1fd",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "require-dev": {
+ "php-parallel-lint/php-parallel-lint": "^1.2",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^1.5",
+ "phpstan/phpstan-phpunit": "^1.1",
+ "phpstan/phpstan-strict-rules": "^1.0",
+ "phpunit/phpunit": "^9.5",
+ "symfony/process": "^5.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "PHPStan\\PhpDocParser\\": [
+ "src/"
+ ]
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "PHPDoc parser with support for nullable, intersection and generic types",
+ "support": {
+ "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.0"
},
- "time": "2022-03-15T21:29:03+00:00"
+ "time": "2023-04-20T11:18:07+00:00"
},
{
"name": "psr/cache",
@@ -4697,16 +4751,16 @@
},
{
"name": "typo3fluid/fluid",
- "version": "2.7.3",
+ "version": "2.7.4",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/Fluid.git",
- "reference": "449e5c7105a47f81f3fe5cf28bdaa69039fae0b5"
+ "reference": "24f4494083c8d304680e4c9c38667dff33720dd4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/449e5c7105a47f81f3fe5cf28bdaa69039fae0b5",
- "reference": "449e5c7105a47f81f3fe5cf28bdaa69039fae0b5",
+ "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/24f4494083c8d304680e4c9c38667dff33720dd4",
+ "reference": "24f4494083c8d304680e4c9c38667dff33720dd4",
"shasum": ""
},
"require": {
@@ -4743,7 +4797,7 @@
"issues": "https://github.com/TYPO3/Fluid/issues",
"source": "https://github.com/TYPO3/Fluid"
},
- "time": "2023-03-21T18:56:07+00:00"
+ "time": "2023-03-23T12:04:09+00:00"
},
{
"name": "webmozart/assert",
diff --git a/typo3/sysext/adminpanel/composer.json b/typo3/sysext/adminpanel/composer.json
index c8b8cf62a29b..1c9faea5deda 100644
--- a/typo3/sysext/adminpanel/composer.json
+++ b/typo3/sysext/adminpanel/composer.json
@@ -27,7 +27,7 @@
"typo3/cms-core": "12.4.*@dev",
"typo3/cms-fluid": "12.4.*@dev",
"typo3/cms-frontend": "12.4.*@dev",
- "typo3fluid/fluid": "^2.7.3"
+ "typo3fluid/fluid": "^2.7.4"
},
"conflict": {
"typo3/cms": "*"
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index ceb4d6a34f34..b95b0608a7d4 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -39,8 +39,8 @@
"doctrine/lexer": "^2.0 || ^3.0",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.15.4",
- "firebase/php-jwt": "^6.3.1",
- "guzzlehttp/guzzle": "^7.5.0",
+ "firebase/php-jwt": "^6.4.0",
+ "guzzlehttp/guzzle": "^7.5.1",
"guzzlehttp/psr7": "^2.5.0",
"lolli42/finediff": "^1.0.2",
"masterminds/html5": "^2.7.6",
@@ -74,7 +74,7 @@
"typo3/cms-cli": "^3.1",
"typo3/cms-composer-installers": "^5.0",
"typo3/html-sanitizer": "^2.1.1",
- "typo3fluid/fluid": "^2.7.3"
+ "typo3fluid/fluid": "^2.7.4"
},
"suggest": {
"ext-apcu": "Needed when non-default APCU based cache backends are used",
diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json
index f357fe6f7ceb..9bc0369bbc6c 100644
--- a/typo3/sysext/extbase/composer.json
+++ b/typo3/sysext/extbase/composer.json
@@ -21,7 +21,7 @@
"require": {
"doctrine/instantiator": "^2.0",
"phpdocumentor/reflection-docblock": "^5.2",
- "phpdocumentor/type-resolver": "^1.4",
+ "phpdocumentor/type-resolver": "^1.7.1",
"symfony/dependency-injection": "^6.2",
"symfony/property-access": "^6.2",
"symfony/property-info": "^6.2",
diff --git a/typo3/sysext/fluid/composer.json b/typo3/sysext/fluid/composer.json
index c52debb8b2c2..bf911dab95ac 100644
--- a/typo3/sysext/fluid/composer.json
+++ b/typo3/sysext/fluid/composer.json
@@ -22,7 +22,7 @@
"symfony/dependency-injection": "^6.2",
"typo3/cms-core": "12.4.*@dev",
"typo3/cms-extbase": "12.4.*@dev",
- "typo3fluid/fluid": "^2.7.3"
+ "typo3fluid/fluid": "^2.7.4"
},
"conflict": {
"typo3/cms": "*"
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index 95873569cd30..85289928bf6b 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -21,7 +21,7 @@
"require": {
"doctrine/dbal": "^3.6.2",
"guzzlehttp/promises": "^1.5.2",
- "nikic/php-parser": "^4.15.1",
+ "nikic/php-parser": "^4.15.4",
"symfony/finder": "^6.2",
"symfony/http-foundation": "^6.2",
"typo3/cms-core": "12.4.*@dev",
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index d7b22dea2ad0..926157192575 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -25,7 +25,7 @@
"symfony/console": "^6.2",
"typo3/cms-backend": "12.4.*@dev",
"typo3/cms-core": "12.4.*@dev",
- "typo3fluid/fluid": "^2.7.3"
+ "typo3fluid/fluid": "^2.7.4"
},
"conflict": {
"typo3/cms": "*"
--
GitLab