Merge pull request #312 from nucleos/dependabot/composer/vendor-bin/tools/friendsofphp/php-cs-fixer-3.0.0

nucleos-bot · web-flow · commit 7b49bb0f119b · 2021-05-24T12:08:46.000+02:00
Bump friendsofphp/php-cs-fixer from 2.18.6 to 3.0.0 in /vendor-bin/tools
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 coverage
 composer.lock
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -13,7 +13,7 @@
     ->in([ __DIR__.'/src',  __DIR__.'/tests'])
 ;
 
-$config = PhpCsFixer\Config::create()
+$config = (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
diff --git a/composer.json b/composer.json
@@ -84,7 +84,7 @@
         ],
         "coverage": "vendor/bin/phpunit --colors=always --coverage-clover=build/logs/clover.xml",
         "cs": "PHP_CS_FIXER_IGNORE_ENV=1 && vendor/bin/php-cs-fixer fix --verbose",
-        "cs-diff": "PHP_CS_FIXER_IGNORE_ENV=1 && vendor/bin/php-cs-fixer fix  --verbose --diff --diff-format=udiff --dry-run",
+        "cs-diff": "PHP_CS_FIXER_IGNORE_ENV=1 && vendor/bin/php-cs-fixer fix  --verbose --diff --dry-run",
         "deps": "vendor/bin/composer-require-checker check --config-file composer-require.json composer.json",
         "infection": "vendor/bin/infection",
         "lint": [
diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -3,7 +3,7 @@
     "type": "project",
     "description": "Development tools that do not conflict the project dependencies",
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "maglnet/composer-require-checker": "^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpmd/phpmd": "^2.9",
diff --git a/vendor-bin/tools/composer.lock b/vendor-bin/tools/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.php_cs.cache`
	`1`	`+.php-cs-fixer.cache`
`2`	`2`	`.phpunit.result.cache`
`3`	`3`	`coverage`
`4`	`4`	`composer.lock`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`->in([ __DIR__.'/src', __DIR__.'/tests'])`
`14`	`14`	`;`
`15`	`15`
`16`		`-$config = PhpCsFixer\Config::create()`
	`16`	`+$config = (new PhpCsFixer\Config())`
`17`	`17`	`->setRiskyAllowed(true)`
`18`	`18`	`->setRules([`
`19`	`19`	`'@Symfony' => true,`