From a281a7355fbd75d60f10c5e4c214b3230af24bea Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 25 Apr 2023 10:01:54 +0200 Subject: [PATCH] [TASK] Bump the TYPO3 12 dependency from ^12.3 to ^12.4 (#822) TYPO3 12.4 AKA 12LTS has been released. --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/predefined.yml | 16 ++++++++-------- .../pipeline/jobs/func-php8.1-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml | 2 +- .../pipeline/jobs/func-php8.2-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml | 2 +- .../pipeline/jobs/unit-php8.1-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml | 2 +- .../pipeline/jobs/unit-php8.2-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml | 2 +- composer.json | 10 +++++----- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd2470a..281f81f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,16 +169,16 @@ jobs: - typo3-version: "^11.5" php-version: "8.2" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: highest functional-tests: @@ -263,15 +263,15 @@ jobs: - typo3-version: "^11.5" php-version: "8.2" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: highest diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 688e6c5..7d2af9b 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -209,16 +209,16 @@ jobs: - typo3-version: "^11.5" php-version: "8.2" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: highest functional-tests: @@ -301,15 +301,15 @@ jobs: - typo3-version: "^11.5" php-version: "8.2" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" composer-dependencies: lowest - - typo3-version: "^12.3" + - typo3-version: "^12.4" php-version: "8.2" 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 31ac9b4..aba5428 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.3" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.4" - 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 ad00f09..d4bd31f 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.3" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.4" - 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/func-php8.2-v12-highest.yml b/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml index c72cc51..6398eed 100644 --- a/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml +++ b/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml @@ -8,6 +8,6 @@ func-php8.2-v11-highest: - build-composer-dependencies - php-lint-php8.2 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.3" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.4" - 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.2-v12-lowest.yml b/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml index 9c9acb1..b7be0e4 100644 --- a/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml +++ b/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml @@ -8,6 +8,6 @@ func-php8.2-v11-lowest: - build-composer-dependencies - php-lint-php8.2 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.3" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.4" - 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 505e64d..a78c302 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.3" + - composer require --no-progress typo3/cms-core:"^12.4" - 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 4c02399..72a948f 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.3" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.4" - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml b/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml index c658017..3cb2777 100644 --- a/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml +++ b/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml @@ -6,5 +6,5 @@ unit-php8.2-v12-highest: - build-composer-dependencies - php-lint-php8.2 script: - - composer require --no-progress typo3/cms-core:"^12.3" + - composer require --no-progress typo3/cms-core:"^12.4" - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml index f30eb5d..c36b636 100644 --- a/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml +++ b/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml @@ -6,6 +6,6 @@ unit-php8.2-v12-lowest: - build-composer-dependencies - php-lint-php8.2 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.3" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.4" - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest - composer ci:tests:unit diff --git a/composer.json b/composer.json index 68fbace..ef109b2 100644 --- a/composer.json +++ b/composer.json @@ -29,10 +29,10 @@ "require": { "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0", "psr/http-message": "^1.0.1", - "typo3/cms-core": "^11.5.4 || ^12.3", - "typo3/cms-extbase": "^11.5.4 || ^12.3", - "typo3/cms-fluid": "^11.5.4 || ^12.3", - "typo3/cms-frontend": "^11.5.4 || ^12.3" + "typo3/cms-core": "^11.5.4 || ^12.4", + "typo3/cms-extbase": "^11.5.4 || ^12.4", + "typo3/cms-fluid": "^11.5.4 || ^12.4", + "typo3/cms-frontend": "^11.5.4 || ^12.4" }, "require-dev": { "doctrine/dbal": "^2.13.8 || ^3.3.7", @@ -50,7 +50,7 @@ "seld/jsonlint": "^1.9.0", "squizlabs/php_codesniffer": "^3.7.2", "symfony/yaml": "^5.4 || ^6.1", - "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.3", + "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.4", "typo3/coding-standards": "^0.6.1", "typo3/testing-framework": "^7.0@dev" },