danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-22 01:36:12 +01:00
Code Activity

[CLEANUP] Autoformat all files (#175)

Browse source 
This will reduce unrelated autoformatting changes in other commits
(and it also makes the code more readable).
This commit is contained in:
Oliver Klee 2020-12-01 23:12:34 +01:00 committed by GitHub
parent 0d09a2f0ac
commit 2344557abc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 477 additions and 504 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
.github/workflows/ci.yml vendored
View file

@ -33,29 +33,24 @@ jobs:
name: "Code quality checks"
runs-on: ubuntu-20.04
steps:
-
name: "Checkout"
- name: "Checkout"
uses: actions/checkout@v2
-
name: "Install PHP"
- name: "Install PHP"
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php-version }}"
tools: composer:v2
- name: "Show Composer version"
run: composer --version
-
name: "Cache dependencies installed with composer"
- name: "Cache dependencies installed with composer"
uses: actions/cache@v1
with:
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
path: ~/.composer/cache
restore-keys: "php${{ matrix.php-version }}-composer-\n"
-
name: "Install Composer dependencies"
- name: "Install Composer dependencies"
run: "composer install --no-progress"
-
name: "Run command"
- name: "Run command"
run: "composer ci:${{ matrix.command }}"
strategy:
matrix:
@ -77,32 +72,25 @@ jobs:
- "style"
- "js"
steps:
-
name: "Checkout"
- name: "Checkout"
uses: actions/checkout@v2
-
name: "Install modules"
- name: "Install modules"
working-directory: ./Resources/Private
run: yarn
-
name: "Run command"
- name: "Run command"
working-directory: ./Resources/Private
run: "yarn lint:${{ matrix.command }}"
xliff-lint:
name: "Xliff linter"
runs-on: ubuntu-20.04
steps:
-
name: "Checkout"
- name: "Checkout"
uses: actions/checkout@v2
-
name: "Install xmllint"
- name: "Install xmllint"
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"
-
name: "Run lint"
- name: "Run lint"
run: "xmllint --schema ./xliff-core-1.2-strict.xsd
--noout $(find Resources -name '*.xlf')"
unit-tests:
@ -110,45 +98,38 @@ jobs:
runs-on: ubuntu-20.04
needs: php-lint
steps:
-
name: "Checkout"
- name: "Checkout"
uses: actions/checkout@v2
-
name: "Install PHP"
- name: "Install PHP"
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php-version }}"
tools: composer:v2
- name: "Show Composer version"
run: composer --version
-
name: "Cache dependencies installed with composer"
- name: "Cache dependencies installed with composer"
uses: actions/cache@v1
with:
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
path: ~/.composer/cache
restore-keys: "php${{ matrix.php-version }}-composer-\n"
-
env:
- env:
TYPO3: "${{ matrix.typo3-version }}"
name: "Install TYPO3 Core"
run: |
composer require --no-progress typo3/minimal:"$TYPO3"
composer show
-
if: "matrix.composer-dependencies == 'lowest'"
- if: "matrix.composer-dependencies == 'lowest'"
name: "Install lowest dependencies with composer"
run: |
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
composer show
-
if: "matrix.composer-dependencies == 'highest'"
- if: "matrix.composer-dependencies == 'highest'"
name: "Install highest dependencies with composer"
run: |
composer update --no-ansi --no-interaction --no-progress --with-dependencies
composer show
-
name: "Run unit tests"
- name: "Run unit tests"
run: "composer ci:tests:unit"
strategy:
matrix:
@ -167,11 +148,9 @@ jobs:
runs-on: ubuntu-18.04
needs: php-lint
steps:
-
name: "Checkout"
- name: "Checkout"
uses: actions/checkout@v2
-
name: "Install PHP"
- name: "Install PHP"
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php-version }}"
@ -179,37 +158,31 @@ jobs:
extensions: mysqli
- name: "Show Composer version"
run: composer --version
-
name: "Cache dependencies installed with composer"
- name: "Cache dependencies installed with composer"
uses: actions/cache@v1
with:
key: "php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
path: ~/.composer/cache
restore-keys: "php${{ matrix.php-version }}-composer-\n"
-
env:
- env:
TYPO3: "${{ matrix.typo3-version }}"
name: "Install TYPO3 Core"
run: |
composer require --no-progress typo3/minimal:"$TYPO3"
composer show
-
if: "matrix.composer-dependencies == 'lowest'"
- if: "matrix.composer-dependencies == 'lowest'"
name: "Install lowest dependencies with composer"
run: |
composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
composer show
-
if: "matrix.composer-dependencies == 'highest'"
- if: "matrix.composer-dependencies == 'highest'"
name: "Install highest dependencies with composer"
run: |
composer update --no-ansi --no-interaction --no-progress --with-dependencies
composer show
-
name: "Start MySQL"
- name: "Start MySQL"
run: "sudo /etc/init.d/mysql start"
-
name: "Run functional tests"
- name: "Run functional tests"
run: |
export typo3DatabaseName="typo3";
export typo3DatabaseHost="127.0.0.1";

20
.gitlab/pipeline/.gitlab-ci.yml
View file

@ -26,7 +26,7 @@ variables:
build-composer-dependencies:
extends: .default
stage: build
needs: []
needs: [ ]
variables:
COMPOSER_CACHE_DIR: '.composer'
script:
@ -47,7 +47,7 @@ php-lint-php7.2:
extends: .default
image: php:7.2
stage: lint
needs: []
needs: [ ]
script:
- composer ci:php:lint
@ -55,7 +55,7 @@ php-lint-php7.3:
extends: .default
image: php:7.3
stage: lint
needs: []
needs: [ ]
script:
- composer ci:php:lint
@ -63,7 +63,7 @@ php-lint-php7.4:
extends: .default
image: php:7.4
stage: lint
needs: []
needs: [ ]
script:
- composer ci:php:lint
@ -177,7 +177,7 @@ unit-php7.2-v9:
extends: .default
image: php:7.2
stage: test
dependencies: []
dependencies: [ ]
needs:
- build-composer-dependencies
- php-lint-php7.2
@ -189,7 +189,7 @@ unit-php7.3-v9:
extends: .default
image: php:7.3
stage: test
dependencies: []
dependencies: [ ]
needs:
- build-composer-dependencies
- php-lint-php7.3
@ -201,7 +201,7 @@ unit-php7.4-v9:
extends: .default
image: php:7.4
stage: test
dependencies: []
dependencies: [ ]
needs:
- build-composer-dependencies
- php-lint-php7.4
@ -215,7 +215,7 @@ func-php7.2-v9:
services:
- mariadb:10
stage: test
dependencies: []
dependencies: [ ]
needs:
- build-composer-dependencies
- php-lint-php7.2
@ -229,7 +229,7 @@ func-php7.3-v9:
services:
- mariadb:10
stage: test
dependencies: []
dependencies: [ ]
needs:
- build-composer-dependencies
- php-lint-php7.3
@ -243,7 +243,7 @@ func-php7.4-v9:
services:
- mariadb:10
stage: test
dependencies: []
dependencies: [ ]
needs:
- build-composer-dependencies
- php-lint-php7.4

6
Configuration/TCA/Overrides/sys_template.php
View file

@ -3,4 +3,8 @@
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/Frontend/', 'Tea frontend (optional)');
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
'tea',
'Configuration/TypoScript/Frontend/',
'Tea frontend (optional)'
);

21
Configuration/TsLint.yml
View file

@ -1,24 +1,17 @@
---
sniffs:
-
class: Indentation
- class: Indentation
parameters:
indentConditions: true
indentPerLevel: 2
useSpaces: true
-
class: DeadCode
-
class: OperatorWhitespace
-
class: RepeatingRValue
- class: DeadCode
- class: OperatorWhitespace
- class: RepeatingRValue
disabled: true
-
class: DuplicateAssignment
-
class: EmptySection
- class: DuplicateAssignment
- class: EmptySection
disabled: true
-
class: NestingConsistency
- class: NestingConsistency
parameters:
commonPathPrefixThreshold: 1

8
Resources/Private/Templates/Tea/Index.html
View file

@ -10,8 +10,12 @@
<table class="table">
<thead>
<tr>
<th><f:translate key="tx_tea_domain_model_product_tea.uid"/></th>
<th><f:translate key="tx_tea_domain_model_product_tea.title"/></th>
<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>
</thead>
<tbody>

5
codeception.yml
View file

@ -4,8 +4,7 @@ suites:
actor: AcceptanceTester
modules:
enabled:
-
WebDriver:
- WebDriver:
browser: chrome
url: "https://www.oliverklee.de"
- \Helper\Acceptance
@ -13,7 +12,7 @@ suites:
extensions:
enabled:
- Codeception\Extension\RunFailed
gherkin: []
gherkin: [ ]
modules:
config:
WebDriver: