From 7cd09a3b525417dd6b32aecd8d8c8824ed3a60ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Wed, 8 Feb 2023 17:26:08 +0100 Subject: [PATCH] Upgrade to TYPO3 v12.2 (#746) --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/predefined.yml | 8 ++++---- .gitlab/pipeline/jobs/func-php8.1-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml | 2 +- .gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml | 2 +- .../Domain/Repository/Product/TeaRepositoryTest.php | 7 ------- composer.json | 10 +++++----- 8 files changed, 17 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce2b0b7..8f719be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,10 +162,10 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: highest functional-tests: @@ -244,9 +244,9 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: highest diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 390d178..a54f55a 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -211,10 +211,10 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: highest functional-tests: @@ -291,9 +291,9 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.1" + - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: highest diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml index 04e14c8..aa73f13 100644 --- a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml +++ b/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml @@ -8,6 +8,6 @@ func-php8.1-v11-highest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.2" - composer update --no-ansi --no-interaction --no-progress --with-dependencies - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml index 7dbb984..6c4d864 100644 --- a/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml +++ b/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml @@ -8,6 +8,6 @@ func-php8.1-v11-lowest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.2" - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml index bfd9f6a..6e76b45 100644 --- a/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml +++ b/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml @@ -6,5 +6,5 @@ unit-php8.1-v12-highest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-progress typo3/cms-core:"^12.1" + - composer require --no-progress typo3/cms-core:"^12.2" - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml index 8a9d266..e5bc222 100644 --- a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml +++ b/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml @@ -6,6 +6,6 @@ unit-php8.1-v12-lowest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.2" - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest - composer ci:tests:unit diff --git a/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php index 47b4582..49fd285 100644 --- a/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php +++ b/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php @@ -6,8 +6,6 @@ namespace TTN\Tea\Tests\Functional\Domain\Repository\Product; use TTN\Tea\Domain\Model\Product\Tea; use TTN\Tea\Domain\Repository\Product\TeaRepository; -use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder; -use TYPO3\CMS\Core\Http\ServerRequest; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Domain\Model\FileReference; use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager; @@ -29,11 +27,6 @@ class TeaRepositoryTest extends FunctionalTestCase { parent::setUp(); - // This is needed to make the functional tests work with TYPO3 12.1. We might be able to remove this in the - // once we've updated to TYPO3 12.1.3 or 12.2. - $request = (new ServerRequest())->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_CLI); - $GLOBALS['TYPO3_REQUEST'] = $request; - $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class); $this->subject = $this->getContainer()->get(TeaRepository::class); diff --git a/composer.json b/composer.json index 6e752e0..e2d01ba 100644 --- a/composer.json +++ b/composer.json @@ -29,10 +29,10 @@ "require": { "php": "~7.4.0 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0.1", - "typo3/cms-core": "^11.5.4 || ^12.1", - "typo3/cms-extbase": "^11.5.4 || ^12.1", - "typo3/cms-fluid": "^11.5.4 || ^12.1", - "typo3/cms-frontend": "^11.5.4 || ^12.1" + "typo3/cms-core": "^11.5.4 || ^12.2", + "typo3/cms-extbase": "^11.5.4 || ^12.2", + "typo3/cms-fluid": "^11.5.4 || ^12.2", + "typo3/cms-frontend": "^11.5.4 || ^12.2" }, "require-dev": { "doctrine/dbal": "^2.13.8 || ^3.3.7", @@ -50,7 +50,7 @@ "seld/jsonlint": "^1.9.0", "squizlabs/php_codesniffer": "^3.7.1", "symfony/yaml": "^5.4 || ^6.1", - "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.1", + "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.2", "typo3/coding-standards": "^0.6.1", "typo3/testing-framework": "^7.0@dev" },