Skip to content

Commit 90c6e25

Browse files
committed
Updated to PHP-CS-Fixer ^2.5
1 parent ad16002 commit 90c6e25

File tree

4 files changed

+4
-175
lines changed

4 files changed

+4
-175
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.0",
14-
"friendsofphp/php-cs-fixer": "^2.4"
14+
"friendsofphp/php-cs-fixer": "^2.5"
1515
},
1616
"require-dev": {
1717
"phpunit/phpunit": "^5.7",

lib/Config.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public function __construct(bool $version2 = true)
1919
new FinalInternalClassFixer(),
2020
new FunctionReferenceSpaceFixer(),
2121
new InlineCommentSpacerFixer(),
22-
new NoUnneededFinalMethodFixer(),
2322
new PhpFileOnlyProxyFixer(new MainFixer\Basic\BracesFixer()),
2423
new PhpFileOnlyProxyFixer(new MainFixer\Semicolon\SemicolonAfterInstructionFixer()),
2524
new PhpFileOnlyProxyFixer(new MainFixer\Semicolon\SpaceAfterSemicolonFixer()),
@@ -31,7 +30,6 @@ public function __construct(bool $version2 = true)
3130
'Slam/final_internal_class' => $version2,
3231
'Slam/function_reference_space' => true,
3332
'Slam/inline_comment_spacer' => true,
34-
'Slam/no_unneeded_final_method' => true,
3533
'Slam/php_only_braces' => true,
3634
'Slam/php_only_declare_strict_types' => $version2,
3735
'Slam/php_only_semicolon_after_instruction' => true,
@@ -131,11 +129,14 @@ public function __construct(bool $version2 = true)
131129
'no_spaces_after_function_name' => true,
132130
'no_spaces_around_offset' => true,
133131
'no_spaces_inside_parenthesis' => true,
132+
'no_superfluous_elseif' => true,
134133
'no_trailing_comma_in_list_call' => true,
135134
'no_trailing_comma_in_singleline_array' => true,
136135
'no_trailing_whitespace' => true,
137136
'no_trailing_whitespace_in_comment' => true,
138137
'no_unneeded_control_parentheses' => $version2,
138+
'no_unneeded_curly_braces' => true,
139+
'no_unneeded_final_method' => true,
139140
'no_unreachable_default_argument_value' => true,
140141
'no_unused_imports' => true,
141142
'no_useless_else' => true,

lib/NoUnneededFinalMethodFixer.php

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

tests/NoUnneededFinalMethodFixerTest.php

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

0 commit comments

Comments
 (0)