diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 928f5b801071..3f9a0dd6f254 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -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 = [
diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
index 954a06ec0230..16271f3cb31c 100644
--- a/.php-cs-fixer.no-header.php
+++ b/.php-cs-fixer.no-header.php
@@ -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 = [
diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
index 392d749c20f1..ef37d80386bd 100644
--- a/.php-cs-fixer.user-guide.php
+++ b/.php-cs-fixer.user-guide.php
@@ -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 = [
@@ -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 = [
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index 3fb341c6c04f..568c5da658ba 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -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',
diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
index 3b85fd068d36..4b174a0f72a2 100644
--- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
+++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
@@ -51,7 +51,6 @@ public function testCallPackageProcedure()
                 'name'  => ':output',
                 'value' => &$result,
             ],
-
         ]);
 
         $this->assertSame($result, '7');
@@ -74,7 +73,6 @@ public function testCallStoredProcedure()
                 'name'  => ':output',
                 'value' => &$result,
             ],
-
         ]);
 
         $this->assertSame($result, '7');
@@ -90,7 +88,6 @@ public function testCallStoredProcedureForCursor()
                 'type'  => OCI_B_CURSOR,
                 'value' => &$result,
             ],
-
         ]);
 
         oci_execute($result);
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 031bbbc12be9..db998100395d 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -342,7 +342,6 @@ public function testUpdateBatchUpdateFieldsAndAlias()
                 'country' => 'Greece',
             ],
             [
-
                 'email'   => 'ahmadinejad@world.com',
                 'name'    => 'Ahmadinejad No change',
                 'country' => 'Greece',
diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php
index f8ad456b1bc2..51289b879da5 100644
--- a/tests/system/Database/Live/UpsertTest.php
+++ b/tests/system/Database/Live/UpsertTest.php
@@ -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);
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index d94403a10b6a..dc2feda00210 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -14,7 +14,6 @@
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\Response;
-
 use Config\App;
 
 /**