From 0df293d6e4c9abb38a537a2b07836e9ca57430ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Tue, 30 Apr 2019 13:15:40 +0200 Subject: [PATCH] Move to php-cs-fixer 2.14.2 for PHP 7.3 compat & improved CS --- .php_cs | 6 +++++- composer.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.php_cs b/.php_cs index 74cfb3d9..96697856 100644 --- a/.php_cs +++ b/.php_cs @@ -6,7 +6,6 @@ return PhpCsFixer\Config::create() '@Symfony' => true, '@Symfony:risky' => true, 'concat_space' => ['spacing' => 'one'], - 'array_syntax' => false, 'simplified_null_return' => false, 'phpdoc_align' => false, 'phpdoc_separation' => false, @@ -19,6 +18,11 @@ return PhpCsFixer\Config::create() 'space_after_semicolon' => false, 'yoda_style' => false, 'no_break_comment' => false, + + // 2019 style updates with cs-fixer 2.14, all above are in sync with kernel + '@PHPUnit57Migration:risky' => true, + 'array_syntax' => ['syntax' => 'short'], + 'static_lambda' => true, ]) ->setRiskyAllowed(true) ->setFinder( diff --git a/composer.json b/composer.json index d0f815f0..28c0ca10 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "phpunit/phpunit": "^5.7.27", "matthiasnoback/symfony-dependency-injection-test": "^1.2.0", "ezsystems/ezplatform-solr-search-engine": "^1.5.7", - "friendsofphp/php-cs-fixer": "~2.7.5" + "friendsofphp/php-cs-fixer": "v2.14.2" }, "autoload": { "psr-4": {