Skip to content

Commit 1f9c126

Browse files
shudd3rshudd3r
committed
Upgraded php-cs-fixer to ^3.9.5
1 parent ecfaf8a commit 1f9c126

22 files changed

Lines changed: 98 additions & 19 deletions

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"minimum-stability": "stable",
2323
"require": {
2424
"php": "^7.4",
25-
"friendsofphp/php-cs-fixer": "2.18.*",
25+
"friendsofphp/php-cs-fixer": "^3.9.5",
2626
"squizlabs/php_codesniffer": "^3.5.8",
2727
"phpunit/phpunit": "^9.5.2",
2828
"php-coveralls/php-coveralls": "^2.4.3"

‎src/Fixer/AlignedArrayValuesFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Tokens;
1618
use PhpCsFixer\Tokenizer\CT;
1719
use SplFileInfo;
@@ -29,6 +31,11 @@ public function getName(): string
2931
return 'Polymorphine/aligned_array_values';
3032
}
3133

34+
public function getDefinition(): FixerDefinitionInterface
35+
{
36+
return new FixerDefinition('Aligns arrow operator in multiline arrays.', []);
37+
}
38+
3239
public function isCandidate(Tokens $tokens): bool
3340
{
3441
return $tokens->isTokenKindFound(T_DOUBLE_ARROW);

‎src/Fixer/AlignedAssignmentsFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Tokens;
1618
use SplFileInfo;
1719

@@ -27,6 +29,11 @@ public function getName(): string
2729
return 'Polymorphine/aligned_assignments';
2830
}
2931

32+
public function getDefinition(): FixerDefinitionInterface
33+
{
34+
return new FixerDefinition('Aligns equal operator for consecutive assignments of similar type.', []);
35+
}
36+
3037
public function isCandidate(Tokens $tokens): bool
3138
{
3239
return $tokens->isTokenKindFound('=');

‎src/Fixer/AlignedMethodChainFixer.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Token;
1618
use PhpCsFixer\Tokenizer\Tokens;
1719
use SplFileInfo;
@@ -26,6 +28,11 @@ public function getName(): string
2628
return 'Polymorphine/aligned_method_chain';
2729
}
2830

31+
public function getDefinition(): FixerDefinitionInterface
32+
{
33+
return new FixerDefinition('Multiline chain method calls should be aligned to first arrow operator.', []);
34+
}
35+
2936
public function isCandidate(Tokens $tokens): bool
3037
{
3138
if (!$arrows = $tokens->findGivenKind(T_OBJECT_OPERATOR)) {
@@ -55,7 +62,7 @@ public function getPriority(): int
5562
return -40;
5663
}
5764

58-
public function fix(SplFileInfo $file, Tokens $tokens)
65+
public function fix(SplFileInfo $file, Tokens $tokens): void
5966
{
6067
$this->tokens = $tokens;
6168

‎src/Fixer/AlignedTypedPropertiesFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Tokens;
1618
use SplFileInfo;
1719

@@ -25,6 +27,11 @@ public function getName(): string
2527
return 'Polymorphine/aligned_properties';
2628
}
2729

30+
public function getDefinition(): FixerDefinitionInterface
31+
{
32+
return new FixerDefinition('Aligns variables in class declarations.', []);
33+
}
34+
2835
public function isRisky(): bool
2936
{
3037
return false;

‎src/Fixer/BraceAfterFunctionFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Token;
1618
use PhpCsFixer\Tokenizer\Tokens;
1719
use SplFileInfo;
@@ -24,6 +26,11 @@ public function getName(): string
2426
return 'Polymorphine/brace_after_method';
2527
}
2628

29+
public function getDefinition(): FixerDefinitionInterface
30+
{
31+
return new FixerDefinition('Opening brace for function starts in the same line.', []);
32+
}
33+
2734
public function isCandidate(Tokens $tokens): bool
2835
{
2936
return $tokens->isTokenKindFound(T_FUNCTION);

‎src/Fixer/BraceAfterMultilineParamMethodFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Token;
1618
use PhpCsFixer\Tokenizer\Tokens;
1719
use SplFileInfo;
@@ -31,6 +33,11 @@ public function getName(): string
3133
return 'Polymorphine/brace_after_multiline_param_method';
3234
}
3335

36+
public function getDefinition(): FixerDefinitionInterface
37+
{
38+
return new FixerDefinition('Resolves conflict between BracesFixer & MethodArgumentSpaceFixer.', []);
39+
}
40+
3441
public function isCandidate(Tokens $tokens): bool
3542
{
3643
$classConstruct = $tokens->isAnyTokenKindsFound([T_CLASS, T_TRAIT]);

‎src/Fixer/ConstructorsFirstFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Tokens;
1618
use SplFileInfo;
1719

@@ -25,6 +27,11 @@ public function getName(): string
2527
return 'Polymorphine/constructors_first';
2628
}
2729

30+
public function getDefinition(): FixerDefinitionInterface
31+
{
32+
return new FixerDefinition('Moves constructor methods (including static named constructors) to the top.', []);
33+
}
34+
2835
public function getPriority(): int
2936
{
3037
return -40;

‎src/Fixer/DeclareStrictFirstLineFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Token;
1618
use PhpCsFixer\Tokenizer\Tokens;
1719
use SplFileInfo;
@@ -26,6 +28,11 @@ public function getName(): string
2628
return 'Polymorphine/declare_strict_first_line';
2729
}
2830

31+
public function getDefinition(): FixerDefinitionInterface
32+
{
33+
return new FixerDefinition('Moves strict types declaration to first line.', []);
34+
}
35+
2936
public function getPriority(): int
3037
{
3138
return -39;

‎src/Fixer/DoubleLineBeforeClassDefinitionFixer.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
namespace Polymorphine\Dev\Fixer;
1313

1414
use PhpCsFixer\Fixer\FixerInterface;
15+
use PhpCsFixer\FixerDefinition\FixerDefinition;
16+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
1517
use PhpCsFixer\Tokenizer\Token;
1618
use PhpCsFixer\Tokenizer\Tokens;
1719
use SplFileInfo;
@@ -24,6 +26,11 @@ public function getName(): string
2426
return 'Polymorphine/double_line_before_class_definition';
2527
}
2628

29+
public function getDefinition(): FixerDefinitionInterface
30+
{
31+
return new FixerDefinition('Adds second line break before class definition.', []);
32+
}
33+
2734
public function isCandidate(Tokens $tokens): bool
2835
{
2936
return $tokens->isAnyTokenKindsFound([T_TRAIT, T_INTERFACE, T_CLASS]);

0 commit comments

Comments
 (0)