Skip to content

Commit c4f7ba9

Browse files
committed
minor #867 [ci] upgrade php-cs-fixer 2.x -> 3.0 (jrushlow)
This PR was squashed before being merged into the 1.0-dev branch. Discussion ---------- [ci] upgrade php-cs-fixer 2.x -> 3.0 - [ ] depends on symfony/recipes#942 - [x] depends on #868 - [x] depends on #869 Commits ------- 2396836 [ci] upgrade php-cs-fixer 2.x -> 3.0
2 parents c981ac2 + 2396836 commit c4f7ba9

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
/phpunit.xml
33
/vendor/
44
/tests/tmp/*
5-
/.php_cs.cache
5+
/.php-cs-fixer.cache
66
/.phpunit.result.cache

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
exit(0);
55
}
66

7-
$finder = PhpCsFixer\Finder::create()
7+
$finder = (new PhpCsFixer\Finder())
88
->in(__DIR__)
99
->exclude('vendor')
1010
->exclude('tests/tmp')
@@ -13,12 +13,11 @@
1313
->notName('*.tpl.php')
1414
;
1515

16-
return PhpCsFixer\Config::create()
16+
return (new PhpCsFixer\Config())
1717
->setRules(array(
1818
'@PHPUnit75Migration:risky' => true,
1919
'@Symfony' => true,
2020
'@Symfony:risky' => true,
21-
'array_syntax' => ['syntax' => 'short'],
2221
'header_comment' => [
2322
'header' => <<<EOF
2423
This file is part of the Symfony MakerBundle package.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"composer/semver": "^3.0@dev",
3030
"doctrine/doctrine-bundle": "^1.8|^2.0",
3131
"doctrine/orm": "^2.3",
32-
"friendsofphp/php-cs-fixer": "^2.8",
32+
"friendsofphp/php-cs-fixer": "^3.0",
3333
"friendsoftwig/twigcs": "^4.1.0|^5.0.0",
3434
"symfony/http-client": "^4.3|^5.0",
3535
"symfony/phpunit-bridge": "^4.3|^5.0",

src/Resources/test/.php_cs.test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
* php-cs-fixer configuration file used to validate
44
* generated code in our tests.
55
*/
6-
return PhpCsFixer\Config::create()
6+
return (new PhpCsFixer\Config())
77
->setRules(array(
88
'@Symfony' => true,
99
'@Symfony:risky' => true,
1010
'native_function_invocation' => false,
11-
'array_syntax' => ['syntax' => 'short'],
1211
))
1312
->setRiskyAllowed(true)
1413
;

0 commit comments

Comments
 (0)