Skip to content

Commit 9f8bc2f

Browse files
committed
style: Use all available checked tokens for no_extra_blank_lines
1 parent 48d5ded commit 9f8bc2f

File tree

8 files changed

+54
-11
lines changed

8 files changed

+54
-11
lines changed

.php-cs-fixer.dist.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,23 @@
4545

4646
$overrides = [
4747
'php_unit_data_provider_return_type' => true,
48+
'no_extra_blank_lines' => [
49+
'tokens' => [
50+
'attribute',
51+
'break',
52+
'case',
53+
'continue',
54+
'curly_brace_block',
55+
'default',
56+
'extra',
57+
'parenthesis_brace_block',
58+
'return',
59+
'square_brace_block',
60+
'switch',
61+
'throw',
62+
'use',
63+
],
64+
],
4865
];
4966

5067
$options = [

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,23 @@
3131

3232
$overrides = [
3333
'php_unit_data_provider_return_type' => true,
34+
'no_extra_blank_lines' => [
35+
'tokens' => [
36+
'attribute',
37+
'break',
38+
'case',
39+
'continue',
40+
'curly_brace_block',
41+
'default',
42+
'extra',
43+
'parenthesis_brace_block',
44+
'return',
45+
'square_brace_block',
46+
'switch',
47+
'throw',
48+
'use',
49+
],
50+
],
3451
];
3552

3653
$options = [

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
])
2525
->notPath([
2626
'ci3sample/',
27-
'libraries/sessions/016.php',
2827
'database/query_builder/075.php',
28+
'libraries/sessions/016.php',
29+
'outgoing/response/031.php',
30+
'outgoing/response/032.php',
2931
]);
3032

3133
$overrides = [
@@ -34,6 +36,23 @@
3436
'no_unused_imports' => false,
3537
'class_attributes_separation' => false,
3638
'php_unit_data_provider_return_type' => true,
39+
'no_extra_blank_lines' => [
40+
'tokens' => [
41+
'attribute',
42+
'break',
43+
'case',
44+
'continue',
45+
'curly_brace_block',
46+
'default',
47+
'extra',
48+
'parenthesis_brace_block',
49+
'return',
50+
'square_brace_block',
51+
'switch',
52+
'throw',
53+
'use',
54+
],
55+
],
3756
];
3857

3958
$options = [

app/Config/Logger.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,12 @@ class Logger extends BaseConfig
7474
* the handler on top and continuing down.
7575
*/
7676
public array $handlers = [
77-
7877
/*
7978
* --------------------------------------------------------------------
8079
* File Handler
8180
* --------------------------------------------------------------------
8281
*/
8382
FileHandler::class => [
84-
8583
// The log levels that this handler will handle.
8684
'handles' => [
8785
'critical',

tests/system/Database/Live/OCI8/CallStoredProcedureTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public function testCallPackageProcedure()
5151
'name' => ':output',
5252
'value' => &$result,
5353
],
54-
5554
]);
5655

5756
$this->assertSame($result, '7');
@@ -74,7 +73,6 @@ public function testCallStoredProcedure()
7473
'name' => ':output',
7574
'value' => &$result,
7675
],
77-
7876
]);
7977

8078
$this->assertSame($result, '7');
@@ -90,7 +88,6 @@ public function testCallStoredProcedureForCursor()
9088
'type' => OCI_B_CURSOR,
9189
'value' => &$result,
9290
],
93-
9491
]);
9592

9693
oci_execute($result);

tests/system/Database/Live/UpdateTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ public function testUpdateBatchUpdateFieldsAndAlias()
342342
'country' => 'Greece',
343343
],
344344
[
345-
346345
'email' => '[email protected]',
347346
'name' => 'Ahmadinejad No change',
348347
'country' => 'Greece',

tests/system/Database/Live/UpsertTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,8 @@ public function testUpsertAndUpsertBatchWithObject()
9898
break;
9999

100100
case 'Postgre':
101-
102101
case 'SQLite3':
103-
104102
case 'SQLSRV':
105-
106103
case 'OCI8':
107104
// postgre, sqlite, sqlsrv, oracle - counts row with no change
108105
$this->assertSame(3, $affectedRows1);

tests/system/Test/TestCaseTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use CodeIgniter\CLI\CLI;
1515
use CodeIgniter\Events\Events;
1616
use CodeIgniter\HTTP\Response;
17-
1817
use Config\App;
1918

2019
/**

0 commit comments

Comments
 (0)