From 9fb79b56b21e5949e9b01e534dfafd361df8aa42 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Wed, 26 Jul 2023 15:45:18 +0200 Subject: [PATCH] [FEATURE] Add support for TYPO3 12 (#465) Fixes #365 Closes #378 --- .github/workflows/ci.yml | 17 +++++++++++++++-- CHANGELOG.md | 1 + README.md | 1 + composer.json | 6 +++--- ext_emconf.php | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 458f926d..093c2ff5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,12 +117,21 @@ jobs: run: | composer require --no-progress typo3/cms-core:"$TYPO3" composer show - - name: "Set up TYPO3" + - name: "Set up TYPO3 for < 12" + if : ${{ matrix.typo3-version != '^12.3' }} run: > .Build/vendor/bin/typo3cms install:setup --no-interaction --site-setup-type="site" --database-user-name="${DATABASE_USER}" --database-host-name="${DATABASE_HOST}" --database-port="${{ job.services.mysql.ports[3306] }}" --database-name="${DATABASE_NAME}" - --admin-user-name="admin" --admin-password="password" --site-name="Test installation"; + --admin-user-name="admin" --admin-password="334LKkq2()345d" --site-name="Test installation"; + - name: "Set up TYPO3 for >= 12" + if : ${{ matrix.typo3-version == '^12.3' }} + run: > + .Build/vendor/bin/typo3 setup --no-interaction --create-site="https://example.com" + --username="${DATABASE_USER}" --host="${DATABASE_HOST}" + --port="${{ job.services.mysql.ports[3306] }}" --dbname="${DATABASE_NAME}" + --admin-email="admin@example.com" --driver="sqlite" --password="" + --admin-username="admin" --admin-user-password="334LKkq2()345d" --project-name=""; - name: "Run unit tests" run: "composer ci:tests:unit" strategy: @@ -149,3 +158,7 @@ jobs: php-version: "8.1" - typo3-version: "^11.5" php-version: "8.2" + - typo3-version: "^12.3" + php-version: "8.1" + - typo3-version: "^12.3" + php-version: "8.2" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9adf08fa..b97c6f24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ PHPUnit package this extension is intended to be used with. ## x.y.z ### Added +- Add support for TYPO3 12LTS (#465) - Add support for PHP 8.2 (#349) ### Changed diff --git a/README.md b/README.md index 937cfbdc..5aebcc49 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![TYPO3 V9](https://img.shields.io/badge/TYPO3-9-orange.svg)](https://get.typo3.org/version/9) [![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) +[![TYPO3 V12](https://img.shields.io/badge/TYPO3-12-orange.svg)](https://get.typo3.org/version/12) [![License](https://img.shields.io/github/license/oliverklee/ext-phpunit)](https://packagist.org/packages/oliverklee/phpunit) [![Total Downloads](https://poser.pugx.org/oliverklee/phpunit/downloads.svg)](https://packagist.org/packages/oliverklee/phpunit) [![GitHub CI Status](https://github.com/oliverklee/ext-phpunit/workflows/CI/badge.svg?branch=main)](https://github.com/oliverklee/ext-phpunit/actions) diff --git a/composer.json b/composer.json index ac1e0c0a..87a60500 100644 --- a/composer.json +++ b/composer.json @@ -23,12 +23,12 @@ }, "require": { "php": ">= 7.2", - "symfony/console": "^4.4 || ^5.4 || ^6.1", - "typo3/cms-core": "^9.5 || ^10.4 || ^11.5.1" + "symfony/console": "^4.4 || ^5.4 || ^6.2", + "typo3/cms-core": "^9.5 || ^10.4 || ^11.5.1 || ^12.3" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4.0", - "helhum/typo3-console": "^5.8.6 || ^6.7.6 || ^7.1.4", + "helhum/typo3-console": "^5.8.6 || ^6.7.7 || ^7.1.6 || ^8.0.3", "phpstan/extension-installer": "^1.3.1", "phpstan/phpstan": "^1.10.26", "phpstan/phpstan-phpunit": "^1.3.13", diff --git a/ext_emconf.php b/ext_emconf.php index 6272b83f..19e841db 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -8,7 +8,7 @@ 'constraints' => [ 'depends' => [ 'php' => '7.2.0-', - 'typo3' => '9.5.0-11.5.99', + 'typo3' => '9.5.0-12.4.99', ], 'conflicts' => [], 'suggests' => [],