mirror of
https://github.com/FriendsOfTYPO3/tea.git
synced 2025-02-14 19:03:49 +01:00
Compare commits
2 commits
a8ecbf2d98
...
c5c3348b6a
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c5c3348b6a | ||
![]() |
45f9479e58 |
9 changed files with 61 additions and 6 deletions
25
.github/workflows/ci.yml
vendored
25
.github/workflows/ci.yml
vendored
|
@ -46,6 +46,7 @@ jobs:
|
|||
- "8.1"
|
||||
- "8.2"
|
||||
- "8.3"
|
||||
- "8.4"
|
||||
code-quality:
|
||||
name: "Code quality checks"
|
||||
runs-on: ubuntu-24.04
|
||||
|
@ -189,6 +190,12 @@ jobs:
|
|||
- typo3-version: "^11.5"
|
||||
php-version: "8.3"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^11.5"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^11.5"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.4"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: lowest
|
||||
|
@ -207,6 +214,12 @@ jobs:
|
|||
- typo3-version: "^12.4"
|
||||
php-version: "8.3"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.4"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^12.4"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: highest
|
||||
functional-tests:
|
||||
name: "Functional tests"
|
||||
runs-on: ubuntu-24.04
|
||||
|
@ -296,6 +309,12 @@ jobs:
|
|||
- typo3-version: "^11.5"
|
||||
php-version: "8.3"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^11.5"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^11.5"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.4"
|
||||
php-version: "8.1"
|
||||
composer-dependencies: lowest
|
||||
|
@ -314,6 +333,12 @@ jobs:
|
|||
- typo3-version: "^12.4"
|
||||
php-version: "8.3"
|
||||
composer-dependencies: highest
|
||||
- typo3-version: "^12.4"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: lowest
|
||||
- typo3-version: "^12.4"
|
||||
php-version: "8.4"
|
||||
composer-dependencies: highest
|
||||
shellcheck:
|
||||
name: Check shell scripts
|
||||
runs-on: ubuntu-24.04
|
||||
|
|
7
.gitlab/pipeline/jobs/php-lint-php8.4.yml
Normal file
7
.gitlab/pipeline/jobs/php-lint-php8.4.yml
Normal file
|
@ -0,0 +1,7 @@
|
|||
php-lint-php8.3:
|
||||
extends: .composer-update
|
||||
image: ghcr.io/typo3/core-testing-php84:latest
|
||||
stage: lint
|
||||
needs: [ ]
|
||||
script:
|
||||
- composer ci:php:lint
|
|
@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
|
|||
## x.y.z
|
||||
|
||||
### Added
|
||||
- Add support for PHP 8.4 (#1536)
|
||||
- Add support for PostgreSQL 16 (#1271)
|
||||
|
||||
### Changed
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
"tt_content"
|
||||
,"uid","pid","CType","header","list_type"
|
||||
,1,1,"list","Tea index","tea_teaindex"
|
||||
,2,3,"list","Tea show","tea_teashow"
|
||||
|
|
Can't render this file because it has a wrong number of fields in line 2.
|
|
@ -2,3 +2,4 @@
|
|||
,"uid","pid","title","slug"
|
||||
,1,0,"Rootpage","/"
|
||||
,2,1,"Storage","/storage"
|
||||
,3,1,"Show","/show"
|
||||
|
|
Can't render this file because it has a wrong number of fields in line 2.
|
|
@ -20,6 +20,14 @@ final class TeaControllerTest extends FunctionalTestCase
|
|||
'typo3conf/ext/tea/Tests/Functional/Controller/Fixtures/Sites/' => 'typo3conf/sites',
|
||||
];
|
||||
|
||||
protected array $configurationToUseInTestInstance = [
|
||||
'FE' => [
|
||||
'cacheHash' => [
|
||||
'enforceValidation' => false,
|
||||
],
|
||||
],
|
||||
];
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
@ -37,6 +45,8 @@ final class TeaControllerTest extends FunctionalTestCase
|
|||
'EXT:tea/Tests/Functional/Controller/Fixtures/TypoScript/Setup/Rendering.typoscript',
|
||||
],
|
||||
]);
|
||||
$this->importCSVDataSet(__DIR__ . '/Fixtures/Database/ContentElementTeaIndex.csv');
|
||||
$this->importCSVDataSet(__DIR__ . '/Fixtures/Database/Teas.csv');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -44,9 +54,6 @@ final class TeaControllerTest extends FunctionalTestCase
|
|||
*/
|
||||
public function indexActionRendersAllAvailableTeas(): void
|
||||
{
|
||||
$this->importCSVDataSet(__DIR__ . '/Fixtures/Database/ContentElementTeaIndex.csv');
|
||||
$this->importCSVDataSet(__DIR__ . '/Fixtures/Database/Teas.csv');
|
||||
|
||||
$request = (new InternalRequest())->withPageId(1);
|
||||
|
||||
$html = (string)$this->executeFrontendSubRequest($request)->getBody();
|
||||
|
@ -54,4 +61,17 @@ final class TeaControllerTest extends FunctionalTestCase
|
|||
self::assertStringContainsString('Godesberger Burgtee', $html);
|
||||
self::assertStringContainsString('Oolong', $html);
|
||||
}
|
||||
|
||||
/**
|
||||
* @test
|
||||
*/
|
||||
public function showActionRendersTheGivenTeas(): void
|
||||
{
|
||||
$request = (new InternalRequest())->withPageId(3)->withQueryParameters(['tx_tea_teashow[tea]' => 1]);
|
||||
|
||||
$html = (string)$this->executeFrontendSubRequest($request)->getBody();
|
||||
|
||||
self::assertStringContainsString('Godesberger Burgtee', $html);
|
||||
self::assertStringNotContainsString('Oolong', $html);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
"docs": "https://docs.typo3.org/p/ttn/tea/main/en-us/"
|
||||
},
|
||||
"require": {
|
||||
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
|
||||
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
|
||||
"psr/http-message": "^1.0.1",
|
||||
"typo3/cms-core": "^11.5.41 || ^12.4.24",
|
||||
"typo3/cms-extbase": "^11.5.41 || ^12.4.24",
|
||||
|
|
|
@ -7,7 +7,7 @@ $EM_CONF[$_EXTKEY] = [
|
|||
'category' => 'example',
|
||||
'constraints' => [
|
||||
'depends' => [
|
||||
'php' => '7.4.0-8.3.99',
|
||||
'php' => '7.4.0-8.4.99',
|
||||
'typo3' => '11.5.41-12.4.99',
|
||||
'extbase' => '11.5.41-12.4.99',
|
||||
'fluid' => '11.5.41-12.4.99',
|
||||
|
|
|
@ -95,7 +95,7 @@ return RectorConfig::configure()
|
|||
])
|
||||
->withImportNames(true, true, false)
|
||||
->withConfiguredRule(ExtEmConfRector::class, [
|
||||
ExtEmConfRector::PHP_VERSION_CONSTRAINT => '7.4.0-8.3.99',
|
||||
ExtEmConfRector::PHP_VERSION_CONSTRAINT => '7.4.0-8.4.99',
|
||||
ExtEmConfRector::TYPO3_VERSION_CONSTRAINT => '11.5.41-12.4.99',
|
||||
ExtEmConfRector::ADDITIONAL_VALUES_TO_BE_REMOVED => [],
|
||||
])
|
||||
|
|
Loading…
Add table
Reference in a new issue