|
2 | 2 |
|
3 | 3 | /** @var PhpCsFixer\Config $config */
|
4 | 4 | if (isset($_SERVER['argv']) && $_SERVER['argv'][3]) {
|
5 |
| - $config = require dirname($_SERVER['argv'][3], 3) . '/.php_cs.dist'; |
| 5 | + $config = require dirname($_SERVER['argv'][3], 3) . '/.php-cs-fixer.dist.php'; |
6 | 6 | } else {
|
7 |
| - $config = require __DIR__ . '/../../../.php_cs.dist'; |
| 7 | + $config = require __DIR__ . '/../../../.php-cs-fixer.dist.php'; |
8 | 8 | }
|
9 | 9 |
|
10 | 10 | $originalRules = $config->getRules();
|
|
14 | 14 | // Commented rules are released, but not in the version of PHP CS fixer Magento supports
|
15 | 15 | $extensionRules = [
|
16 | 16 | 'blank_line_after_opening_tag' => true,
|
17 |
| - 'blank_line_before_return' => true, |
| 17 | + 'blank_line_before_statement' => true, |
18 | 18 | 'cast_spaces' => true,
|
19 | 19 | 'combine_consecutive_unsets' => true,
|
20 | 20 | 'mb_str_functions' => true,
|
|
23 | 23 | 'no_empty_statement' => true,
|
24 | 24 | 'no_multiline_whitespace_around_double_arrow' => true,
|
25 | 25 | 'no_short_bool_cast' => true,
|
26 |
| - 'no_short_echo_tag' => true, |
| 26 | + 'echo_tag_syntax' => true, |
27 | 27 | // 'no_superfluous_phpdoc_tags' => true,
|
28 | 28 | 'no_unneeded_control_parentheses' => true,
|
29 | 29 | 'no_unreachable_default_argument_value' => true,
|
|
37 | 37 | 'not_operator_with_space' => false,
|
38 | 38 | 'object_operator_without_whitespace' => true,
|
39 | 39 | 'phpdoc_annotation_without_dot' => true,
|
| 40 | + 'general_phpdoc_tag_rename' => true, |
| 41 | + 'phpdoc_inline_tag_normalizer' => true, |
| 42 | + 'phpdoc_tag_type' => true, |
40 | 43 | 'phpdoc_inline_tag' => true,
|
41 | 44 | 'phpdoc_order' => true,
|
42 | 45 | 'phpdoc_scalar' => true,
|
43 | 46 | 'phpdoc_separation' => true,
|
44 | 47 | 'phpdoc_single_line_var_spacing' => true,
|
45 | 48 | 'protected_to_private' => true,
|
46 |
| - 'psr4' => true, |
| 49 | + 'psr_autoloading' => true, |
47 | 50 | 'short_scalar_cast' => true, // ?
|
48 | 51 | 'single_blank_line_before_namespace' => true,
|
49 | 52 | 'single_quote' => true,
|
50 | 53 | 'space_after_semicolon' => true,
|
51 | 54 | 'standardize_not_equals' => true,
|
52 | 55 | 'ternary_operator_spaces' => true,
|
53 |
| - 'trailing_comma_in_multiline_array' => true, |
| 56 | + 'trailing_comma_in_multiline' => true, |
54 | 57 | 'trim_array_spaces' => true,
|
55 | 58 | ];
|
56 | 59 |
|
|
0 commit comments