Merge pull request #6636 from codeigniter4/develop

4.2.7 Ready code
codeigniter4 · Oct 6, 2022 · f6dd565 · f6dd565
2 parents 265ed2f + fbdd32d
commit f6dd565
Show file tree

Hide file tree

Showing 181 changed files with 5,517 additions and 4,239 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,11 @@
+<!--
+
 Each pull request should address a single issue and have a meaningful title.
 
 - All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
 - PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
 
+-->
 **Description**
 Explain what you have changed, and why.
 

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -38,44 +38,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    // <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
-    'blank_line_between_import_groups' => true,
-    'class_definition'                 => [
-        'multi_line_extends_each_single_line' => true,
-        'single_item_single_line'             => true,
-        'single_line'                         => true,
-        'space_before_parenthesis'            => true,
-        'inline_constructor_arguments'        => true,
-    ],
-    'control_structure_braces'        => true,
-    'no_multiple_statements_per_line' => true,
-    'no_trailing_comma_in_singleline' => [
-        'elements' => [
-            'arguments',
-            'array_destructuring',
-            'array',
-            'group_import',
-        ],
-    ],
-    'no_useless_nullsafe_operator' => true,
-    'phpdoc_separation'            => [
-        'groups' => [
-            ['immutable', 'psalm-immutable'],
-            ['param', 'phpstan-param', 'psalm-param'],
-            ['phpstan-pure', 'psalm-pure'],
-            ['readonly', 'psalm-readonly'],
-            ['return', 'phpstan-return', 'psalm-return'],
-            ['template', 'phpstan-template', 'psalm-template'],
-            ['template-covariant', 'phpstan-template-covariant', 'psalm-template-covariant'],
-            ['phpstan-type', 'psalm-type'],
-            ['var', 'phpstan-var', 'psalm-var'],
-        ],
-    ],
-    'single_line_comment_spacing' => true,
-    'statement_indentation'       => true,
-    // >>>>>>>>>>>>>>>>>>>>>>>>>
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
@@ -30,44 +30,7 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [
-    // <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
-    'blank_line_between_import_groups' => true,
-    'class_definition'                 => [
-        'multi_line_extends_each_single_line' => true,
-        'single_item_single_line'             => true,
-        'single_line'                         => true,
-        'space_before_parenthesis'            => true,
-        'inline_constructor_arguments'        => true,
-    ],
-    'control_structure_braces'        => true,
-    'no_multiple_statements_per_line' => true,
-    'no_trailing_comma_in_singleline' => [
-        'elements' => [
-            'arguments',
-            'array_destructuring',
-            'array',
-            'group_import',
-        ],
-    ],
-    'no_useless_nullsafe_operator' => true,
-    'phpdoc_separation'            => [
-        'groups' => [
-            ['immutable', 'psalm-immutable'],
-            ['param', 'phpstan-param', 'psalm-param'],
-            ['phpstan-pure', 'psalm-pure'],
-            ['readonly', 'psalm-readonly'],
-            ['return', 'phpstan-return', 'psalm-return'],
-            ['template', 'phpstan-template', 'psalm-template'],
-            ['template-covariant', 'phpstan-template-covariant', 'psalm-template-covariant'],
-            ['phpstan-type', 'psalm-type'],
-            ['var', 'phpstan-var', 'psalm-var'],
-        ],
-    ],
-    'single_line_comment_spacing' => true,
-    'statement_indentation'       => true,
-    // >>>>>>>>>>>>>>>>>>>>>>>>>
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.no-header.cache',

diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
@@ -33,42 +33,6 @@
     'php_unit_internal_class'     => false,
     'no_unused_imports'           => false,
     'class_attributes_separation' => false,
-    // <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
-    'blank_line_between_import_groups' => true,
-    'class_definition'                 => [
-        'multi_line_extends_each_single_line' => true,
-        'single_item_single_line'             => true,
-        'single_line'                         => true,
-        'space_before_parenthesis'            => true,
-        'inline_constructor_arguments'        => true,
-    ],
-    'control_structure_braces'        => true,
-    'no_multiple_statements_per_line' => true,
-    'no_trailing_comma_in_singleline' => [
-        'elements' => [
-            'arguments',
-            'array_destructuring',
-            'array',
-            'group_import',
-        ],
-    ],
-    'no_useless_nullsafe_operator' => true,
-    'phpdoc_separation'            => [
-        'groups' => [
-            ['immutable', 'psalm-immutable'],
-            ['param', 'phpstan-param', 'psalm-param'],
-            ['phpstan-pure', 'psalm-pure'],
-            ['readonly', 'psalm-readonly'],
-            ['return', 'phpstan-return', 'psalm-return'],
-            ['template', 'phpstan-template', 'psalm-template'],
-            ['template-covariant', 'phpstan-template-covariant', 'psalm-template-covariant'],
-            ['phpstan-type', 'psalm-type'],
-            ['var', 'phpstan-var', 'psalm-var'],
-        ],
-    ],
-    'single_line_comment_spacing' => true,
-    'statement_indentation'       => true,
-    // >>>>>>>>>>>>>>>>>>>>>>>>>
 ];
 
 $options = [