Skip to content

style: Use all available checked tokens for no_extra_blank_lines #7729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2023
Merged

style: Use all available checked tokens for no_extra_blank_lines #7729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,23 @@

$overrides = [
'php_unit_data_provider_return_type' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'break',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'return',
'square_brace_block',
'switch',
'throw',
'use',
],
],
];

$options = [
Expand Down
17 changes: 17 additions & 0 deletions .php-cs-fixer.no-header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@

$overrides = [
'php_unit_data_provider_return_type' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'break',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'return',
'square_brace_block',
'switch',
'throw',
'use',
],
],
];

$options = [
Expand Down
21 changes: 20 additions & 1 deletion .php-cs-fixer.user-guide.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
])
->notPath([
'ci3sample/',
'libraries/sessions/016.php',
'database/query_builder/075.php',
'libraries/sessions/016.php',
'outgoing/response/031.php',
'outgoing/response/032.php',
]);

$overrides = [
Expand All @@ -34,6 +36,23 @@
'no_unused_imports' => false,
'class_attributes_separation' => false,
'php_unit_data_provider_return_type' => true,
'no_extra_blank_lines' => [
'tokens' => [
'attribute',
'break',
'case',
'continue',
'curly_brace_block',
'default',
'extra',
'parenthesis_brace_block',
'return',
'square_brace_block',
'switch',
'throw',
'use',
],
],
];

$options = [
Expand Down
2 changes: 0 additions & 2 deletions app/Config/Logger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,12 @@ class Logger extends BaseConfig
* the handler on top and continuing down.
*/
public array $handlers = [

/*
* --------------------------------------------------------------------
* File Handler
* --------------------------------------------------------------------
*/
FileHandler::class => [

// The log levels that this handler will handle.
'handles' => [
'critical',
Expand Down
3 changes: 0 additions & 3 deletions tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public function testCallPackageProcedure()
'name' => ':output',
'value' => &$result,
],

]);

$this->assertSame($result, '7');
Expand All @@ -74,7 +73,6 @@ public function testCallStoredProcedure()
'name' => ':output',
'value' => &$result,
],

]);

$this->assertSame($result, '7');
Expand All @@ -90,7 +88,6 @@ public function testCallStoredProcedureForCursor()
'type' => OCI_B_CURSOR,
'value' => &$result,
],

]);

oci_execute($result);
Expand Down
1 change: 0 additions & 1 deletion tests/system/Database/Live/UpdateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ public function testUpdateBatchUpdateFieldsAndAlias()
'country' => 'Greece',
],
[

'email' => '[email protected]',
'name' => 'Ahmadinejad No change',
'country' => 'Greece',
Expand Down
3 changes: 0 additions & 3 deletions tests/system/Database/Live/UpsertTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,8 @@ public function testUpsertAndUpsertBatchWithObject()
break;

case 'Postgre':

case 'SQLite3':

case 'SQLSRV':

case 'OCI8':
// postgre, sqlite, sqlsrv, oracle - counts row with no change
$this->assertSame(3, $affectedRows1);
Expand Down
1 change: 0 additions & 1 deletion tests/system/Test/TestCaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use CodeIgniter\CLI\CLI;
use CodeIgniter\Events\Events;
use CodeIgniter\HTTP\Response;

use Config\App;

/**
Expand Down