diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b2d4b2..30896b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" code-quality: name: "Code quality checks" runs-on: ubuntu-22.04 @@ -163,12 +164,24 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: highest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: lowest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: highest functional-tests: name: "Functional tests" runs-on: ubuntu-22.04 @@ -245,9 +258,21 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: highest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: lowest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: highest diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 34fbaa3..1041f54 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -32,6 +32,7 @@ jobs: - "7.4" - "8.0" - "8.1" + - "8.2" typoscript-lint: name: "TypoScript linter" runs-on: ubuntu-22.04 @@ -211,12 +212,24 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: highest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: lowest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: highest functional-tests: name: "Functional tests" runs-on: ubuntu-22.04 @@ -291,9 +304,21 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^11.5" + php-version: "8.2" + composer-dependencies: highest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: lowest - typo3-version: "^12.3" php-version: "8.1" composer-dependencies: highest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: lowest + - typo3-version: "^12.3" + php-version: "8.2" + composer-dependencies: highest diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml index 88ee670..48e9a37 100644 --- a/.gitlab/pipeline/.gitlab-ci.yml +++ b/.gitlab/pipeline/.gitlab-ci.yml @@ -19,14 +19,19 @@ include: - '/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml' - '/.gitlab/pipeline/jobs/func-php8.1-v11-highest.yml' - '/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml' + - '/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml' + - '/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml' - '/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml' - '/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml' + - '/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml' + - '/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml' - '/.gitlab/pipeline/jobs/javascript-lint.yml' - '/.gitlab/pipeline/jobs/json-lint.yml' - '/.gitlab/pipeline/jobs/php-copypaste-check.yml' - '/.gitlab/pipeline/jobs/php-lint-php7.4.yml' - '/.gitlab/pipeline/jobs/php-lint-php8.0.yml' - '/.gitlab/pipeline/jobs/php-lint-php8.1.yml' + - '/.gitlab/pipeline/jobs/php-lint-php8.2.yml' - '/.gitlab/pipeline/jobs/phpcs.yml' - '/.gitlab/pipeline/jobs/ts-lint.yml' - '/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml' @@ -35,8 +40,12 @@ include: - '/.gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml' - '/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml' - '/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml' - '/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml' - '/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.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-php8.2-v11-highest.yml b/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml new file mode 100644 index 0000000..27a6669 --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml @@ -0,0 +1,13 @@ +func-php8.2-v11-highest: + extends: .default + image: php:8.2 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - 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-v11-lowest.yml b/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml new file mode 100644 index 0000000..08ef59e --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml @@ -0,0 +1,13 @@ +func-php8.2-v11-lowest: + extends: .default + image: php:8.2 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - 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 new file mode 100644 index 0000000..c72cc51 --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml @@ -0,0 +1,13 @@ +func-php8.2-v11-highest: + extends: .default + image: php:8.2 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.3" + - 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 new file mode 100644 index 0000000..9c9acb1 --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml @@ -0,0 +1,13 @@ +func-php8.2-v11-lowest: + extends: .default + image: php:8.2 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.3" + - 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/php-lint-php8.2.yml b/.gitlab/pipeline/jobs/php-lint-php8.2.yml new file mode 100644 index 0000000..b6e10f1 --- /dev/null +++ b/.gitlab/pipeline/jobs/php-lint-php8.2.yml @@ -0,0 +1,7 @@ +php-lint-php8.2: + extends: .default + image: php:8.2 + stage: lint + needs: [ ] + script: + - composer ci:php:lint diff --git a/.gitlab/pipeline/jobs/phpcs.yml b/.gitlab/pipeline/jobs/phpcs.yml index 154f1a8..b174b1e 100644 --- a/.gitlab/pipeline/jobs/phpcs.yml +++ b/.gitlab/pipeline/jobs/phpcs.yml @@ -6,5 +6,6 @@ phpcs: - php-lint-php7.4 - php-lint-php8.0 - php-lint-php8.1 + - php-lint-php8.2 script: - composer ci:php:sniff diff --git a/.gitlab/pipeline/jobs/phpstan.yml b/.gitlab/pipeline/jobs/phpstan.yml index 4feddd5..a1cc61b 100644 --- a/.gitlab/pipeline/jobs/phpstan.yml +++ b/.gitlab/pipeline/jobs/phpstan.yml @@ -6,5 +6,6 @@ phpstan: - php-lint-php7.4 - php-lint-php8.0 - php-lint-php8.1 + - php-lint-php8.2 script: - composer ci:php:stan diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml b/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml new file mode 100644 index 0000000..ec03978 --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml @@ -0,0 +1,11 @@ +unit-php8.2-v11-highest: + extends: .default + image: php:8.2 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml new file mode 100644 index 0000000..58a1e4e --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml @@ -0,0 +1,11 @@ +unit-php8.2-v11-lowest: + extends: .default + image: php:8.2 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - 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 new file mode 100644 index 0000000..c658017 --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml @@ -0,0 +1,10 @@ +unit-php8.2-v12-highest: + extends: .default + image: php:8.2 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-progress typo3/cms-core:"^12.3" + - 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 new file mode 100644 index 0000000..f30eb5d --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml @@ -0,0 +1,11 @@ +unit-php8.2-v12-lowest: + extends: .default + image: php:8.2 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.2 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.3" + - 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 5e55197..d798c50 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "docs": "https://docs.typo3.org/p/ttn/tea/main/en-us/" }, "require": { - "php": "~7.4.0 || ~8.0.0 || ~8.1.0", + "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", diff --git a/ext_emconf.php b/ext_emconf.php index f026e98..b9ff94c 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -7,7 +7,7 @@ $EM_CONF[$_EXTKEY] = [ 'category' => 'example', 'constraints' => [ 'depends' => [ - 'php' => '7.4.0-8.1.99', + 'php' => '7.4.0-8.2.99', 'typo3' => '11.5.4-12.4.99', 'extbase' => '11.5.4-12.4.99', 'fluid' => '11.5.4-12.4.99',