diff --git a/.gitignore b/.gitignore
index a67bde416..dc6e9582f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 /phpunit.xml
 /vendor/
 /tests/tmp/*
-/.php_cs.cache
+/.php-cs-fixer.cache
 /.phpunit.result.cache
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 86%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 7fd542a34..ee09e0477 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -4,7 +4,7 @@
     exit(0);
 }
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->in(__DIR__)
     ->exclude('vendor')
     ->exclude('tests/tmp')
@@ -13,12 +13,11 @@
     ->notName('*.tpl.php')
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules(array(
         '@PHPUnit75Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => ['syntax' => 'short'],
         'header_comment' => [
             'header' => <<<EOF
 This file is part of the Symfony MakerBundle package.
diff --git a/composer.json b/composer.json
index d18e5c38d..5a38e0e21 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "composer/semver": "^3.0@dev",
         "doctrine/doctrine-bundle": "^1.8|^2.0",
         "doctrine/orm": "^2.3",
-        "friendsofphp/php-cs-fixer": "^2.8",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "friendsoftwig/twigcs": "^4.1.0|^5.0.0",
         "symfony/http-client": "^4.3|^5.0",
         "symfony/phpunit-bridge": "^4.3|^5.0",
diff --git a/src/Resources/test/.php_cs.test b/src/Resources/test/.php_cs.test
index fc2586320..58bdca9bf 100644
--- a/src/Resources/test/.php_cs.test
+++ b/src/Resources/test/.php_cs.test
@@ -3,12 +3,11 @@
  * php-cs-fixer configuration file used to validate
  * generated code in our tests.
  */
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'native_function_invocation' => false,
-        'array_syntax' => ['syntax' => 'short'],
     ))
     ->setRiskyAllowed(true)
 ;