Skip to content

Commit 8c52560

Browse files
authored
minor #39 Uprade to slevomat/coding-standard ^7.0 (LucaGallinari)
This PR was merged into the 4.0-dev branch. Discussion ---------- I upgraded some fixers based on the [PHP-CS-Fixer Upgrade-v3 file](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/3.0/UPGRADE-v3.md) Slevomat doesn't seems to provide fixes for 6.x version so an upgrade to 7.x is necessary but sylius coding standard has it locked to 6.x. Commits ------- daf0f27 Uprade to slevomat/coding-standard ^7.0
2 parents b8f9476 + daf0f27 commit 8c52560

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": "^7.3 || ^8.0",
14-
"slevomat/coding-standard": "^6.3",
14+
"slevomat/coding-standard": "^7.0",
1515
"symplify/easy-coding-standard": "^8.0 || ^9.0"
1616
},
1717
"conflict": {

ecs.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
use PhpCsFixer\Fixer\ArrayNotation\NormalizeIndexBraceFixer;
1212
use PhpCsFixer\Fixer\ArrayNotation\NoTrailingCommaInSinglelineArrayFixer;
1313
use PhpCsFixer\Fixer\ArrayNotation\NoWhitespaceBeforeCommaInArrayFixer;
14-
use PhpCsFixer\Fixer\ArrayNotation\TrailingCommaInMultilineArrayFixer;
1514
use PhpCsFixer\Fixer\ArrayNotation\TrimArraySpacesFixer;
1615
use PhpCsFixer\Fixer\ArrayNotation\WhitespaceAfterCommaInArrayFixer;
1716
use PhpCsFixer\Fixer\Basic\BracesFixer;
1817
use PhpCsFixer\Fixer\Basic\EncodingFixer;
1918
use PhpCsFixer\Fixer\Basic\NonPrintableCharacterFixer;
20-
use PhpCsFixer\Fixer\Casing\LowercaseConstantsFixer;
19+
use PhpCsFixer\Fixer\Casing\ConstantCaseFixer;
2120
use PhpCsFixer\Fixer\Casing\LowercaseKeywordsFixer;
2221
use PhpCsFixer\Fixer\Casing\LowercaseStaticReferenceFixer;
2322
use PhpCsFixer\Fixer\Casing\MagicConstantCasingFixer;
@@ -29,7 +28,6 @@
2928
use PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer;
3029
use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
3130
use PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer;
32-
use PhpCsFixer\Fixer\ClassNotation\MethodSeparationFixer;
3331
use PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer;
3432
use PhpCsFixer\Fixer\ClassNotation\NoNullPropertyInitializationFixer;
3533
use PhpCsFixer\Fixer\ClassNotation\NoPhp4ConstructorFixer;
@@ -38,7 +36,6 @@
3836
use PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer;
3937
use PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer;
4038
use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
41-
use PhpCsFixer\Fixer\Comment\HashToSlashCommentFixer;
4239
use PhpCsFixer\Fixer\Comment\NoEmptyCommentFixer;
4340
use PhpCsFixer\Fixer\Comment\NoTrailingWhitespaceInCommentFixer;
4441
use PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer;
@@ -53,6 +50,7 @@
5350
use PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer;
5451
use PhpCsFixer\Fixer\ControlStructure\SwitchCaseSemicolonToColonFixer;
5552
use PhpCsFixer\Fixer\ControlStructure\SwitchCaseSpaceFixer;
53+
use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
5654
use PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer;
5755
use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer;
5856
use PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer;
@@ -67,28 +65,29 @@
6765
use PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveUnsetsFixer;
6866
use PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer;
6967
use PhpCsFixer\Fixer\LanguageConstruct\DirConstantFixer;
68+
use PhpCsFixer\Fixer\LanguageConstruct\ErrorSuppressionFixer;
7069
use PhpCsFixer\Fixer\LanguageConstruct\FunctionToConstantFixer;
7170
use PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer;
72-
use PhpCsFixer\Fixer\LanguageConstruct\SilencedDeprecationErrorFixer;
7371
use PhpCsFixer\Fixer\ListNotation\ListSyntaxFixer;
7472
use PhpCsFixer\Fixer\NamespaceNotation\BlankLineAfterNamespaceFixer;
7573
use PhpCsFixer\Fixer\NamespaceNotation\NoLeadingNamespaceWhitespaceFixer;
7674
use PhpCsFixer\Fixer\NamespaceNotation\SingleBlankLineBeforeNamespaceFixer;
7775
use PhpCsFixer\Fixer\Naming\NoHomoglyphNamesFixer;
7876
use PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer;
7977
use PhpCsFixer\Fixer\Operator\ConcatSpaceFixer;
78+
use PhpCsFixer\Fixer\Operator\IncrementStyleFixer;
8079
use PhpCsFixer\Fixer\Operator\NewWithBracesFixer;
8180
use PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer;
82-
use PhpCsFixer\Fixer\Operator\PreIncrementFixer;
8381
use PhpCsFixer\Fixer\Operator\StandardizeNotEqualsFixer;
8482
use PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer;
8583
use PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer;
8684
use PhpCsFixer\Fixer\Operator\UnaryOperatorSpacesFixer;
85+
use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocTagRenameFixer;
8786
use PhpCsFixer\Fixer\Phpdoc\NoBlankLinesAfterPhpdocFixer;
8887
use PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer;
8988
use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
9089
use PhpCsFixer\Fixer\Phpdoc\PhpdocIndentFixer;
91-
use PhpCsFixer\Fixer\Phpdoc\PhpdocInlineTagFixer;
90+
use PhpCsFixer\Fixer\Phpdoc\PhpdocInlineTagNormalizerFixer;
9291
use PhpCsFixer\Fixer\Phpdoc\PhpdocNoAccessFixer;
9392
use PhpCsFixer\Fixer\Phpdoc\PhpdocNoAliasTagFixer;
9493
use PhpCsFixer\Fixer\Phpdoc\PhpdocNoEmptyReturnFixer;
@@ -98,6 +97,7 @@
9897
use PhpCsFixer\Fixer\Phpdoc\PhpdocScalarFixer;
9998
use PhpCsFixer\Fixer\Phpdoc\PhpdocSeparationFixer;
10099
use PhpCsFixer\Fixer\Phpdoc\PhpdocSingleLineVarSpacingFixer;
100+
use PhpCsFixer\Fixer\Phpdoc\PhpdocTagTypeFixer;
101101
use PhpCsFixer\Fixer\Phpdoc\PhpdocTrimFixer;
102102
use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer;
103103
use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesOrderFixer;
@@ -149,7 +149,8 @@
149149

150150
$services->set(NoWhitespaceBeforeCommaInArrayFixer::class);
151151

152-
$services->set(TrailingCommaInMultilineArrayFixer::class);
152+
$services->set(TrailingCommaInMultilineFixer::class)
153+
->call('configure', [['elements' => ['arrays']]]);
153154

154155
$services->set(TrimArraySpacesFixer::class);
155156

@@ -162,7 +163,8 @@
162163

163164
$services->set(NonPrintableCharacterFixer::class);
164165

165-
$services->set(LowercaseConstantsFixer::class);
166+
$services->set(ConstantCaseFixer::class)
167+
->call('configure', [['case' => 'lower']]);
166168

167169
$services->set(LowercaseKeywordsFixer::class);
168170

@@ -187,7 +189,8 @@
187189
$services->set(ClassDefinitionFixer::class)
188190
->call('configure', [['single_item_single_line' => true, 'multi_line_extends_each_single_line' => true]]);
189191

190-
$services->set(MethodSeparationFixer::class);
192+
$services->set(ClassAttributesSeparationFixer::class)
193+
->call('configure', [['elements' => ['method']]]);
191194

192195
$services->set(NoBlankLinesAfterClassOpeningFixer::class);
193196

@@ -206,8 +209,6 @@
206209
$services->set(VisibilityRequiredFixer::class)
207210
->call('configure', [['elements' => ['const', 'property', 'method']]]);
208211

209-
$services->set(HashToSlashCommentFixer::class);
210-
211212
$services->set(NoEmptyCommentFixer::class);
212213

213214
$services->set(NoTrailingWhitespaceInCommentFixer::class);
@@ -269,7 +270,7 @@
269270

270271
$services->set(IsNullFixer::class);
271272

272-
$services->set(SilencedDeprecationErrorFixer::class);
273+
$services->set(ErrorSuppressionFixer::class);
273274

274275
$services->set(ListSyntaxFixer::class)
275276
->call('configure', [['syntax' => 'short']]);
@@ -291,7 +292,8 @@
291292

292293
$services->set(ObjectOperatorWithoutWhitespaceFixer::class);
293294

294-
$services->set(PreIncrementFixer::class);
295+
$services->set(IncrementStyleFixer::class)
296+
->call('configure', [['style' => 'pre']]);
295297

296298
$services->set(StandardizeNotEqualsFixer::class);
297299

@@ -310,7 +312,9 @@
310312

311313
$services->set(PhpdocIndentFixer::class);
312314

313-
$services->set(PhpdocInlineTagFixer::class);
315+
$services->set(GeneralPhpdocTagRenameFixer::class);
316+
$services->set(PhpdocInlineTagNormalizerFixer::class);
317+
$services->set(PhpdocTagTypeFixer::class);
314318

315319
$services->set(PhpdocNoAccessFixer::class);
316320

0 commit comments

Comments
 (0)