Skip to content

Commit 09e21cc

Browse files
TomasVotrubaTomasVotruba
committed
Updated ECS to commit 99562d6ac18239f1e6776c51845392e0668ab9d2
1 parent 2105622 commit 09e21cc

15 files changed

Lines changed: 64 additions & 164 deletions

File tree

‎config/set/symplify.php‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,6 @@
33
declare (strict_types=1);
44
namespace ECSPrefix202606;
55

6-
use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
7-
use Symplify\CodingStandard\Fixer\Annotation\RemoveMethodNameDuplicateDescriptionFixer;
8-
use Symplify\CodingStandard\Fixer\Annotation\RemovePHPStormAnnotationFixer;
9-
use Symplify\CodingStandard\Fixer\Annotation\RemovePropertyVariableNameDescriptionFixer;
10-
use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer;
11-
use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
12-
use Symplify\CodingStandard\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer;
13-
use Symplify\CodingStandard\Fixer\Commenting\RemoveUselessDefaultCommentFixer;
14-
use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
15-
use Symplify\CodingStandard\Fixer\Spacing\MethodChainingNewlineFixer;
16-
use Symplify\CodingStandard\Fixer\Spacing\SpaceAfterCommaHereNowDocFixer;
17-
use Symplify\CodingStandard\Fixer\Spacing\StandaloneLinePromotedPropertyFixer;
18-
use Symplify\CodingStandard\Fixer\Strict\BlankLineAfterStrictTypesFixer;
196
use Symplify\EasyCodingStandard\Config\ECSConfig;
20-
return ECSConfig::configure()->withRules([
21-
// docblocks and comments
22-
RemovePHPStormAnnotationFixer::class,
23-
ParamReturnAndVarTagMalformsFixer::class,
24-
RemoveUselessDefaultCommentFixer::class,
25-
RemoveMethodNameDuplicateDescriptionFixer::class,
26-
RemovePropertyVariableNameDescriptionFixer::class,
27-
// arrays
28-
ArrayListItemNewlineFixer::class,
29-
ArrayOpenerAndCloserNewlineFixer::class,
30-
StandaloneLinePromotedPropertyFixer::class,
31-
// newlines
32-
MethodChainingNewlineFixer::class,
33-
SpaceAfterCommaHereNowDocFixer::class,
34-
BlankLineAfterStrictTypesFixer::class,
35-
LineLengthFixer::class,
36-
])->withConfiguredRule(GeneralPhpdocAnnotationRemoveFixer::class, ['annotations' => ['throws', 'author', 'package', 'group', 'covers', 'category']]);
7+
\trigger_error('The "symplify" set is deprecated. Its rules now live in the "common" sets - use ->withPreparedSets(common: true) or the matching ->withDocblockLevel()/->withSpacesLevel()/->withArrayLevel() methods instead.', \E_USER_DEPRECATED);
8+
return ECSConfig::configure()->withRules([]);

‎packages/coding-standard/config/symplify.php‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎src/Application/Version/StaticVersionResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class StaticVersionResolver
1515
* @api
1616
* @var string
1717
*/
18-
public const PACKAGE_VERSION = '9ead38096a2af3c28540a00c14e4d3137e883fea';
18+
public const PACKAGE_VERSION = '99562d6ac18239f1e6776c51845392e0668ab9d2';
1919
/**
2020
* @api
2121
* @var string
2222
*/
23-
public const RELEASE_DATE = '2026-06-20 14:54:26';
23+
public const RELEASE_DATE = '2026-06-20 18:32:51';
2424
/**
2525
* @var int
2626
*/

‎src/Config/Level/ArrayLevel.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ final class ArrayLevel
3737
TrimArraySpacesFixer::class,
3838
NoWhitespaceInEmptyArrayFixer::class,
3939
NoMultilineWhitespaceAroundDoubleArrowFixer::class,
40-
NoTrailingCommaInSinglelineFixer::class,
41-
// syntax normalization
42-
ArraySyntaxFixer::class,
43-
ListSyntaxFixer::class,
44-
TrailingCommaInMultilineFixer::class,
4540
// invasive layout changes
4641
ArrayIndentationFixer::class,
4742
ArrayOpenerAndCloserNewlineFixer::class,

‎src/Config/Level/ControlStructuresLevel.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
use PHP_CodeSniffer\Sniffs\Sniff;
77
use PhpCsFixer\Fixer\Casing\MagicConstantCasingFixer;
88
use PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer;
9-
use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer;
109
use PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer;
1110
use PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer;
1211
use PhpCsFixer\Fixer\ControlStructure\IncludeFixer;
1312
use PhpCsFixer\Fixer\ControlStructure\NoAlternativeSyntaxFixer;
1413
use PhpCsFixer\Fixer\ControlStructure\NoSuperfluousElseifFixer;
15-
use PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer;
16-
use PhpCsFixer\Fixer\ControlStructure\SimplifiedIfReturnFixer;
1714
use PhpCsFixer\Fixer\ControlStructure\SwitchContinueToBreakFixer;
1815
use PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer;
1916
use PhpCsFixer\Fixer\FixerInterface;
@@ -23,7 +20,7 @@
2320
use PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer;
2421
use PhpCsFixer\Fixer\Operator\AssignNullCoalescingToCoalesceEqualFixer;
2522
use PhpCsFixer\Fixer\Operator\LongToShorthandOperatorFixer;
26-
use PhpCsFixer\Fixer\Operator\NewWithBracesFixer;
23+
use PhpCsFixer\Fixer\Operator\NewWithParenthesesFixer;
2724
use PhpCsFixer\Fixer\Operator\NoUselessConcatOperatorFixer;
2825
use PhpCsFixer\Fixer\Operator\NoUselessNullsafeOperatorFixer;
2926
use PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer;
@@ -54,7 +51,7 @@ final class ControlStructuresLevel
5451
IsNullFixer::class,
5552
FunctionToConstantFixer::class,
5653
StandardizeIncrementFixer::class,
57-
NewWithBracesFixer::class,
54+
NewWithParenthesesFixer::class,
5855
NullableTypeDeclarationForDefaultNullValueFixer::class,
5956
// operator spacing and simplification
6057
ObjectOperatorWithoutWhitespaceFixer::class,
@@ -69,18 +66,11 @@ final class ControlStructuresLevel
6966
ExplicitIndirectVariableFixer::class,
7067
// class-level tweaks
7168
SelfAccessorFixer::class,
72-
ClassDefinitionFixer::class,
73-
SingleClassElementPerStatementFixer::class,
7469
// control-flow normalization
7570
IncludeFixer::class,
7671
NoAlternativeSyntaxFixer::class,
7772
NoSuperfluousElseifFixer::class,
7873
SwitchContinueToBreakFixer::class,
79-
// invasive control-flow / ordering changes
80-
YodaStyleFixer::class,
81-
NoUselessElseFixer::class,
82-
SimplifiedIfReturnFixer::class,
83-
OrderedClassElementsFixer::class,
8474
];
8575
/**
8676
* @var array<class-string<Sniff|FixerInterface>, mixed[]>

‎src/Config/Level/DocblockLevel.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpCsFixer\Fixer\Comment\NoTrailingWhitespaceInCommentFixer;
88
use PhpCsFixer\Fixer\FixerInterface;
99
use PhpCsFixer\Fixer\Phpdoc\AlignMultilineCommentFixer;
10+
use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
1011
use PhpCsFixer\Fixer\Phpdoc\NoBlankLinesAfterPhpdocFixer;
1112
use PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer;
1213
use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
@@ -26,6 +27,9 @@
2627
use PhpCsFixer\Fixer\Phpdoc\PhpdocTrimFixer;
2728
use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer;
2829
use PhpCsFixer\Fixer\Phpdoc\PhpdocVarWithoutNameFixer;
30+
use Symplify\CodingStandard\Fixer\Annotation\RemoveMethodNameDuplicateDescriptionFixer;
31+
use Symplify\CodingStandard\Fixer\Annotation\RemovePHPStormAnnotationFixer;
32+
use Symplify\CodingStandard\Fixer\Annotation\RemovePropertyVariableNameDescriptionFixer;
2933
use Symplify\CodingStandard\Fixer\Commenting\AddMissingParamNameFixer;
3034
use Symplify\CodingStandard\Fixer\Commenting\AddMissingVarNameFixer;
3135
use Symplify\CodingStandard\Fixer\Commenting\DoubleAsteriskInlineVarFixer;
@@ -90,10 +94,13 @@ final class DocblockLevel
9094
NoEmptyPhpdocFixer::class,
9195
PhpdocNoEmptyReturnFixer::class,
9296
RemoveUselessDefaultCommentFixer::class,
93-
NoSuperfluousPhpdocTagsFixer::class,
97+
// annotation cleanup (from deprecated "symplify" set)
98+
RemovePHPStormAnnotationFixer::class,
99+
RemoveMethodNameDuplicateDescriptionFixer::class,
100+
RemovePropertyVariableNameDescriptionFixer::class,
94101
];
95102
/**
96103
* @var array<class-string<Sniff|FixerInterface>, mixed[]>
97104
*/
98-
public const RULE_CONFIGURATIONS = [NoSuperfluousPhpdocTagsFixer::class => ['remove_inheritdoc' => \true, 'allow_mixed' => \true]];
105+
public const RULE_CONFIGURATIONS = [NoSuperfluousPhpdocTagsFixer::class => ['remove_inheritdoc' => \true, 'allow_mixed' => \true], GeneralPhpdocAnnotationRemoveFixer::class => ['annotations' => ['author', 'package', 'group', 'category']]];
99106
}

‎src/Config/Level/SpacesLevel.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
use PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer;
2929
use PhpCsFixer\Fixer\Whitespace\TypeDeclarationSpacesFixer;
3030
use PhpCsFixer\Fixer\Whitespace\TypesSpacesFixer;
31+
use Symplify\CodingStandard\Fixer\Spacing\MethodChainingNewlineFixer;
32+
use Symplify\CodingStandard\Fixer\Spacing\SpaceAfterCommaHereNowDocFixer;
3133
use Symplify\CodingStandard\Fixer\Spacing\StandaloneLinePromotedPropertyFixer;
34+
use Symplify\CodingStandard\Fixer\Strict\BlankLineAfterStrictTypesFixer;
3235
/**
3336
* Key 0 = level 0
3437
* Key 22 = level 22
@@ -64,16 +67,14 @@ final class SpacesLevel
6467
ReturnTypeDeclarationFixer::class,
6568
TypeDeclarationSpacesFixer::class,
6669
TypesSpacesFixer::class,
67-
SuperfluousWhitespaceSniff::class,
68-
// configurable, more impactful
69-
ConcatSpaceFixer::class,
70-
BinaryOperatorSpacesFixer::class,
7170
// most invasive structural changes
7271
MethodChainingIndentationFixer::class,
7372
StandaloneLinePromotedPropertyFixer::class,
7473
MethodArgumentSpaceFixer::class,
75-
ClassAttributesSeparationFixer::class,
76-
NoExtraBlankLinesFixer::class,
74+
// newline spacing (from deprecated "symplify" set)
75+
BlankLineAfterStrictTypesFixer::class,
76+
SpaceAfterCommaHereNowDocFixer::class,
77+
MethodChainingNewlineFixer::class,
7778
];
7879
/**
7980
* Configurations matching the spaces set, applied when a configurable rule

‎src/Configuration/ECSConfigBuilder.php‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
use Symplify\EasyCodingStandard\Configuration\Levels\LevelRulesResolver;
2828
use Symplify\EasyCodingStandard\Exception\Configuration\InitializationException;
2929
use Symplify\EasyCodingStandard\Exception\Configuration\SuperfluousConfigurationException;
30-
use Symplify\EasyCodingStandard\Exception\DeprecatedException;
3130
use Symplify\EasyCodingStandard\ValueObject\Option;
3231
use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
3332
/**
@@ -205,7 +204,10 @@ public function withPreparedSets(
205204
bool $psr12 = \false,
206205
/** @see SetList::COMMON */
207206
bool $common = \false,
208-
/** @see SetList::SYMPLIFY */
207+
/**
208+
* @deprecated rules moved to the "common" sets. Use common: true or the with*Level() methods instead.
209+
* @see SetList::SYMPLIFY
210+
*/
209211
bool $symplify = \false,
210212
/** @see SetList::LARAVEL */
211213
bool $laravel = \false,
@@ -226,16 +228,6 @@ public function withPreparedSets(
226228
bool $casing = \false,
227229
/** @see SetList::CLEANUP */
228230
bool $cleanup = \false,
229-
/**
230-
* @deprecated as never worked, used different rules. Use Rector instead.
231-
* @see SetList::PHPUNIT
232-
*/
233-
bool $phpunit = \false,
234-
/**
235-
* @deprecated as dangerous without context. Use Rector instead.
236-
* @see SetList::STRICT
237-
*/
238-
bool $strict = \false,
239231
/** @see SetList::CLEAN_CODE */
240232
bool $cleanCode = \false
241233
): self
@@ -268,9 +260,6 @@ public function withPreparedSets(
268260
if ($controlStructures) {
269261
$this->sets[] = SetList::CONTROL_STRUCTURES;
270262
}
271-
if ($phpunit) {
272-
throw new DeprecatedException('The "phpunit" set is deprecated as it is dangerous to run without proper context. Please use Rector instead.');
273-
}
274263
if ($comments) {
275264
$this->sets[] = SetList::COMMENTS;
276265
}
@@ -281,15 +270,12 @@ public function withPreparedSets(
281270
$this->sets[] = SetList::CLEANUP;
282271
}
283272
}
284-
if ($strict) {
285-
// throw exception, as deprecated
286-
throw new DeprecatedException('The "strict" set is deprecated as it is dangerous without context. Remove the "strict: true" from ->withPreparedSets(strict: true, ...) call in "ecs.php" and use Rector instead to make sure you are not breaking your code.');
287-
}
288273
if ($cleanCode) {
289274
$this->sets[] = SetList::CLEAN_CODE;
290275
}
291276
if ($symplify) {
292-
$this->sets[] = SetList::SYMPLIFY;
277+
// soft-deprecated: rules moved to the "common" sets, still loaded for backward compatibility
278+
trigger_error('The "symplify" set is deprecated. Its rules now live in the "common" sets - use ->withPreparedSets(common: true) or the matching ->withDocblockLevel()/->withSpacesLevel()/->withArrayLevel() methods instead.', \E_USER_DEPRECATED);
293279
}
294280
if ($laravel) {
295281
$this->sets[] = SetList::LARAVEL;
@@ -485,15 +471,6 @@ public function withPhpCsFixerSets(bool $doctrineAnnotation = \false, bool $per
485471
*/
486472
public function withSets(array $sets): self
487473
{
488-
// report deprecated STRICT set
489-
foreach ($sets as $set) {
490-
if ($set === SetList::STRICT) {
491-
throw new DeprecatedException('The "strict" set is deprecated as it is dangerous without context. Use Rector instead to make sure you are not breaking your code');
492-
}
493-
if ($set === SetList::PHPUNIT) {
494-
throw new DeprecatedException('The "phpunit" set is deprecated as it is dangerous to run without proper context. Please use Rector instead.');
495-
}
496-
}
497474
$this->sets = array_merge($this->sets, $sets);
498475
return $this;
499476
}

‎src/Exception/DeprecatedException.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
namespace Symplify\EasyCodingStandard\Exception;
55

66
use Exception;
7+
/**
8+
* @api to be used
9+
*/
710
final class DeprecatedException extends Exception
811
{
912
}

‎src/ValueObject/Set/SetList.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ final class SetList
2020
public const CLEAN_CODE = __DIR__ . '/../../../config/set/clean-code.php';
2121
/**
2222
* @api
23+
* @deprecated rules moved to the "common" sets (array, docblock, spaces). Use SetList::COMMON instead.
2324
* @var string
2425
*/
2526
public const SYMPLIFY = __DIR__ . '/../../../config/set/symplify.php';
@@ -53,23 +54,11 @@ final class SetList
5354
* @var string
5455
*/
5556
public const NAMESPACES = __DIR__ . '/../../../config/set/common/namespaces.php';
56-
/**
57-
* @api
58-
* @deprecated as dangerous without context. Use Rector instead.
59-
* @var string
60-
*/
61-
public const PHPUNIT = __DIR__ . '/../../../config/set/common/phpunit.php';
6257
/**
6358
* @api
6459
* @var string
6560
*/
6661
public const SPACES = __DIR__ . '/../../../config/set/common/spaces.php';
67-
/**
68-
* @api
69-
* @deprecated as dangerous without context. Use Rector instead.
70-
* @var string
71-
*/
72-
public const STRICT = __DIR__ . '/../../../config/set/common/strict.php';
7362
/**
7463
* @api
7564
* @var string

0 commit comments

Comments
 (0)