Skip to content

Commit 0869a16

Browse files
[FEATURE] TYPO3 version 12 (#25)
* [TASK] Raise version constrain for TYPO3 to be v12 * [TASK] Require qbnk/qbank3api-phpwrapper v6.3 * [TASK] Add dependency v7.0 for qbnk/qbank3api-phpwrapper * [BUGFIX] Change ext_ files using "defined('TYPO3') or die();" * [WIP][TASK] Add compatibility with TYPO3 v12 * [TASK] Add version to be only 12.4 and up * [TASK] Add version to 12.0.0-12.4.99 * [TASK] TYPO3 Rector upgrades * [TASK] Adjust CI to be TYPO3 v12 and PHP 8.1 * [WIP] add button to TCA type 'file', possible Qbank element browser. * [WIP] remove element browser and replave with javascript * [WIP] js updates, labels, qbank service update T3v12 * [WIP] continue with BE module and templates * [WIP] be module functions * [WIP] remove unused config and script * [WIP] updates for tests, ci style fixes * [BUGFIX] fix path to lll file by ci fix * [WIP] update ci configuration * [TASK] bump version --------- Co-authored-by: Mattias Nilsson <[email protected]>
1 parent a599bfa commit 0869a16

File tree

60 files changed

+2129
-1692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2129
-1692
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
---
22
name: CI
3-
on:
4-
push:
5-
branches:
6-
- master
7-
pull_request:
8-
schedule:
9-
- cron: '15 3 * * 1'
3+
on: [push, pull_request]
104
jobs:
115
php-lint:
126
name: "PHP linter"
@@ -26,9 +20,7 @@ jobs:
2620
fail-fast: false
2721
matrix:
2822
php-version:
29-
- 7.2
30-
- 7.3
31-
- 7.4
23+
- 8.1
3224
typoscript-lint:
3325
name: "TypoScript linter"
3426
runs-on: ubuntu-20.04
@@ -86,27 +78,8 @@ jobs:
8678
- "json:lint"
8779
- "php:cs-fixer"
8880
- "php:sniff"
89-
# - "php:stan"
9081
php-version:
91-
- 7.4
92-
# code-quality-frontend:
93-
# name: "Code quality frontend checks"
94-
# runs-on: ubuntu-20.04
95-
# strategy:
96-
# fail-fast: false
97-
# matrix:
98-
# command:
99-
# - "style"
100-
# - "js"
101-
# steps:
102-
# - name: "Checkout"
103-
# uses: actions/checkout@v2
104-
# - name: "Install modules"
105-
# working-directory: ./Resources/Private
106-
# run: yarn
107-
# - name: "Run command"
108-
# working-directory: ./Resources/Private
109-
# run: "yarn lint:${{ matrix.command }}"
82+
- 8.1
11083
xliff-lint:
11184
name: "Xliff linter"
11285
runs-on: ubuntu-20.04
@@ -161,68 +134,6 @@ jobs:
161134
- highest
162135
- lowest
163136
php-version:
164-
- 7.2
165-
- 7.3
166-
- 7.4
137+
- 8.1
167138
typo3-version:
168-
- ^10.4
169-
# functional-tests:
170-
# name: "Functional tests"
171-
# runs-on: ubuntu-18.04
172-
# needs: php-lint
173-
# steps:
174-
# - name: "Checkout"
175-
# uses: actions/checkout@v2
176-
# - name: "Install PHP"
177-
# uses: shivammathur/setup-php@v2
178-
# with:
179-
# php-version: "${{ matrix.php-version }}"
180-
# tools: composer:v2
181-
# extensions: mysqli
182-
# coverage: none
183-
# - name: "Show Composer version"
184-
# run: composer --version
185-
# - name: "Cache dependencies installed with composer"
186-
# uses: actions/cache@v1
187-
# with:
188-
# key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
189-
# path: ~/.cache/composer
190-
# restore-keys: "php${{ matrix.php-version }}-composer-\n"
191-
# - env:
192-
# TYPO3: "${{ matrix.typo3-version }}"
193-
# name: "Install TYPO3 Core"
194-
# run: |
195-
# composer require --no-progress typo3/minimal:"$TYPO3"
196-
# composer show
197-
# - if: "matrix.composer-dependencies == 'lowest'"
198-
# name: "Install lowest dependencies with composer"
199-
# run: |
200-
# composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
201-
# composer show
202-
# - if: "matrix.composer-dependencies == 'highest'"
203-
# name: "Install highest dependencies with composer"
204-
# run: |
205-
# composer update --no-ansi --no-interaction --no-progress --with-dependencies
206-
# composer show
207-
# - name: "Start MySQL"
208-
# run: "sudo /etc/init.d/mysql start"
209-
# - name: "Run functional tests"
210-
# run: |
211-
# export typo3DatabaseName="typo3";
212-
# export typo3DatabaseHost="127.0.0.1";
213-
# export typo3DatabaseUsername="root";
214-
# export typo3DatabasePassword="root";
215-
# composer ci:tests:functional
216-
# strategy:
217-
# fail-fast: false
218-
# matrix:
219-
# composer-dependencies:
220-
# - highest
221-
# - lowest
222-
# php-version:
223-
# - 7.2
224-
# - 7.3
225-
# - 7.4
226-
# typo3-version:
227-
# - ^9.5
228-
# - ^10.4
139+
- ^12.4

.gitignore

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
/*.idea
22
/.Build/*
3+
/.fleet
4+
/.php-cs-fixer.cache
5+
/.phpunit.result.cache
36
/.php_cs.cache
47
/Documentation-GENERATED-temp/
5-
/Resources/Private/node_modules/
6-
/Resources/Private/package-lock.json
7-
/Resources/Private/yarn-error.log
8-
/Resources/Private/yarn.lock
98
/composer.lock
109
/nbproject
1110
/var
11+
/build
12+
/clover.xml
13+
/node_modules/
14+
/package-lock.json
15+
/yarn-error.log
16+
/yarn.lock
17+
Build/testing-docker/.env

.php-cs-fixer.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
$config = \TYPO3\CodingStandards\CsFixerConfig::create();
4+
$config->getFinder()->in('Classes')->in('Configuration')->in('Tests');
5+
return $config;

.php_cs.php

Lines changed: 0 additions & 185 deletions
This file was deleted.

Build/FunctionalTests.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" backupGlobals="true" bootstrap="FunctionalTestsBootstrap.php" cacheResult="false" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" failOnWarning="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="false">
3+
<testsuites>
4+
<testsuite name="Functional tests">
5+
<directory>../Tests/Functional/</directory>
6+
</testsuite>
7+
</testsuites>
8+
<php>
9+
<const name="TYPO3_MODE" value="BE"/>
10+
<ini name="display_errors" value="1"/>
11+
<env name="TYPO3_CONTEXT" value="Testing"/>
12+
</php>
13+
</phpunit>

Build/FunctionalTestsBootstrap.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
/*
3+
* This file is part of the TYPO3 CMS project.
4+
*
5+
* It is free software; you can redistribute it and/or modify it under
6+
* the terms of the GNU General Public License, either version 2
7+
* of the License, or any later version.
8+
*
9+
* For the full copyright and license information, please read the
10+
* LICENSE.txt file that was distributed with this source code.
11+
*
12+
* The TYPO3 project - inspiring people to share!
13+
*/
14+
15+
call_user_func(function () {
16+
$testbase = new \TYPO3\TestingFramework\Core\Testbase();
17+
$testbase->defineOriginalRootPath();
18+
$testbase->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/tests');
19+
$testbase->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/transient');
20+
});

0 commit comments

Comments
 (0)