Merge pull request #537 from PUGX/update-fixer

update php-cs-fixer
PUGX · May 17, 2021 · 2071489 · 2071489
2 parents 5acb592 + 943d0a6
commit 2071489
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 122 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,8 +3,7 @@
 .gitattributes     export-ignore
 .github            export-ignore
 .gitignore         export-ignore
-.php_cs            export-ignore
-.php_cs.dist       export-ignore
+.php-cs-fixer*     export-ignore
 .travis.yml        export-ignore
 Makefile           export-ignore
 docker             export-ignore

diff --git a/.gitignore b/.gitignore
@@ -15,8 +15,8 @@
 ###< symfony/phpunit-bridge ###
 
 ###> friendsofphp/php-cs-fixer ###
-/.php_cs
-/.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
 ###< friendsofphp/php-cs-fixer ###
 
 ###> symfony/webpack-encore-bundle ###

diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -17,7 +17,8 @@
         'ordered_imports' => true,
         'declare_strict_types' => false,
         'final_class' => true,
-        'native_function_invocation' => true,
+        'native_function_invocation' => ['include' => ['@all']],
+        'native_constant_invocation' => false,  // TODO remove when https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/5684 is solved
         'no_superfluous_phpdoc_tags' => true,
     ])
     ->setFinder($finder)

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
     },
     "require-dev": {
         "dg/bypass-finals": "^1.3",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "jangregor/phpstan-prophecy": "^0.8",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12",