From fd2091af6f48de2e97a3b4ad16fc7851d0721e61 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Wed, 22 Mar 2023 18:07:08 +0100
Subject: [PATCH] [TASK] Raise codeception to unlock phpunit:^10
> composer req --dev \
codeception/codeception:^5.0.10 \
codeception/lib-asserts:^2.1.0 \
codeception/module-cli:^2.0.1 -w
With this in place, it is possible to play
around locally with phpunit:^10 using
> composer req --dev phpunit/phpunit:^10 -w
Resolves: #100259
Related: #100249
Releases: main
Change-Id: I5d1185a8f7edaee752966d07f046c1d7c1c4604b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78216
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
---
composer.json | 6 +-
composer.lock | 165 ++++++++++++++++++++++++++------------------------
2 files changed, 88 insertions(+), 83 deletions(-)
diff --git a/composer.json b/composer.json
index 852b016a71e5..250a2ce46815 100644
--- a/composer.json
+++ b/composer.json
@@ -102,10 +102,10 @@
},
"require-dev": {
"bnf/phpstan-psr-container": "^1.0.1",
- "codeception/codeception": "^5.0.3",
- "codeception/lib-asserts": "^2.0.1",
+ "codeception/codeception": "^5.0.10",
+ "codeception/lib-asserts": "^2.1.0",
"codeception/module-asserts": "^3.0.0",
- "codeception/module-cli": "^2.0.0",
+ "codeception/module-cli": "^2.0.1",
"codeception/module-filesystem": "^3.0.0",
"codeception/module-webdriver": "^3.2.0",
"composer/composer": "^2.4.2",
diff --git a/composer.lock b/composer.lock
index 98742d12619a..e525df56dd4f 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": "d5dc51445b362059f794e975f3fbb883",
+ "content-hash": "ffa2bec04e4f097057a4b6b5847fc8b7",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -2550,16 +2550,16 @@
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.2.0",
+ "version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
+ "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
- "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+ "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
"shasum": ""
},
"require": {
@@ -2597,7 +2597,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
},
"funding": [
{
@@ -2613,7 +2613,7 @@
"type": "tidelift"
}
],
- "time": "2022-11-25T10:21:52+00:00"
+ "time": "2023-03-01T10:25:55+00:00"
},
{
"name": "symfony/doctrine-messenger",
@@ -2689,16 +2689,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v6.2.5",
+ "version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68"
+ "reference": "404b307de426c1c488e5afad64403e5f145e82a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
- "reference": "f02d108b5e9fd4a6245aa73a9d2df2ec060c3e68",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/404b307de426c1c488e5afad64403e5f145e82a5",
+ "reference": "404b307de426c1c488e5afad64403e5f145e82a5",
"shasum": ""
},
"require": {
@@ -2752,7 +2752,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.5"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.7"
},
"funding": [
{
@@ -2768,7 +2768,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -4858,33 +4858,33 @@
},
{
"name": "codeception/codeception",
- "version": "5.0.3",
+ "version": "5.0.10",
"source": {
"type": "git",
"url": "https://github.com/Codeception/Codeception.git",
- "reference": "b9a12f8bf233c265079c7c38b559ce3bc7dbef27"
+ "reference": "ed4af7fd4103cdd035916fbb8f35124edd2d018b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b9a12f8bf233c265079c7c38b559ce3bc7dbef27",
- "reference": "b9a12f8bf233c265079c7c38b559ce3bc7dbef27",
+ "url": "https://api.github.com/repos/Codeception/Codeception/zipball/ed4af7fd4103cdd035916fbb8f35124edd2d018b",
+ "reference": "ed4af7fd4103cdd035916fbb8f35124edd2d018b",
"shasum": ""
},
"require": {
"behat/gherkin": "^4.6.2",
- "codeception/lib-asserts": "2.0.*@dev",
- "codeception/stub": "^3.7 | ^4.0",
+ "codeception/lib-asserts": "^2.0",
+ "codeception/stub": "^4.1",
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"php": "^8.0",
- "phpunit/php-code-coverage": "^9.2",
- "phpunit/php-text-template": "^2.0",
- "phpunit/php-timer": "^5.0.3",
- "phpunit/phpunit": "^9.5",
+ "phpunit/php-code-coverage": "^9.2 || ^10.0",
+ "phpunit/php-text-template": "^2.0 || ^3.0",
+ "phpunit/php-timer": "^5.0.3 || ^6.0",
+ "phpunit/phpunit": "^9.5.20 || ^10.0",
"psy/psysh": "^0.11.2",
- "sebastian/comparator": "^4.0.5",
- "sebastian/diff": "^4.0.3",
+ "sebastian/comparator": "^4.0.5 || ^5.0",
+ "sebastian/diff": "^4.0.3 || ^5.0",
"symfony/console": ">=4.4.24 <7.0",
"symfony/css-selector": ">=4.4.24 <7.0",
"symfony/event-dispatcher": ">=4.4.24 <7.0",
@@ -4893,7 +4893,7 @@
"symfony/yaml": ">=4.4.24 <7.0"
},
"conflict": {
- "codeception/lib-innerbrowser": "<3.1",
+ "codeception/lib-innerbrowser": "<3.1.3",
"codeception/module-filesystem": "<3.0",
"codeception/module-phpbrowser": "<2.5"
},
@@ -4910,6 +4910,7 @@
"codeception/module-phpbrowser": "*@dev",
"codeception/util-universalframework": "*@dev",
"ext-simplexml": "*",
+ "jetbrains/phpstorm-attributes": "^1.0",
"symfony/dotenv": ">=4.4.24 <7.0",
"symfony/process": ">=4.4.24 <7.0",
"vlucas/phpdotenv": "^5.1"
@@ -4961,7 +4962,7 @@
],
"support": {
"issues": "https://github.com/Codeception/Codeception/issues",
- "source": "https://github.com/Codeception/Codeception/tree/5.0.3"
+ "source": "https://github.com/Codeception/Codeception/tree/5.0.10"
},
"funding": [
{
@@ -4969,20 +4970,20 @@
"type": "open_collective"
}
],
- "time": "2022-09-30T15:42:00+00:00"
+ "time": "2023-03-14T07:21:10+00:00"
},
{
"name": "codeception/lib-asserts",
- "version": "2.0.1",
+ "version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/Codeception/lib-asserts.git",
- "reference": "78c55044611437988b54e1daecf13f247a742bf8"
+ "reference": "b8c7dff552249e560879c682ba44a4b963af91bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/78c55044611437988b54e1daecf13f247a742bf8",
- "reference": "78c55044611437988b54e1daecf13f247a742bf8",
+ "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/b8c7dff552249e560879c682ba44a4b963af91bc",
+ "reference": "b8c7dff552249e560879c682ba44a4b963af91bc",
"shasum": ""
},
"require": {
@@ -5021,9 +5022,9 @@
],
"support": {
"issues": "https://github.com/Codeception/lib-asserts/issues",
- "source": "https://github.com/Codeception/lib-asserts/tree/2.0.1"
+ "source": "https://github.com/Codeception/lib-asserts/tree/2.1.0"
},
- "time": "2022-09-27T06:17:39+00:00"
+ "time": "2023-02-10T18:36:23+00:00"
},
{
"name": "codeception/lib-web",
@@ -5137,20 +5138,21 @@
},
{
"name": "codeception/module-cli",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/Codeception/module-cli.git",
- "reference": "aa9bdd8346983eebc3aa3f21e902399ceefec372"
+ "reference": "a3a101fae4049fa2f810107f7bd5db3b3266ce63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/module-cli/zipball/aa9bdd8346983eebc3aa3f21e902399ceefec372",
- "reference": "aa9bdd8346983eebc3aa3f21e902399ceefec372",
+ "url": "https://api.github.com/repos/Codeception/module-cli/zipball/a3a101fae4049fa2f810107f7bd5db3b3266ce63",
+ "reference": "a3a101fae4049fa2f810107f7bd5db3b3266ce63",
"shasum": ""
},
"require": {
"codeception/codeception": "*@dev",
+ "codeception/module-asserts": "*",
"php": "^7.4 || ^8.0"
},
"conflict": {
@@ -5178,9 +5180,9 @@
],
"support": {
"issues": "https://github.com/Codeception/module-cli/issues",
- "source": "https://github.com/Codeception/module-cli/tree/2.0.0"
+ "source": "https://github.com/Codeception/module-cli/tree/2.0.1"
},
- "time": "2021-12-01T01:21:55+00:00"
+ "time": "2023-01-13T18:41:03+00:00"
},
{
"name": "codeception/module-filesystem",
@@ -5296,22 +5298,25 @@
},
{
"name": "codeception/stub",
- "version": "4.0.2",
+ "version": "4.1.0",
"source": {
"type": "git",
"url": "https://github.com/Codeception/Stub.git",
- "reference": "18a148dacd293fc7b044042f5aa63a82b08bff5d"
+ "reference": "58751aed08a68ae960a952fd3fe74ee9a56cdb1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Codeception/Stub/zipball/18a148dacd293fc7b044042f5aa63a82b08bff5d",
- "reference": "18a148dacd293fc7b044042f5aa63a82b08bff5d",
+ "url": "https://api.github.com/repos/Codeception/Stub/zipball/58751aed08a68ae960a952fd3fe74ee9a56cdb1b",
+ "reference": "58751aed08a68ae960a952fd3fe74ee9a56cdb1b",
"shasum": ""
},
"require": {
"php": "^7.4 | ^8.0",
"phpunit/phpunit": "^8.4 | ^9.0 | ^10.0 | 10.0.x-dev"
},
+ "conflict": {
+ "codeception/codeception": "<5.0.6"
+ },
"require-dev": {
"consolidation/robo": "^3.0"
},
@@ -5328,9 +5333,9 @@
"description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
"support": {
"issues": "https://github.com/Codeception/Stub/issues",
- "source": "https://github.com/Codeception/Stub/tree/4.0.2"
+ "source": "https://github.com/Codeception/Stub/tree/4.1.0"
},
- "time": "2022-01-31T19:25:15+00:00"
+ "time": "2022-12-27T18:41:43+00:00"
},
{
"name": "composer/ca-bundle",
@@ -6660,23 +6665,23 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.17",
+ "version": "9.2.26",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
+ "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
- "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+ "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.14",
+ "nikic/php-parser": "^4.15",
"php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2",
@@ -6691,8 +6696,8 @@
"phpunit/phpunit": "^9.3"
},
"suggest": {
- "ext-pcov": "*",
- "ext-xdebug": "*"
+ "ext-pcov": "PHP extension that provides line coverage",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"type": "library",
"extra": {
@@ -6725,7 +6730,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
},
"funding": [
{
@@ -6733,7 +6738,7 @@
"type": "github"
}
],
- "time": "2022-08-30T12:24:04+00:00"
+ "time": "2023-03-06T12:58:08+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -7080,16 +7085,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.11.8",
+ "version": "v0.11.13",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "f455acf3645262ae389b10e9beba0c358aa6994e"
+ "reference": "722317c9f5627e588788e340f29b923e58f92f54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e",
- "reference": "f455acf3645262ae389b10e9beba0c358aa6994e",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/722317c9f5627e588788e340f29b923e58f92f54",
+ "reference": "722317c9f5627e588788e340f29b923e58f92f54",
"shasum": ""
},
"require": {
@@ -7150,9 +7155,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.11.8"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.11.13"
},
- "time": "2022-07-28T14:25:11+00:00"
+ "time": "2023-03-21T14:22:44+00:00"
},
{
"name": "react/promise",
@@ -7596,16 +7601,16 @@
},
{
"name": "sebastian/environment",
- "version": "5.1.4",
+ "version": "5.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+ "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
- "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+ "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
"shasum": ""
},
"require": {
@@ -7647,7 +7652,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
- "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+ "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
},
"funding": [
{
@@ -7655,7 +7660,7 @@
"type": "github"
}
],
- "time": "2022-04-03T09:37:03+00:00"
+ "time": "2023-02-03T06:03:51+00:00"
},
{
"name": "sebastian/exporter",
@@ -7969,16 +7974,16 @@
},
{
"name": "sebastian/recursion-context",
- "version": "4.0.4",
+ "version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+ "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
- "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+ "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
"shasum": ""
},
"require": {
@@ -8017,10 +8022,10 @@
}
],
"description": "Provides functionality to recursively process PHP variables",
- "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+ "homepage": "https://github.com/sebastianbergmann/recursion-context",
"support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
- "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
},
"funding": [
{
@@ -8028,7 +8033,7 @@
"type": "github"
}
],
- "time": "2020-10-26T13:17:30+00:00"
+ "time": "2023-02-03T06:07:39+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -8409,16 +8414,16 @@
},
{
"name": "symfony/css-selector",
- "version": "v6.2.5",
+ "version": "v6.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1"
+ "reference": "aedf3cb0f5b929ec255d96bbb4909e9932c769e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1",
- "reference": "bf1b9d4ad8b1cf0dbde8b08e0135a2f6259b9ba1",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/aedf3cb0f5b929ec255d96bbb4909e9932c769e0",
+ "reference": "aedf3cb0f5b929ec255d96bbb4909e9932c769e0",
"shasum": ""
},
"require": {
@@ -8454,7 +8459,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v6.2.5"
+ "source": "https://github.com/symfony/css-selector/tree/v6.2.7"
},
"funding": [
{
@@ -8470,7 +8475,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-01T08:38:09+00:00"
+ "time": "2023-02-14T08:44:56+00:00"
},
{
"name": "symfony/process",
--
GitLab