Skip to content

Commit f2a85cf

Browse files
authored
Merge pull request #9 from unixslayer/master
removing deprecations
2 parents 71b386b + 5837ed4 commit f2a85cf

File tree

3 files changed

+30
-17
lines changed

3 files changed

+30
-17
lines changed
File renamed without changes.

src/Prooph.php

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/**
44
* This file is part of `prooph/php-cs-fixer-config`.
5-
* (c) 2016-2020 prooph software GmbH <[email protected]>
6-
* (c) 2016-2020 Sascha-Oliver Prolic <[email protected]>
5+
* (c) 2016-2021 prooph software GmbH <[email protected]>
6+
* (c) 2016-2021 Sascha-Oliver Prolic <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -30,26 +30,31 @@ public function getRules(): array
3030
'@PSR2' => true,
3131
'array_syntax' => ['syntax' => 'short'],
3232
'binary_operator_spaces' => [
33-
'align_double_arrow' => false,
34-
'align_equals' => false,
33+
'operators' => [
34+
'=>' => 'single_space',
35+
'=' => 'single_space',
36+
],
3537
],
3638
'blank_line_after_opening_tag' => true,
3739
'blank_line_after_namespace' => true,
38-
'blank_line_before_return' => true,
40+
'blank_line_before_statement' => true,
3941
'braces' => true,
4042
'cast_spaces' => true,
4143
'class_definition' => true,
4244
'combine_consecutive_unsets' => true,
4345
'concat_space' => false,
4446
'declare_strict_types' => true,
47+
'echo_tag_syntax' => [
48+
'format' => 'long',
49+
],
4550
'elseif' => true,
4651
'encoding' => true,
4752
'full_opening_tag' => true,
4853
'function_declaration' => true,
4954
'function_typehint_space' => true,
50-
'hash_to_slash_comment' => true,
55+
'single_line_comment_style' => true,
5156
'header_comment' => [
52-
'commentType' => 'PHPDoc',
57+
'comment_type' => 'PHPDoc',
5358
'header' => 'Prooph was here at `%package%` in `%year%`! Please create a .docheader in the project root and run `composer cs-fix`',
5459
'location' => 'after_open',
5560
'separate' => 'both',
@@ -58,25 +63,28 @@ public function getRules(): array
5863
'indentation_type' => true,
5964
'linebreak_after_opening_tag' => true,
6065
'line_ending' => true,
61-
'lowercase_constants' => true,
66+
'constant_case' => [
67+
'case' => 'lower',
68+
],
6269
'lowercase_keywords' => true,
6370
'method_argument_space' => true,
64-
'method_separation' => true,
71+
'class_attributes_separation' => true,
6572
'modernize_types_casting' => true,
73+
'multiline_whitespace_before_semicolons' => [
74+
'strategy' => 'no_multi_line',
75+
],
6676
'native_function_casing' => true,
6777
'native_function_invocation' => true,
6878
'new_with_braces' => true,
6979
'no_alias_functions' => true,
7080
'no_blank_lines_after_class_opening' => true,
7181
'no_closing_tag' => true,
7282
'no_empty_statement' => true,
73-
'no_extra_consecutive_blank_lines' => true,
83+
'no_extra_blank_lines' => true,
7484
'no_leading_import_slash' => true,
7585
'no_leading_namespace_whitespace' => true,
7686
'no_multiline_whitespace_around_double_arrow' => true,
77-
'no_multiline_whitespace_before_semicolons' => true,
7887
'no_short_bool_cast' => true,
79-
'no_short_echo_tag' => true,
8088
'no_singleline_whitespace_before_semicolons' => true,
8189
'no_spaces_around_offset' => true,
8290
'no_trailing_comma_in_list_call' => true,
@@ -95,8 +103,9 @@ public function getRules(): array
95103
'object_operator_without_whitespace' => true,
96104
'ordered_imports' => true,
97105
'phpdoc_indent' => true,
98-
'phpdoc_inline_tag' => true,
99-
'psr4' => true,
106+
'phpdoc_inline_tag_normalizer' => true,
107+
'phpdoc_tag_type' => true,
108+
'psr_autoloading' => true,
100109
'return_type_declaration' => true,
101110
'semicolon_after_instruction' => true,
102111
'short_scalar_cast' => true,
@@ -111,7 +120,11 @@ public function getRules(): array
111120
'switch_case_semicolon_to_colon' => true,
112121
'switch_case_space' => true,
113122
'ternary_operator_spaces' => true,
114-
'trailing_comma_in_multiline_array' => true,
123+
'trailing_comma_in_multiline' => [
124+
'elements' => [
125+
'arrays',
126+
],
127+
],
115128
'trim_array_spaces' => true,
116129
'unary_operator_spaces' => true,
117130
'visibility_required' => true,

tests/ProophTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/**
44
* This file is part of `prooph/php-cs-fixer-config`.
5-
* (c) 2016-2020 prooph software GmbH <[email protected]>
6-
* (c) 2016-2020 Sascha-Oliver Prolic <[email protected]>
5+
* (c) 2016-2021 prooph software GmbH <[email protected]>
6+
* (c) 2016-2021 Sascha-Oliver Prolic <[email protected]>
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.

0 commit comments

Comments
 (0)