Skip to content

Commit f6dd565

Browse files
MGatnerMGatner
authored
Merge pull request #6636 from codeigniter4/develop
4.2.7 Ready code
2 parents 265ed2f + fbdd32d commit f6dd565

181 files changed

Lines changed: 5517 additions & 4239 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
<!--
2+
13
Each pull request should address a single issue and have a meaningful title.
24
35
- All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
46
- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
57
8+
-->
69
**Description**
710
Explain what you have changed, and why.
811

‎.php-cs-fixer.dist.php‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -38,44 +38,7 @@
3838
__DIR__ . '/spark',
3939
]);
4040

41-
$overrides = [
42-
// <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
43-
'blank_line_between_import_groups' => true,
44-
'class_definition' => [
45-
'multi_line_extends_each_single_line' => true,
46-
'single_item_single_line' => true,
47-
'single_line' => true,
48-
'space_before_parenthesis' => true,
49-
'inline_constructor_arguments' => true,
50-
],
51-
'control_structure_braces' => true,
52-
'no_multiple_statements_per_line' => true,
53-
'no_trailing_comma_in_singleline' => [
54-
'elements' => [
55-
'arguments',
56-
'array_destructuring',
57-
'array',
58-
'group_import',
59-
],
60-
],
61-
'no_useless_nullsafe_operator' => true,
62-
'phpdoc_separation' => [
63-
'groups' => [
64-
['immutable', 'psalm-immutable'],
65-
['param', 'phpstan-param', 'psalm-param'],
66-
['phpstan-pure', 'psalm-pure'],
67-
['readonly', 'psalm-readonly'],
68-
['return', 'phpstan-return', 'psalm-return'],
69-
['template', 'phpstan-template', 'psalm-template'],
70-
['template-covariant', 'phpstan-template-covariant', 'psalm-template-covariant'],
71-
['phpstan-type', 'psalm-type'],
72-
['var', 'phpstan-var', 'psalm-var'],
73-
],
74-
],
75-
'single_line_comment_spacing' => true,
76-
'statement_indentation' => true,
77-
// >>>>>>>>>>>>>>>>>>>>>>>>>
78-
];
41+
$overrides = [];
7942

8043
$options = [
8144
'cacheFile' => 'build/.php-cs-fixer.cache',

‎.php-cs-fixer.no-header.php‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,7 @@
3030
__DIR__ . '/admin/starter/builds',
3131
]);
3232

33-
$overrides = [
34-
// <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
35-
'blank_line_between_import_groups' => true,
36-
'class_definition' => [
37-
'multi_line_extends_each_single_line' => true,
38-
'single_item_single_line' => true,
39-
'single_line' => true,
40-
'space_before_parenthesis' => true,
41-
'inline_constructor_arguments' => true,
42-
],
43-
'control_structure_braces' => true,
44-
'no_multiple_statements_per_line' => true,
45-
'no_trailing_comma_in_singleline' => [
46-
'elements' => [
47-
'arguments',
48-
'array_destructuring',
49-
'array',
50-
'group_import',
51-
],
52-
],
53-
'no_useless_nullsafe_operator' => true,
54-
'phpdoc_separation' => [
55-
'groups' => [
56-
['immutable', 'psalm-immutable'],
57-
['param', 'phpstan-param', 'psalm-param'],
58-
['phpstan-pure', 'psalm-pure'],
59-
['readonly', 'psalm-readonly'],
60-
['return', 'phpstan-return', 'psalm-return'],
61-
['template', 'phpstan-template', 'psalm-template'],
62-
['template-covariant', 'phpstan-template-covariant', 'psalm-template-covariant'],
63-
['phpstan-type', 'psalm-type'],
64-
['var', 'phpstan-var', 'psalm-var'],
65-
],
66-
],
67-
'single_line_comment_spacing' => true,
68-
'statement_indentation' => true,
69-
// >>>>>>>>>>>>>>>>>>>>>>>>>
70-
];
33+
$overrides = [];
7134

7235
$options = [
7336
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',

‎.php-cs-fixer.user-guide.php‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,42 +33,6 @@
3333
'php_unit_internal_class' => false,
3434
'no_unused_imports' => false,
3535
'class_attributes_separation' => false,
36-
// <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
37-
'blank_line_between_import_groups' => true,
38-
'class_definition' => [
39-
'multi_line_extends_each_single_line' => true,
40-
'single_item_single_line' => true,
41-
'single_line' => true,
42-
'space_before_parenthesis' => true,
43-
'inline_constructor_arguments' => true,
44-
],
45-
'control_structure_braces' => true,
46-
'no_multiple_statements_per_line' => true,
47-
'no_trailing_comma_in_singleline' => [
48-
'elements' => [
49-
'arguments',
50-
'array_destructuring',
51-
'array',
52-
'group_import',
53-
],
54-
],
55-
'no_useless_nullsafe_operator' => true,
56-
'phpdoc_separation' => [
57-
'groups' => [
58-
['immutable', 'psalm-immutable'],
59-
['param', 'phpstan-param', 'psalm-param'],
60-
['phpstan-pure', 'psalm-pure'],
61-
['readonly', 'psalm-readonly'],
62-
['return', 'phpstan-return', 'psalm-return'],
63-
['template', 'phpstan-template', 'psalm-template'],
64-
['template-covariant', 'phpstan-template-covariant', 'psalm-template-covariant'],
65-
['phpstan-type', 'psalm-type'],
66-
['var', 'phpstan-var', 'psalm-var'],
67-
],
68-
],
69-
'single_line_comment_spacing' => true,
70-
'statement_indentation' => true,
71-
// >>>>>>>>>>>>>>>>>>>>>>>>>
7236
];
7337

7438
$options = [

0 commit comments

Comments
 (0)