From 672194fba8ce895c0009511b2fcd1091cd23011b Mon Sep 17 00:00:00 2001 From: Lina Wolf <48202465+linawolf@users.noreply.github.com> Date: Tue, 27 Sep 2022 16:48:54 +0200 Subject: [PATCH] [TASK] Drop TYPO3 10LTS support (#594) Fixes #589 Co-authored-by: lina.wolf --- .github/workflows/ci.yml | 12 ------------ .github/workflows/predefined.yml | 12 ------------ .gitlab/pipeline/.gitlab-ci.yml | 2 -- .gitlab/pipeline/jobs/func-php7.4-v10.yml | 12 ------------ .gitlab/pipeline/jobs/unit-php7.4-v10.yml | 10 ---------- CHANGELOG.md | 1 + README.md | 1 - composer.json | 10 +++++----- ext_emconf.php | 8 ++++---- 9 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 .gitlab/pipeline/jobs/func-php7.4-v10.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php7.4-v10.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 464eeea..69389b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,12 +142,6 @@ jobs: fail-fast: false matrix: include: - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: highest - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: lowest - typo3-version: "^11.5" php-version: "7.4" composer-dependencies: highest @@ -224,12 +218,6 @@ jobs: fail-fast: false matrix: include: - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: highest - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: lowest - typo3-version: "^11.5" php-version: "7.4" composer-dependencies: highest diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 6185eeb..c06f50d 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -191,12 +191,6 @@ jobs: fail-fast: false matrix: include: - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: highest - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: lowest - typo3-version: "^11.5" php-version: "7.4" composer-dependencies: highest @@ -271,12 +265,6 @@ jobs: fail-fast: false matrix: include: - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: highest - - typo3-version: "^10.4" - php-version: "7.4" - composer-dependencies: lowest - typo3-version: "^11.5" php-version: "7.4" composer-dependencies: highest diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml index 6739733..cec919f 100644 --- a/.gitlab/pipeline/.gitlab-ci.yml +++ b/.gitlab/pipeline/.gitlab-ci.yml @@ -12,7 +12,6 @@ include: - '/.gitlab/pipeline/jobs/.variables.yml' - '/.gitlab/pipeline/jobs/build-composer-dependencies.yml' - '/.gitlab/pipeline/jobs/composer-normalize.yml' - - '/.gitlab/pipeline/jobs/func-php7.4-v10.yml' - '/.gitlab/pipeline/jobs/javascript-lint.yml' - '/.gitlab/pipeline/jobs/json-lint.yml' - '/.gitlab/pipeline/jobs/php-copypaste-check.yml' @@ -21,7 +20,6 @@ include: - '/.gitlab/pipeline/jobs/php-lint-php8.1.yml' - '/.gitlab/pipeline/jobs/phpcs.yml' - '/.gitlab/pipeline/jobs/ts-lint.yml' - - '/.gitlab/pipeline/jobs/unit-php7.4-v10.yml' - '/.gitlab/pipeline/jobs/xliff-lint.yml' - '/.gitlab/pipeline/jobs/yaml-lint.yml' - template: Security/License-Scanning.gitlab-ci.yml diff --git a/.gitlab/pipeline/jobs/func-php7.4-v10.yml b/.gitlab/pipeline/jobs/func-php7.4-v10.yml deleted file mode 100644 index 61ee8cd..0000000 --- a/.gitlab/pipeline/jobs/func-php7.4-v10.yml +++ /dev/null @@ -1,12 +0,0 @@ -func-php7.4-v10: - extends: .default - image: php:7.4 - services: - - mariadb:10 - stage: test - needs: - - build-composer-dependencies - - php-lint-php7.4 - script: - - composer require --no-progress typo3/cms-core:"^10.4" - - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/unit-php7.4-v10.yml b/.gitlab/pipeline/jobs/unit-php7.4-v10.yml deleted file mode 100644 index c8a56eb..0000000 --- a/.gitlab/pipeline/jobs/unit-php7.4-v10.yml +++ /dev/null @@ -1,10 +0,0 @@ -unit-php7.4-v10: - extends: .default - image: php:7.4 - stage: test - needs: - - build-composer-dependencies - - php-lint-php7.4 - script: - - composer require --no-progress typo3/cms-core:"^10.4" - - composer ci:tests:unit diff --git a/CHANGELOG.md b/CHANGELOG.md index 72ce3dd..c26fa11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Deprecated ### Removed +- Drop support for TYPO3 10LTS (#594) - Drop support for PHP 7.2 and 7.3 (#581) ### Fixed diff --git a/README.md b/README.md index 2f22981..410ec0c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Example TYPO3 extension for code quality checks and automated tests -[![TYPO3 V10](https://img.shields.io/badge/TYPO3-10-orange.svg)](https://get.typo3.org/version/10) [![TYPO3 V11](https://img.shields.io/badge/TYPO3-11-orange.svg)](https://get.typo3.org/version/11) [![License](https://poser.pugx.org/ttn/tea/license.svg)](https://packagist.org/packages/ttn/tea) [![Total downloads](https://poser.pugx.org/ttn/tea/downloads.svg)](https://packagist.org/packages/ttn/tea) diff --git a/composer.json b/composer.json index d1729fe..cfe61fd 100644 --- a/composer.json +++ b/composer.json @@ -28,10 +28,10 @@ }, "require": { "php": "~7.4.0 || ~8.0.0 || ~8.1.0", - "typo3/cms-core": "^10.4.11 || ^11.5.2", - "typo3/cms-extbase": "^10.4.11 || ^11.5.2", - "typo3/cms-fluid": "^10.4.11 || ^11.5.2", - "typo3/cms-frontend": "^10.4.11 || ^11.5.2" + "typo3/cms-core": "^11.5.2", + "typo3/cms-extbase": "^11.5.2", + "typo3/cms-fluid": "^11.5.2", + "typo3/cms-frontend": "^11.5.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": "^4.4.29 || ^5.3.6 || ^6.0", - "typo3/cms-fluid-styled-content": "^10.4.11 || ^11.5.2", + "typo3/cms-fluid-styled-content": "^11.5.2", "typo3/coding-standards": "^0.5.5", "typo3/testing-framework": "^6.16.6" }, diff --git a/ext_emconf.php b/ext_emconf.php index c86f7d2..ddf4966 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -8,10 +8,10 @@ $EM_CONF[$_EXTKEY] = [ 'constraints' => [ 'depends' => [ 'php' => '7.4.0-8.1.99', - 'typo3' => '10.4.11-11.5.99', - 'extbase' => '10.4.11-11.5.99', - 'fluid' => '10.4.11-11.5.99', - 'frontend' => '10.4.11-11.5.99', + 'typo3' => '11.5.2-11.5.99', + 'extbase' => '11.5.2-11.5.99', + 'fluid' => '11.5.2-11.5.99', + 'frontend' => '11.5.2-11.5.99', ], ], 'state' => 'stable',