From 738d5261825f635e2be3c62f7e177c4d1526a168 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Mon, 22 Feb 2021 16:24:25 +0100
Subject: [PATCH] [BUGFIX] Add PHP8 compatibility to phpdocumentor packages
TYPO3 already ships with latest versions for our
phpdocumentor dependencies, but in order to run
our test suite, the dependency suite is bumped
to use the latest versions that are compatible
with PHP 7.2 - PHP 8.0.
Used composer commands:
- composer require "phpdocumentor/reflection-docblock:^5.2" \
"phpdocumentor/type-resolver:^1.3" -W
- composer require "phpdocumentor/reflection-docblock:^5.2" \
"phpdocumentor/type-resolver:^1.3" \
--no-update -d typo3/sysext/extbase
Resolves: #93563
Releases: master, 10.4
Change-Id: Id321ad8d7659dab21b176793e7bde571716d8313
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/68032
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
---
composer.json | 4 ++--
composer.lock | 16 ++++++++--------
typo3/sysext/extbase/composer.json | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/composer.json b/composer.json
index 2e8cec9d3205..207f5b406e39 100644
--- a/composer.json
+++ b/composer.json
@@ -48,8 +48,8 @@
"egulias/email-validator": "^2.1",
"guzzlehttp/guzzle": "^7.2",
"nikic/php-parser": "^4.10.4",
- "phpdocumentor/reflection-docblock": "^5.1.0",
- "phpdocumentor/type-resolver": "^1.1.0",
+ "phpdocumentor/reflection-docblock": "^5.2",
+ "phpdocumentor/type-resolver": "^1.3",
"psr/container": "^1.0",
"psr/event-dispatcher": "^1.0",
"psr/http-client": "^1.0",
diff --git a/composer.lock b/composer.lock
index 22157f65aa37..c58a63054eb5 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": "ecf8365aa1212f8dec9609b56adab0f2",
+ "content-hash": "760840934fabac04b504b0d0d9e6336f",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -2928,16 +2928,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.20.0",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
+ "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
- "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
+ "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
"shasum": ""
},
"require": {
@@ -2949,7 +2949,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -2987,7 +2987,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
},
"funding": [
{
@@ -3003,7 +3003,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-23T14:02:19+00:00"
+ "time": "2021-01-07T16:49:33+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json
index f107bfb217ab..f1aa43dcc04a 100644
--- a/typo3/sysext/extbase/composer.json
+++ b/typo3/sysext/extbase/composer.json
@@ -19,8 +19,8 @@
"sort-packages": true
},
"require": {
- "phpdocumentor/reflection-docblock": "^5.1.0",
- "phpdocumentor/type-resolver": "^1.1.0",
+ "phpdocumentor/reflection-docblock": "^5.2",
+ "phpdocumentor/type-resolver": "^1.3",
"symfony/dependency-injection": "^5.2",
"symfony/property-access": "^5.2",
"symfony/property-info": "^5.2",
--
GitLab