From 12f5e3494b3c2db84df01e0d6bfa4ba25ab8f2a2 Mon Sep 17 00:00:00 2001
From: Anja Leichsenring <aleichsenring@ab-softlab.de>
Date: Tue, 19 Jul 2022 11:02:39 +0200
Subject: [PATCH] [TASK] Raise phpunit/phpunit and webmozart/assert
These raises fix the bulk of PHP 8.2 unit test
fails.
We need to make webmozart/assert:^1.11.0 explicit
to pin it as minimum version for PHP 8.2
composer update --prefer-lowest in nightlies.
We don't strictly need the phpunit raise, but
pick it as casual dev update along the way.
$ composer require --dev phpunit/phpunit:^9.5.21
$ composer require --dev webmozart/assert:^1.11.0
Resolves: #97967
Releases: master, 11.5
Change-Id: I5c79a8577c5eb836566cb5c00bb6b63aa1b7ea1f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75241
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 5 +++--
composer.lock | 31 +++++++++++++++----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/composer.json b/composer.json
index 8c81b0b6c74f..8c40829f903d 100644
--- a/composer.json
+++ b/composer.json
@@ -113,9 +113,10 @@
"phpspec/prophecy-phpunit": "^2.0.1",
"phpstan/phpstan": "^1.8.1",
"phpstan/phpstan-phpunit": "^1.1.1",
- "phpunit/phpunit": "^9.5.20",
+ "phpunit/phpunit": "^9.5.21",
"typo3/cms-styleguide": "~12.0@dev",
- "typo3/testing-framework": "dev-main"
+ "typo3/testing-framework": "dev-main",
+ "webmozart/assert": "^1.11.0"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
diff --git a/composer.lock b/composer.lock
index 5a135dae320f..d6ae44377899 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": "ddafa1becc62ce306b9e8f6512c563ac",
+ "content-hash": "a6e3555cc9e7074453d4776d5cb6190e",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -4327,21 +4327,21 @@
},
{
"name": "webmozart/assert",
- "version": "1.10.0",
+ "version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
- "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+ "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
- "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
+ "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0",
- "symfony/polyfill-ctype": "^1.8"
+ "ext-ctype": "*",
+ "php": "^7.2 || ^8.0"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
@@ -4379,9 +4379,9 @@
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
- "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+ "source": "https://github.com/webmozarts/assert/tree/1.11.0"
},
- "time": "2021-03-09T10:59:23+00:00"
+ "time": "2022-06-03T18:03:27+00:00"
}
],
"packages-dev": [
@@ -6790,16 +6790,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.20",
+ "version": "9.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+ "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
- "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
+ "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
"shasum": ""
},
"require": {
@@ -6833,7 +6833,6 @@
"sebastian/version": "^3.0.2"
},
"require-dev": {
- "ext-pdo": "*",
"phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
@@ -6877,7 +6876,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
},
"funding": [
{
@@ -6889,7 +6888,7 @@
"type": "github"
}
],
- "time": "2022-04-01T12:37:26+00:00"
+ "time": "2022-06-19T12:14:25+00:00"
},
{
"name": "react/promise",
--
GitLab