Skip to content

Commit 7ebe0fb

Browse files
achimfritzachimfritz
committed
[TASK] TYPO3 14.3.x-dev
1 parent 6643638 commit 7ebe0fb

9 files changed

Lines changed: 33 additions & 25 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
TYPO3: [ '13', '14', '14-dev' ]
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- name: Install testing system
2323
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s composerInstall
@@ -41,8 +41,8 @@ jobs:
4141
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional -- --do-not-fail-on-deprecation --exclude-group v14-only
4242
if: matrix.TYPO3 == '13'
4343

44-
- name: Functional Tests 14.1
45-
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional -- --exclude-group v14-only
44+
- name: Functional Tests 14.2
45+
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional -- --do-not-fail-on-deprecation --do-not-fail-on-warning
4646
if: matrix.TYPO3 == '14'
4747

4848
- name: Functional Tests 14
@@ -51,15 +51,16 @@ jobs:
5151

5252
- name: Acceptance Tests
5353
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast
54+
if: matrix.TYPO3 != '14'
5455
- name: Archive acceptance tests results
55-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v6
5657
if: always()
5758
with:
5859
name: acceptance-test-reports-${{ matrix.php }}-${{ matrix.TYPO3 }}
5960
path: .Build/Web/typo3temp/var/tests/_output
6061

6162
- name: Archive composer.lock
62-
uses: actions/upload-artifact@v4
63+
uses: actions/upload-artifact@v6
6364
if: always()
6465
with:
6566
name: composer.lock-${{ matrix.php }}-${{ matrix.TYPO3 }}

‎Build/Scripts/runTests.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Options:
153153
Specifies the TYPO3 Core version to be used - Only with -s composerInstall|phpstan|acceptance
154154
- 13: Use TYPO3 v13.x
155155
- 14: Use TYPO3 v14.x
156-
- 14-dev Use TYPO3 14.2.x-dev
156+
- 14-dev Use TYPO3 14.3.x-dev
157157
158158
-a <mysqli|pdo_mysql>
159159
Only with -s functional|functionalDeprecated
@@ -597,9 +597,9 @@ case ${TEST_SUITE} in
597597
php -v | grep '^PHP';
598598
599599
if [ "${TYPO3}" == "14-dev" ]; then
600-
composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
600+
composer require typo3/cms-core:14.3.x-dev --dev -W --no-progress --no-interaction
601601
elif [ ${TYPO3} -eq 14 ]; then
602-
composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
602+
composer require typo3/cms-core:^14.2 --dev -W --no-progress --no-interaction
603603
else
604604
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
605605
fi
@@ -616,9 +616,9 @@ case ${TEST_SUITE} in
616616
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-validate-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "
617617
php -v | grep '^PHP';
618618
if [ "${TYPO3}" == "14-dev" ]; then
619-
composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
619+
composer require typo3/cms-core:14.3.x-dev --dev -W --no-progress --no-interaction
620620
elif [ ${TYPO3} -eq 14 ]; then
621-
composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
621+
composer require typo3/cms-core:^14.2 --dev -W --no-progress --no-interaction
622622
else
623623
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
624624
fi

‎Tests/Acceptance/Backend/ContentDefenderCest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function canCreateNewChildInContainerIfMaxitemsIsReachedInOtherContainer(
156156
$I->waitForText('Header Only');
157157
$I->executeJS("document.querySelector('" . $I->getNewRecordWizardSelector() . "').shadowRoot.querySelector('button[data-identifier=\"default_header\"]').click()");
158158
$I->switchToContentFrame();
159-
if ($I->getTypo3MajorVersion() > 13 && (new Typo3Version())->getBranch() !== '14.1') {
159+
if ($I->getTypo3MajorVersion() > 13) {
160160
$I->waitForText('Create new Header Only');
161161
} else {
162162
$I->waitForText('Create new Page Content on page');

‎Tests/Acceptance/Backend/WorkspaceCest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ protected function switchToTestWs(BackendTester $I): void
115115

116116
protected function switchToWs(BackendTester $I, string $ws): void
117117
{
118-
if ($I->getTypo3MajorVersion() > 13 && (new Typo3Version())->getBranch() !== '14.1') {
118+
if ($I->getTypo3MajorVersion() > 13) {
119119
$I->switchToMainFrame();
120120
if ($ws === 'test-ws') {
121121
$I->executeJS("document.querySelector('typo3-backend-workspace-selector #workspace-menu button[title=\"test-ws\"]').click();");

‎Tests/Acceptance/Support/BackendTester.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function loginAs(string $username): void
5555
*/
5656
public function openRecordInContextPanelOrWithEditDocumentController(int $uid): void
5757
{
58-
if ($this->getTypo3MajorVersion() < 14 || (new Typo3Version())->getBranch() === '14.1') {
58+
if ($this->getTypo3MajorVersion() < 14) {
5959
$this->waitForElement('#element-tt_content-' . $uid . ' a[title="Edit"]');
6060
$this->click('#element-tt_content-' . $uid . ' a[title="Edit"]');
6161
} else {
@@ -121,7 +121,7 @@ public function selectGermanInLanguageMenu(): void
121121
} else {
122122
$this->waitForText('english');
123123
//$this->click('english');
124-
$this->click('.module-docheader-bar-column button');
124+
$this->click('.module-docheader-column button.dropdown-toggle');
125125
$this->waitForText('german');
126126
$this->click('german');
127127
}

‎Tests/Functional/Datahandler/ContentDefender/AbstractContentDefender.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
use B13\Container\Tests\Functional\Datahandler\AbstractDatahandler;
1616
use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
1717
use TYPO3\CMS\Core\Http\ServerRequest;
18+
use TYPO3\CMS\Core\Information\Typo3Version;
1819

1920
abstract class AbstractContentDefender extends AbstractDatahandler
2021
{
2122
protected function setUp(): void
2223
{
2324
parent::setUp();
24-
// content_defender always returns true for restrictions if global variable TYPO3_REQUEST is null
25-
$GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE);
25+
if ((new Typo3Version())->getMajorVersion() < 14) {
26+
// content_defender always returns true for restrictions if global variable TYPO3_REQUEST is null
27+
$GLOBALS['TYPO3_REQUEST'] = (new ServerRequest())->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE);
28+
}
2629
}
2730
}

‎Tests/Functional/Datahandler/ContentDefender/MaxItemsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public function canTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReached()
369369
$this->dataHandler->start([], $cmdmap, $this->backendUser);
370370
$this->dataHandler->process_datamap();
371371
$this->dataHandler->process_cmdmap();
372-
if ((new Typo3Version())->getMajorVersion() < 14 || (new Typo3Version())->getBranch() === '14.1') {
372+
if ((new Typo3Version())->getMajorVersion() < 14) {
373373
self::assertCSVDataSet(__DIR__ . '/Fixtures/Maxitems/LegacyCanTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReachedResult.csv');
374374
} else {
375375
self::assertCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanTranslateChildIfContainerOfDefaultLanguageMaxitemsIsReachedResult.csv');
@@ -394,7 +394,7 @@ public function canCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReac
394394
$this->dataHandler->start([], $cmdmap, $this->backendUser);
395395
$this->dataHandler->process_datamap();
396396
$this->dataHandler->process_cmdmap();
397-
if ((new Typo3Version())->getMajorVersion() < 14 || (new Typo3Version())->getBranch() === '14.1') {
397+
if ((new Typo3Version())->getMajorVersion() < 14) {
398398
self::assertCSVDataSet(__DIR__ . '/Fixtures/Maxitems/LegacyCanCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReachedResult.csv');
399399
} else {
400400
self::assertCSVDataSet(__DIR__ . '/Fixtures/Maxitems/CanCopyToLanguageChildIfContainerOfDefaultLanguageMaxitemsIsReachedResult.csv');

‎Tests/Functional/Datahandler/Localization/LocalizeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public function localizeElementAfterAlreadyLocalizedContainerIsSortedAfterContai
260260
];
261261
$this->dataHandler->start([], $cmdmap, $this->backendUser);
262262
$this->dataHandler->process_cmdmap();
263-
if ((new Typo3Version())->getMajorVersion() < 14 || (new Typo3Version())->getBranch() === '14.1') {
263+
if ((new Typo3Version())->getMajorVersion() < 14) {
264264
self::assertCSVDataSet(__DIR__ . '/Fixtures/Localize/LegacyLocalizeElementAfterAlreadyLocalizedContainerIsSortedAfterContainerResult.csv');
265265
} else {
266266
self::assertCSVDataSet(__DIR__ . '/Fixtures/Localize/LocalizeElementAfterAlreadyLocalizedContainerIsSortedAfterContainerResult.csv');

‎composer.json‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"homepage": "https://b13.com",
66
"license": ["GPL-2.0-or-later"],
77
"require": {
8-
"typo3/cms-backend": "^13.4 || ^14.1 || 14.2.x-dev"
8+
"typo3/cms-backend": "^13.4 || ^14.2 || 14.3.x-dev"
99
},
1010
"autoload": {
1111
"psr-4": {
@@ -29,10 +29,10 @@
2929
},
3030
"require-dev": {
3131
"b13/container-example": "dev-task/v4",
32-
"typo3/cms-install": "^13.4 || ^14.1 || 14.2.x-dev",
33-
"typo3/cms-fluid-styled-content": "^13.4 || ^14.1 || 14.2.x-dev",
34-
"typo3/cms-info": "^13.4 || ^14.1 || 14.2.x-dev",
35-
"typo3/cms-workspaces": "^13.4 || ^14.1 || 14.2.x-dev",
32+
"typo3/cms-install": "^13.4 || ^14.2 || 14.3.x-dev",
33+
"typo3/cms-fluid-styled-content": "^13.4 || ^14.2 || 14.3.x-dev",
34+
"typo3/cms-info": "^13.4 || ^14.2 || 14.3.x-dev",
35+
"typo3/cms-workspaces": "^13.4 || ^14.2 || 14.3.x-dev",
3636
"typo3/testing-framework": "^9.1",
3737
"phpstan/phpstan": "^1.10",
3838
"typo3/coding-standards": "^0.5.5",
@@ -51,7 +51,11 @@
5151
"cms-package-dir": "{$vendor-dir}/typo3/cms",
5252
"web-dir": ".Build/Web",
5353
"app-dir": ".Build",
54-
"extension-key": "container"
54+
"extension-key": "container",
55+
"version": "4.0.0",
56+
"Package": {
57+
"providesPackages": {}
58+
}
5559
}
5660
}
5761
}

0 commit comments

Comments
 (0)