diff --git a/composer.json b/composer.json index 889a39124b5584a3d250735f8f5a88324f72dc24..ff3c97c8f85ef4b3d914ac7bbc6f9993b22ec0bc 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,12 @@ { "name": "typo3/cms", "description": "TYPO3 CMS is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.", - "keywords": ["typo3", "cms", "content management system", "extbase"], + "keywords": [ + "typo3", + "cms", + "content management system", + "extbase" + ], "homepage": "https://typo3.org/", "type": "typo3-cms-core", "license": "GPL-2.0-or-later", @@ -307,7 +312,7 @@ "TYPO3Tests\\TestEid\\": "typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_eid/Classes/", "TYPO3Tests\\FluidTest\\": "typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/Classes/", "TYPO3Tests\\TestTranslate\\": "typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/test_translate/Classes/", - "TYPO3Tests\\FormCachingTests\\" : "typo3/sysext/form/Tests/Functional/RequestHandling/Fixtures/Extensions/form_caching_tests/Classes/", + "TYPO3Tests\\FormCachingTests\\": "typo3/sysext/form/Tests/Functional/RequestHandling/Fixtures/Extensions/form_caching_tests/Classes/", "TYPO3Tests\\RequestMirror\\": "typo3/sysext/frontend/Tests/Functional/Fixtures/Extensions/test_request_mirror/Classes/", "TYPO3Tests\\TestValidators\\": "typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/test_validators/Classes/", "TYPO3Tests\\TestDatahandler\\": "typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/Classes/", @@ -325,5 +330,8 @@ "TYPO3Tests\\ViewhelperLibrary\\": "typo3/sysext/fluid/Tests/Functional/Fixtures/Libraries/viewhelper_library/src/", "TYPO3\\CMS\\PHPStan\\": "Build/phpstan/src/" } + }, + "conflict": { + "phpunit/phpunit": "11.2.0" } } diff --git a/composer.lock b/composer.lock index 6b2ebeb5636f12a3dca4d90a9dc1368a9419fc3b..c2673f056cf53443fe0d363c5fc3f8fec0c00800 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": "532f2e7db4abb02dae0c56f623683c91", + "content-hash": "82c43b81d9f17d2a286049ff4217372c", "packages": [ { "name": "bacon/bacon-qr-code",