mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-22 19:36:12 +01:00

[FEATURE] Support PHP 8.2 (#787)

This commit is contained in:
Chris Müller 2023-04-02 12:53:33 +02:00 committed by GitHub
parent 10ba55414e
commit 959d2ab2f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 165 additions and 2 deletions

View file

@ -35,6 +35,7 @@ jobs:
- "7.4" - "7.4"
- "8.0" - "8.0"
- "8.1" - "8.1"
- "8.2"
code-quality: code-quality:
name: "Code quality checks" name: "Code quality checks"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@ -163,12 +164,24 @@ jobs:
- typo3-version: "^11.5" - typo3-version: "^11.5"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: lowest composer-dependencies: lowest
- typo3-version: "^12.3" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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: functional-tests:
name: "Functional tests" name: "Functional tests"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@ -245,9 +258,21 @@ jobs:
- typo3-version: "^11.5" - typo3-version: "^11.5"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: lowest composer-dependencies: lowest
- typo3-version: "^12.3" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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

View file

@ -32,6 +32,7 @@ jobs:
- "7.4" - "7.4"
- "8.0" - "8.0"
- "8.1" - "8.1"
- "8.2"
typoscript-lint: typoscript-lint:
name: "TypoScript linter" name: "TypoScript linter"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@ -211,12 +212,24 @@ jobs:
- typo3-version: "^11.5" - typo3-version: "^11.5"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: lowest composer-dependencies: lowest
- typo3-version: "^12.3" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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: functional-tests:
name: "Functional tests" name: "Functional tests"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@ -291,9 +304,21 @@ jobs:
- typo3-version: "^11.5" - typo3-version: "^11.5"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: lowest composer-dependencies: lowest
- typo3-version: "^12.3" - typo3-version: "^12.3"
php-version: "8.1" php-version: "8.1"
composer-dependencies: highest 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

View file

@ -19,14 +19,19 @@ include:
- '/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml' - '/.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-highest.yml'
- '/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.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-highest.yml'
- '/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.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/javascript-lint.yml'
- '/.gitlab/pipeline/jobs/json-lint.yml' - '/.gitlab/pipeline/jobs/json-lint.yml'
- '/.gitlab/pipeline/jobs/php-copypaste-check.yml' - '/.gitlab/pipeline/jobs/php-copypaste-check.yml'
- '/.gitlab/pipeline/jobs/php-lint-php7.4.yml' - '/.gitlab/pipeline/jobs/php-lint-php7.4.yml'
- '/.gitlab/pipeline/jobs/php-lint-php8.0.yml' - '/.gitlab/pipeline/jobs/php-lint-php8.0.yml'
- '/.gitlab/pipeline/jobs/php-lint-php8.1.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/phpcs.yml'
- '/.gitlab/pipeline/jobs/ts-lint.yml' - '/.gitlab/pipeline/jobs/ts-lint.yml'
- '/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.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.0-v11-lowest.yml'
- '/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml' - '/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml'
- '/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.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-highest.yml'
- '/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.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/xliff-lint.yml'
- '/.gitlab/pipeline/jobs/yaml-lint.yml' - '/.gitlab/pipeline/jobs/yaml-lint.yml'
- template: Security/License-Scanning.gitlab-ci.yml - template: Security/License-Scanning.gitlab-ci.yml

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -0,0 +1,7 @@
php-lint-php8.2:
extends: .default
image: php:8.2
stage: lint
needs: [ ]
script:
- composer ci:php:lint

View file

@ -6,5 +6,6 @@ phpcs:
- php-lint-php7.4 - php-lint-php7.4
- php-lint-php8.0 - php-lint-php8.0
- php-lint-php8.1 - php-lint-php8.1
- php-lint-php8.2
script: script:
- composer ci:php:sniff - composer ci:php:sniff

View file

@ -6,5 +6,6 @@ phpstan:
- php-lint-php7.4 - php-lint-php7.4
- php-lint-php8.0 - php-lint-php8.0
- php-lint-php8.1 - php-lint-php8.1
- php-lint-php8.2
script: script:
- composer ci:php:stan - composer ci:php:stan

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -27,7 +27,7 @@
"docs": "https://docs.typo3.org/p/ttn/tea/main/en-us/" "docs": "https://docs.typo3.org/p/ttn/tea/main/en-us/"
}, },
"require": { "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", "psr/http-message": "^1.0.1",
"typo3/cms-core": "^11.5.4 || ^12.3", "typo3/cms-core": "^11.5.4 || ^12.3",
"typo3/cms-extbase": "^11.5.4 || ^12.3", "typo3/cms-extbase": "^11.5.4 || ^12.3",

View file

@ -7,7 +7,7 @@ $EM_CONF[$_EXTKEY] = [
'category' => 'example', 'category' => 'example',
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'php' => '7.4.0-8.1.99', 'php' => '7.4.0-8.2.99',
'typo3' => '11.5.4-12.4.99', 'typo3' => '11.5.4-12.4.99',
'extbase' => '11.5.4-12.4.99', 'extbase' => '11.5.4-12.4.99',
'fluid' => '11.5.4-12.4.99', 'fluid' => '11.5.4-12.4.99',