Merge 13da3d7 into afa4193

liip · May 22, 2021 · 4cf9499 · 4cf9499
2 parents afa4193 + 13da3d7
commit 4cf9499
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -154,7 +154,7 @@ into the upstream repository is the same.
  * [General GitHub documentation][gh-help]
  * [GitHub pull request documentation][gh-help-pr]
 
-[cs-conf]:       ../.php_cs.dist
+[cs-conf]:       ../.php-cs-fixer.dist.php
 [cs]:            http://cs.sensiolabs.org/
 [gh-help]:       https://help.github.com
 [gh-help-pr]:    https://help.github.com/send-pull-requests

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -19,4 +19,4 @@ jobs:
           tools: php-cs-fixer
 
       - name: Run PHP-CS-Fixer
-        run: php-cs-fixer fix --dry-run --diff --diff-format udiff
+        run: php-cs-fixer fix --dry-run --diff
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -21,7 +21,7 @@
 file that was distributed with this source code.
 HEADER;
 
-return Config::create()
+return (new Config())
     ->setUsingCache(true)
     ->setRiskyAllowed(true)
     ->setFinder((new Finder())->in(__DIR__))
@@ -57,7 +57,7 @@
             'strategy' => 'no_multi_line',
         ],
         'no_php4_constructor' => true,
-        'no_short_echo_tag' => true,
+        'echo_tag_syntax' => true,
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
@@ -85,7 +85,7 @@
         'php_unit_test_class_requires_covers' => true,
         'phpdoc_order' => true,
         'phpdoc_summary' => false,
-        'psr4' => true,
+        'psr_autoloading' => true,
         'semicolon_after_instruction' => true,
         'strict_comparison' => true,
         'strict_param' => true,