From f449469e11680369aa287848a6b07942cf7c6c1e Mon Sep 17 00:00:00 2001 From: Flug Date: Mon, 20 Jul 2020 16:14:38 +0200 Subject: [PATCH] add php 8 rc to ci --- .github/workflows/ci.yml | 14 +++++++++++++- .php_cs.dist | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21eacea6164..b9d4de63b71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: matrix: php: - '7.4' + - 'rc' fail-fast: false timeout-minutes: 5 env: @@ -57,7 +58,7 @@ jobs: - name: Install PHP-CS-Fixer run: | composer global require --prefer-dist --no-progress --no-suggest --ansi \ - friendsofphp/php-cs-fixer:"${PHP_CS_FIXER_VERSION}" + friendsofphp/php-cs-fixer:"${PHP_CS_FIXER_VERSION} " - name: Cache PHP-CS-Fixer results uses: actions/cache@v2 with: @@ -150,6 +151,7 @@ jobs: - '7.2' - '7.3' - '7.4' + - 'rc' include: - php: '7.4' coverage: true @@ -290,6 +292,7 @@ jobs: - '7.2' - '7.3' - '7.4' + - 'rc' include: - php: '7.4' coverage: true @@ -1013,6 +1016,7 @@ jobs: matrix: php: - '7.4' + - 'rc' fail-fast: false timeout-minutes: 20 env: @@ -1256,6 +1260,7 @@ jobs: matrix: php: - '7.4' + - 'rc' fail-fast: false timeout-minutes: 20 env: @@ -1699,6 +1704,7 @@ jobs: matrix: php: - '7.4' + - 'rc' include: - php: '7.4' coverage: true @@ -1842,9 +1848,12 @@ jobs: matrix: php: - '7.4' + - 'rc' include: - php: '7.4' coverage: true + - php: 'rc' + coverage: false fail-fast: false timeout-minutes: 20 env: @@ -2005,6 +2014,7 @@ jobs: matrix: php: - '7.4' + - 'rc' fail-fast: false timeout-minutes: 20 env: @@ -2091,6 +2101,7 @@ jobs: matrix: php: - '7.4' + - 'rc' symfony: - '5.1' fail-fast: false @@ -2197,6 +2208,7 @@ jobs: matrix: php: - '7.4' + - 'rc' symfony: - '5.1' fail-fast: false diff --git a/.php_cs.dist b/.php_cs.dist index cbd76a6fc83..289899a925b 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -11,7 +11,7 @@ For the full copyright and license information, please view the LICENSE file that was distributed with this source code. HEADER; -$finder = PhpCsFixer\Finder::create() +$finder = \PhpCsFixer\Finder::create() ->in(__DIR__) ->exclude([ 'tests/Fixtures/app/var', @@ -20,7 +20,7 @@ $finder = PhpCsFixer\Finder::create() 'tests/Fixtures/app/console', ]); -return PhpCsFixer\Config::create() +return \PhpCsFixer\Config::create() ->setRiskyAllowed(true) ->setRules([ '@DoctrineAnnotation' => true,