Skip to content

Commit

Permalink
Merge pull request #11 from hoogi91/develop
Browse files Browse the repository at this point in the history
TYPO3 v10 Support Release
  • Loading branch information
hoogi91 authored Jun 7, 2020
2 parents 2ff7d5f + ccd1bc2 commit cfe6744
Show file tree
Hide file tree
Showing 52 changed files with 2,626 additions and 752 deletions.
801 changes: 801 additions & 0 deletions .editorconfig

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/.github/ export-ignore
/Tests/ export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/.editorconfig export-ignore
82 changes: 82 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: CI
on:
push:
branches:
- master
- develop
- release/*
- feature/*
pull_request:
branches:
- master
- develop

jobs:
build:
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
php_version: ['7.2', '7.3', '7.4']
typo3_version: ['^8.7', '^9.5', '^10.4']
experimental: [false]
include:
# add experimental dev-master for PHP 7.4
- php_version: '7.4'
typo3_version: 'dev-master'
experimental: true

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- uses: shivammathur/setup-php@v2
with:
php-version: '${{ matrix.php_version }}'
coverage: xdebug
tools: composer
extensions: json, mbstring

- name: Install project testing dependencies
run: |
if [[ "${{ matrix.typo3_version }}" = *"dev"* ]]; then
composer config minimum-stability dev;
composer config prefer-stable true;
composer require typo3/cms-core:"@dev" --no-update;
fi
composer require nimut/typo3-complete:"${{ matrix.typo3_version }}"
export TYPO3_PATH_ROOT=$GITHUB_WORKSPACE/.Build/web
export typo3DatabaseName=typo3
export typo3DatabaseHost=localhost
export typo3DatabaseUsername=root
export typo3DatabasePassword=
- name: Executing PHP code sniffer
run: .Build/bin/phpcs -p --standard=PSR2 Classes/

- name: Executing PHPStan
if: matrix.php_version == '7.4' && matrix.typo3_version == '^10.4'
run: .Build/bin/phpstan analyse --level 5 Classes/

- name: Running unit tests
if: (matrix.php_version == '7.4' && matrix.typo3_version == '^10.4') == false
run: |
if [ -d "Tests/Unit" ]; then
.Build/bin/phpunit --bootstrap Tests/bootstrap.php Tests/Unit/
fi
- name: Running unit tests with coverage report
if: matrix.php_version == '7.4' && matrix.typo3_version == '^10.4'
run: |
if [ -d "Tests/Unit" ]; then
.Build/bin/phpunit --bootstrap Tests/bootstrap.php Tests/Unit/ --coverage-clover=./coverage.xml --whitelist=./Classes/
fi
- name: Upload coverage report to codecov
uses: codecov/codecov-action@v1
if: matrix.php_version == '7.4' && matrix.typo3_version == '^10.4'
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml
flags: phpunit
35 changes: 35 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: 🚢 to TER
on:
release:
types: [published]

jobs:
deploy:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php_version: ['7.2']

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- uses: shivammathur/setup-php@v2
with:
php-version: '${{ matrix.php_version }}'
tools: composer
extensions: json, mbstring

- name: Get current tag version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

- name: Preparing upload of release ${{ steps.get_version.outputs.VERSION }} to TER
run: composer global require helhum/ter-client

- name: Cleanup before we upload
run: git reset --hard HEAD && git clean -fx && composer extension-cleanup-for-release

- name: Uploading release ${{ steps.get_version.outputs.VERSION }} to TER
run: $HOME/.composer/vendor/bin/ter-client upload charts . -u "${{ secrets.TYPO3_ORG_USERNAME }}" -p "${{ secrets.TYPO3_ORG_PASSWORD }}" -m "${{ github.event.release.html_url }}"
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
.idea
.vagrant
.docker
.docker.env
.Build
ansible/
config/
vendor/
var/
Documentation-GENERATED*/
composer.phar
composer.lock
Makefile
Vagrantfile
105 changes: 0 additions & 105 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions Classes/Controller/Wizard/TableController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class TableController extends \TYPO3\CMS\Backend\Controller\Wizard\TableControll
*/
public function getConfigCode($row)
{
// @phpstan-ignore-next-line
return $this->fixEmptyConfiguration(parent::getConfigCode($row));
}

Expand Down
Loading

0 comments on commit cfe6744

Please sign in to comment.