Merge pull request #128 from maxmind/greg/update-php-cs-fixer

Upgrade to php-cs-fixer 3.0

Author: rafl

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Lint with php-cs-fixer
-        run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --config=.php_cs
+        run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run
 
       - name: Lint with phpcs
         run: vendor/bin/phpcs --standard=.phpcs-ruleset.xml src/

.php_cs .php-cs-fixer.php.php_cs renamed to .php-cs-fixer.php

@@ -1,6 +1,8 @@
 <?php
 
-return PhpCsFixer\Config::create()
+$config = new PhpCsFixer\Config();
+
+return $config
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
@@ -19,13 +21,10 @@
         'increment_style' => false,
         'list_syntax' => ['syntax' => 'short'],
         'multiline_whitespace_before_semicolons' => false,
-        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
-        'no_short_echo_tag' => true,
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => true,
-        'pre_increment' => false,
         'php_unit_strict' => true,
         'php_unit_test_class_requires_covers' => true,
         'phpdoc_add_missing_param_annotation' => true,

composer.json

@@ -24,7 +24,7 @@
         "ext-maxminddb": "<1.10.1,>=2.0.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "*",
+        "friendsofphp/php-cs-fixer": "3.*",
         "phpunit/phpunit": ">=8.0.0,<10.0.0",
         "php-coveralls/php-coveralls": "^2.1",
         "phpunit/phpcov": ">=6.0.0",