From 386aa78e11fed64f086692bd245cc947c5767743 Mon Sep 17 00:00:00 2001 From: SonataCI Date: Tue, 17 Aug 2021 12:06:45 +0000 Subject: [PATCH] DevKit updates --- .github/workflows/lint.yaml | 2 +- .gitignore | 2 +- .php_cs.dist => .php-cs-fixer.dist.php | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) rename .php_cs.dist => .php-cs-fixer.dist.php (95%) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 98576b51f7..188788cc50 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v2 - name: Run PHP-CS-Fixer - uses: docker://oskarstark/php-cs-fixer-ga:2.18.5 + uses: docker://oskarstark/php-cs-fixer-ga:3.0.0 with: args: --ansi --verbose --diff --dry-run diff --git a/.gitignore b/.gitignore index c66416c45c..ae18f26147 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ /build/ /node_modules/ /vendor/ -.php_cs.cache +.php-cs-fixer.cache composer.lock phpunit.xml phpstan.neon diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php similarity index 95% rename from .php_cs.dist rename to .php-cs-fixer.dist.php index c91ad2776a..d8d35c05cc 100644 --- a/.php_cs.dist +++ b/.php-cs-fixer.dist.php @@ -16,8 +16,6 @@ HEADER; $rules = [ - '@PHP56Migration' => true, - '@PHP56Migration:risky' => true, '@PHP70Migration' => true, '@PHP70Migration:risky' => true, '@PHP71Migration' => true, @@ -69,9 +67,12 @@ ->exclude('var') ; -return PhpCsFixer\Config::create() +$config = new PhpCsFixer\Config(); +$config ->setFinder($finder) ->setRiskyAllowed(true) ->setRules($rules) ->setUsingCache(true) ; + +return $config;