From 6b957de5958d62935e895af815ad921aaf6bea2d Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Wed, 19 Oct 2022 09:06:36 +0200 Subject: [PATCH] [FEATURE] Allow installations on TYPO3 12 (#652) --- CHANGELOG.md | 1 + README.md | 1 + .../Domain/Repository/Product/TeaRepositoryTest.php | 2 +- composer.json | 10 +++++----- ext_emconf.php | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c87f1d6..48940ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ## x.y.z ### Added +- Add support for TYPO3 12 (#652) - Add `.gitignore` entry for JetBrains Fleet editor (#642) ### Changed diff --git a/README.md b/README.md index 10d123a..ecde785 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Example TYPO3 extension for code quality checks and automated tests +[![TYPO3 V12](https://img.shields.io/badge/TYPO3-12-orange.svg)](https://get.typo3.org/version/12) [![TYPO3 V11](https://img.shields.io/badge/TYPO3-11-orange.svg)](https://get.typo3.org/version/11) [![License](https://img.shields.io/github/license/TYPO3-Documentation/tea)](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/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php index 5f5ac36..8d9650f 100644 --- a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php +++ b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php @@ -25,9 +25,9 @@ class TeaRepositoryTest extends UnitTestCase if (\interface_exists(ObjectManagerInterface::class)) { $objectManager = $this->prophesize(ObjectManagerInterface::class)->reveal(); + // @phpstan-ignore-next-line This line is 11LTS-specific, but we're running PHPStan on TYPO3 12. $this->subject = new TeaRepository($objectManager); } else { - // @phpstan-ignore-next-line This line is valid in TYPO3 12LTS, but PHPStan uses 11LTS. $this->subject = new TeaRepository(); } } diff --git a/composer.json b/composer.json index 1d462fb..c45dbe2 100644 --- a/composer.json +++ b/composer.json @@ -29,10 +29,10 @@ "require": { "php": "~7.4.0 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0.1", - "typo3/cms-core": "^11.5.4", - "typo3/cms-extbase": "^11.5.4", - "typo3/cms-fluid": "^11.5.4", - "typo3/cms-frontend": "^11.5.4" + "typo3/cms-core": "^11.5.4 || ^12.0", + "typo3/cms-extbase": "^11.5.4 || ^12.0", + "typo3/cms-fluid": "^11.5.4 || ^12.0", + "typo3/cms-frontend": "^11.5.4 || ^12.0" }, "require-dev": { "doctrine/dbal": "^2.13.8 || ^3.3.7", @@ -53,7 +53,7 @@ "seld/jsonlint": "^1.9.0", "squizlabs/php_codesniffer": "^3.7.1", "symfony/yaml": "^5.4 || ^6.1", - "typo3/cms-fluid-styled-content": "^11.5.4", + "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.0", "typo3/coding-standards": "^0.5.5", "typo3/testing-framework": "^7.0@dev" }, diff --git a/ext_emconf.php b/ext_emconf.php index c36b582..afaf311 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' => '11.5.4-11.5.99', - 'extbase' => '11.5.4-11.5.99', - 'fluid' => '11.5.4-11.5.99', - 'frontend' => '11.5.4-11.5.99', + 'typo3' => '11.5.4-12.4.99', + 'extbase' => '11.5.4-12.4.99', + 'fluid' => '11.5.4-12.4.99', + 'frontend' => '11.5.4-12.4.99', ], ], 'state' => 'stable',