mirror of
https://github.com/FriendsOfTYPO3/tea.git
synced 2024-11-22 07:36:13 +01:00
[CLEANUP] Autoformat all files (#175)
This will reduce unrelated autoformatting changes in other commits (and it also makes the code more readable).
This commit is contained in:
parent
0d09a2f0ac
commit
2344557abc
16 changed files with 477 additions and 504 deletions
81
.github/workflows/ci.yml
vendored
81
.github/workflows/ci.yml
vendored
|
@ -33,29 +33,24 @@ jobs:
|
||||||
name: "Code quality checks"
|
name: "Code quality checks"
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
-
|
- name: "Checkout"
|
||||||
name: "Checkout"
|
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
-
|
- name: "Install PHP"
|
||||||
name: "Install PHP"
|
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: "${{ matrix.php-version }}"
|
php-version: "${{ matrix.php-version }}"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
- name: "Show Composer version"
|
- name: "Show Composer version"
|
||||||
run: composer --version
|
run: composer --version
|
||||||
-
|
- name: "Cache dependencies installed with composer"
|
||||||
name: "Cache dependencies installed with composer"
|
|
||||||
uses: actions/cache@v1
|
uses: actions/cache@v1
|
||||||
with:
|
with:
|
||||||
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
|
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
|
||||||
path: ~/.composer/cache
|
path: ~/.composer/cache
|
||||||
restore-keys: "php${{ matrix.php-version }}-composer-\n"
|
restore-keys: "php${{ matrix.php-version }}-composer-\n"
|
||||||
-
|
- name: "Install Composer dependencies"
|
||||||
name: "Install Composer dependencies"
|
|
||||||
run: "composer install --no-progress"
|
run: "composer install --no-progress"
|
||||||
-
|
- name: "Run command"
|
||||||
name: "Run command"
|
|
||||||
run: "composer ci:${{ matrix.command }}"
|
run: "composer ci:${{ matrix.command }}"
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -77,32 +72,25 @@ jobs:
|
||||||
- "style"
|
- "style"
|
||||||
- "js"
|
- "js"
|
||||||
steps:
|
steps:
|
||||||
-
|
- name: "Checkout"
|
||||||
name: "Checkout"
|
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
-
|
- name: "Install modules"
|
||||||
name: "Install modules"
|
|
||||||
working-directory: ./Resources/Private
|
working-directory: ./Resources/Private
|
||||||
run: yarn
|
run: yarn
|
||||||
-
|
- name: "Run command"
|
||||||
name: "Run command"
|
|
||||||
working-directory: ./Resources/Private
|
working-directory: ./Resources/Private
|
||||||
run: "yarn lint:${{ matrix.command }}"
|
run: "yarn lint:${{ matrix.command }}"
|
||||||
xliff-lint:
|
xliff-lint:
|
||||||
name: "Xliff linter"
|
name: "Xliff linter"
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
-
|
- name: "Checkout"
|
||||||
name: "Checkout"
|
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
-
|
- name: "Install xmllint"
|
||||||
name: "Install xmllint"
|
|
||||||
run: "sudo apt-get install libxml2-utils wget"
|
run: "sudo apt-get install libxml2-utils wget"
|
||||||
-
|
- name: "Download xliff schema"
|
||||||
name: "Download xliff schema"
|
|
||||||
run: "wget https://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd"
|
run: "wget https://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd"
|
||||||
-
|
- name: "Run lint"
|
||||||
name: "Run lint"
|
|
||||||
run: "xmllint --schema ./xliff-core-1.2-strict.xsd
|
run: "xmllint --schema ./xliff-core-1.2-strict.xsd
|
||||||
--noout $(find Resources -name '*.xlf')"
|
--noout $(find Resources -name '*.xlf')"
|
||||||
unit-tests:
|
unit-tests:
|
||||||
|
@ -110,45 +98,38 @@ jobs:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
needs: php-lint
|
needs: php-lint
|
||||||
steps:
|
steps:
|
||||||
-
|
- name: "Checkout"
|
||||||
name: "Checkout"
|
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
-
|
- name: "Install PHP"
|
||||||
name: "Install PHP"
|
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: "${{ matrix.php-version }}"
|
php-version: "${{ matrix.php-version }}"
|
||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
- name: "Show Composer version"
|
- name: "Show Composer version"
|
||||||
run: composer --version
|
run: composer --version
|
||||||
-
|
- name: "Cache dependencies installed with composer"
|
||||||
name: "Cache dependencies installed with composer"
|
|
||||||
uses: actions/cache@v1
|
uses: actions/cache@v1
|
||||||
with:
|
with:
|
||||||
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
|
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
|
||||||
path: ~/.composer/cache
|
path: ~/.composer/cache
|
||||||
restore-keys: "php${{ matrix.php-version }}-composer-\n"
|
restore-keys: "php${{ matrix.php-version }}-composer-\n"
|
||||||
-
|
- env:
|
||||||
env:
|
|
||||||
TYPO3: "${{ matrix.typo3-version }}"
|
TYPO3: "${{ matrix.typo3-version }}"
|
||||||
name: "Install TYPO3 Core"
|
name: "Install TYPO3 Core"
|
||||||
run: |
|
run: |
|
||||||
composer require --no-progress typo3/minimal:"$TYPO3"
|
composer require --no-progress typo3/minimal:"$TYPO3"
|
||||||
composer show
|
composer show
|
||||||
-
|
- if: "matrix.composer-dependencies == 'lowest'"
|
||||||
if: "matrix.composer-dependencies == 'lowest'"
|
|
||||||
name: "Install lowest dependencies with composer"
|
name: "Install lowest dependencies with composer"
|
||||||
run: |
|
run: |
|
||||||
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
|
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
|
||||||
composer show
|
composer show
|
||||||
-
|
- if: "matrix.composer-dependencies == 'highest'"
|
||||||
if: "matrix.composer-dependencies == 'highest'"
|
|
||||||
name: "Install highest dependencies with composer"
|
name: "Install highest dependencies with composer"
|
||||||
run: |
|
run: |
|
||||||
composer update --no-ansi --no-interaction --no-progress --with-dependencies
|
composer update --no-ansi --no-interaction --no-progress --with-dependencies
|
||||||
composer show
|
composer show
|
||||||
-
|
- name: "Run unit tests"
|
||||||
name: "Run unit tests"
|
|
||||||
run: "composer ci:tests:unit"
|
run: "composer ci:tests:unit"
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -167,11 +148,9 @@ jobs:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
needs: php-lint
|
needs: php-lint
|
||||||
steps:
|
steps:
|
||||||
-
|
- name: "Checkout"
|
||||||
name: "Checkout"
|
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
-
|
- name: "Install PHP"
|
||||||
name: "Install PHP"
|
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: "${{ matrix.php-version }}"
|
php-version: "${{ matrix.php-version }}"
|
||||||
|
@ -179,37 +158,31 @@ jobs:
|
||||||
extensions: mysqli
|
extensions: mysqli
|
||||||
- name: "Show Composer version"
|
- name: "Show Composer version"
|
||||||
run: composer --version
|
run: composer --version
|
||||||
-
|
- name: "Cache dependencies installed with composer"
|
||||||
name: "Cache dependencies installed with composer"
|
|
||||||
uses: actions/cache@v1
|
uses: actions/cache@v1
|
||||||
with:
|
with:
|
||||||
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
|
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
|
||||||
path: ~/.composer/cache
|
path: ~/.composer/cache
|
||||||
restore-keys: "php${{ matrix.php-version }}-composer-\n"
|
restore-keys: "php${{ matrix.php-version }}-composer-\n"
|
||||||
-
|
- env:
|
||||||
env:
|
|
||||||
TYPO3: "${{ matrix.typo3-version }}"
|
TYPO3: "${{ matrix.typo3-version }}"
|
||||||
name: "Install TYPO3 Core"
|
name: "Install TYPO3 Core"
|
||||||
run: |
|
run: |
|
||||||
composer require --no-progress typo3/minimal:"$TYPO3"
|
composer require --no-progress typo3/minimal:"$TYPO3"
|
||||||
composer show
|
composer show
|
||||||
-
|
- if: "matrix.composer-dependencies == 'lowest'"
|
||||||
if: "matrix.composer-dependencies == 'lowest'"
|
|
||||||
name: "Install lowest dependencies with composer"
|
name: "Install lowest dependencies with composer"
|
||||||
run: |
|
run: |
|
||||||
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
|
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
|
||||||
composer show
|
composer show
|
||||||
-
|
- if: "matrix.composer-dependencies == 'highest'"
|
||||||
if: "matrix.composer-dependencies == 'highest'"
|
|
||||||
name: "Install highest dependencies with composer"
|
name: "Install highest dependencies with composer"
|
||||||
run: |
|
run: |
|
||||||
composer update --no-ansi --no-interaction --no-progress --with-dependencies
|
composer update --no-ansi --no-interaction --no-progress --with-dependencies
|
||||||
composer show
|
composer show
|
||||||
-
|
- name: "Start MySQL"
|
||||||
name: "Start MySQL"
|
|
||||||
run: "sudo /etc/init.d/mysql start"
|
run: "sudo /etc/init.d/mysql start"
|
||||||
-
|
- name: "Run functional tests"
|
||||||
name: "Run functional tests"
|
|
||||||
run: |
|
run: |
|
||||||
export typo3DatabaseName="typo3";
|
export typo3DatabaseName="typo3";
|
||||||
export typo3DatabaseHost="127.0.0.1";
|
export typo3DatabaseHost="127.0.0.1";
|
||||||
|
|
|
@ -26,7 +26,7 @@ variables:
|
||||||
build-composer-dependencies:
|
build-composer-dependencies:
|
||||||
extends: .default
|
extends: .default
|
||||||
stage: build
|
stage: build
|
||||||
needs: []
|
needs: [ ]
|
||||||
variables:
|
variables:
|
||||||
COMPOSER_CACHE_DIR: '.composer'
|
COMPOSER_CACHE_DIR: '.composer'
|
||||||
script:
|
script:
|
||||||
|
@ -47,7 +47,7 @@ php-lint-php7.2:
|
||||||
extends: .default
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
stage: lint
|
stage: lint
|
||||||
needs: []
|
needs: [ ]
|
||||||
script:
|
script:
|
||||||
- composer ci:php:lint
|
- composer ci:php:lint
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ php-lint-php7.3:
|
||||||
extends: .default
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
stage: lint
|
stage: lint
|
||||||
needs: []
|
needs: [ ]
|
||||||
script:
|
script:
|
||||||
- composer ci:php:lint
|
- composer ci:php:lint
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ php-lint-php7.4:
|
||||||
extends: .default
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
stage: lint
|
stage: lint
|
||||||
needs: []
|
needs: [ ]
|
||||||
script:
|
script:
|
||||||
- composer ci:php:lint
|
- composer ci:php:lint
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ unit-php7.2-v9:
|
||||||
extends: .default
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: [ ]
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
- php-lint-php7.2
|
- php-lint-php7.2
|
||||||
|
@ -189,7 +189,7 @@ unit-php7.3-v9:
|
||||||
extends: .default
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: [ ]
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
- php-lint-php7.3
|
- php-lint-php7.3
|
||||||
|
@ -201,7 +201,7 @@ unit-php7.4-v9:
|
||||||
extends: .default
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: [ ]
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
- php-lint-php7.4
|
- php-lint-php7.4
|
||||||
|
@ -215,7 +215,7 @@ func-php7.2-v9:
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: [ ]
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
- php-lint-php7.2
|
- php-lint-php7.2
|
||||||
|
@ -229,7 +229,7 @@ func-php7.3-v9:
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: [ ]
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
- php-lint-php7.3
|
- php-lint-php7.3
|
||||||
|
@ -243,7 +243,7 @@ func-php7.4-v9:
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: [ ]
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
- php-lint-php7.4
|
- php-lint-php7.4
|
||||||
|
|
|
@ -3,4 +3,8 @@
|
||||||
defined('TYPO3_MODE') || die('Access denied.');
|
defined('TYPO3_MODE') || die('Access denied.');
|
||||||
|
|
||||||
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('tea', 'Configuration/TypoScript', 'Tea');
|
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('tea', 'Configuration/TypoScript', 'Tea');
|
||||||
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('tea', 'Configuration/TypoScript/Frontend/', 'Tea frontend (optional)');
|
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
|
||||||
|
'tea',
|
||||||
|
'Configuration/TypoScript/Frontend/',
|
||||||
|
'Tea frontend (optional)'
|
||||||
|
);
|
||||||
|
|
|
@ -1,24 +1,17 @@
|
||||||
---
|
---
|
||||||
sniffs:
|
sniffs:
|
||||||
-
|
- class: Indentation
|
||||||
class: Indentation
|
|
||||||
parameters:
|
parameters:
|
||||||
indentConditions: true
|
indentConditions: true
|
||||||
indentPerLevel: 2
|
indentPerLevel: 2
|
||||||
useSpaces: true
|
useSpaces: true
|
||||||
-
|
- class: DeadCode
|
||||||
class: DeadCode
|
- class: OperatorWhitespace
|
||||||
-
|
- class: RepeatingRValue
|
||||||
class: OperatorWhitespace
|
|
||||||
-
|
|
||||||
class: RepeatingRValue
|
|
||||||
disabled: true
|
disabled: true
|
||||||
-
|
- class: DuplicateAssignment
|
||||||
class: DuplicateAssignment
|
- class: EmptySection
|
||||||
-
|
|
||||||
class: EmptySection
|
|
||||||
disabled: true
|
disabled: true
|
||||||
-
|
- class: NestingConsistency
|
||||||
class: NestingConsistency
|
|
||||||
parameters:
|
parameters:
|
||||||
commonPathPrefixThreshold: 1
|
commonPathPrefixThreshold: 1
|
||||||
|
|
|
@ -10,8 +10,12 @@
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><f:translate key="tx_tea_domain_model_product_tea.uid"/></th>
|
<th>
|
||||||
<th><f:translate key="tx_tea_domain_model_product_tea.title"/></th>
|
<f:translate key="tx_tea_domain_model_product_tea.uid"/>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<f:translate key="tx_tea_domain_model_product_tea.title"/>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
|
@ -4,8 +4,7 @@ suites:
|
||||||
actor: AcceptanceTester
|
actor: AcceptanceTester
|
||||||
modules:
|
modules:
|
||||||
enabled:
|
enabled:
|
||||||
-
|
- WebDriver:
|
||||||
WebDriver:
|
|
||||||
browser: chrome
|
browser: chrome
|
||||||
url: "https://www.oliverklee.de"
|
url: "https://www.oliverklee.de"
|
||||||
- \Helper\Acceptance
|
- \Helper\Acceptance
|
||||||
|
@ -13,7 +12,7 @@ suites:
|
||||||
extensions:
|
extensions:
|
||||||
enabled:
|
enabled:
|
||||||
- Codeception\Extension\RunFailed
|
- Codeception\Extension\RunFailed
|
||||||
gherkin: []
|
gherkin: [ ]
|
||||||
modules:
|
modules:
|
||||||
config:
|
config:
|
||||||
WebDriver:
|
WebDriver:
|
||||||
|
|
Loading…
Reference in a new issue