From 3e1b2052051d23fb5ceb8ad154203aae974464f7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 3 Jul 2021 00:56:44 +0800
Subject: [PATCH] Enable PSR-12 normative rules

---
 system/Debug/Toolbar.php                             |  4 ++--
 tests/system/CodeIgniterTest.php                     |  2 +-
 tests/system/Commands/InfoCacheTest.php              |  2 +-
 tests/system/Database/Builder/InsertTest.php         |  4 ++--
 tests/system/Database/Builder/UpdateTest.php         |  2 +-
 .../Database/Migrations/MigrationRunnerTest.php      |  2 +-
 tests/system/HTTP/Files/FileCollectionTest.php       | 10 +++++-----
 tests/system/HTTP/Files/FileMovingTest.php           |  2 +-
 tests/system/Test/BootstrapFCPATHTest.php            |  8 ++++----
 utils/PhpCsFixer/CodeIgniter4.php                    | 12 ++++++++++++
 10 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 1ec5b1d411..a230440e6a 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -122,7 +122,7 @@ class Toolbar
                         Kint::$display_called_from = false;
 
                         $kint = @Kint::dump($value);
-                        $kint = substr($kint, strpos($kint, '</style>') + 8 );
+                        $kint = substr($kint, strpos($kint, '</style>') + 8);
 
                         Kint::$mode_default        = $oldKintMode;
                         Kint::$display_called_from = $oldKintCalledFrom;
@@ -356,7 +356,7 @@ class Toolbar
             Kint::$mode_default = Kint::MODE_RICH;
             $kintScript         = @Kint::dump('');
             Kint::$mode_default = $oldKintMode;
-            $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8 );
+            $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
 
             $script = PHP_EOL
                     . '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index a56d1472a2..db1053841a 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -2,7 +2,7 @@
 
 namespace CodeIgniter;
 
-use \CodeIgniter\Config\Services;
+use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index 5997a438cb..efef578449 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -71,6 +71,6 @@ final class InfoCacheTest extends CIUnitTestCase
         cache()->delete('foo');
         command('cache:info');
 
-        $this->assertStringNotContainsString ('foo', $this->getBuffer());
+        $this->assertStringNotContainsString('foo', $this->getBuffer());
     }
 }
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index de1d3c0dde..55f46f0f78 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -83,7 +83,7 @@ final class InsertTest extends CIUnitTestCase
         $this->assertInstanceOf(Query::class, $query);
 
         $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
 
         $expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
@@ -110,7 +110,7 @@ final class InsertTest extends CIUnitTestCase
         $this->assertInstanceOf(Query::class, $query);
 
         $raw = 'INSERT INTO "ip_table" ("ip", "ip2") VALUES (:ip:,:ip2:), (:ip.1:,:ip2.1:), (:ip.2:,:ip2.2:), (:ip.3:,:ip2.3:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
 
         $expected = "INSERT INTO \"ip_table\" (\"ip\", \"ip2\") VALUES ('1.1.1.0','1.1.1.2'), ('2.2.2.0','2.2.2.2'), ('3.3.3.0','3.3.3.2'), ('4.4.4.0','4.4.4.2')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 47d424100c..5fadb0a3bc 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -149,7 +149,7 @@ final class UpdateTest extends CIUnitTestCase
             WHERE "id" IN(2,3)
             EOF;
 
-        $this->assertSame($expected, $query->getQuery() );
+        $this->assertSame($expected, $query->getQuery());
     }
 
     public function testUpdateBatchThrowsExceptionWithNoData()
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index a31ec0bfcb..f567e227de 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -51,7 +51,7 @@ final class MigrationRunnerTest extends CIUnitTestCase
 
         $this->assertInstanceOf(BaseConnection::class, $db);
         $this->assertSame(
-            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '' ) . $dbConfig->tests['database'],
+            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '') . $dbConfig->tests['database'],
             $this->getPrivateProperty($db, 'database')
         );
         $this->assertSame($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index 73876f0dff..284e0bd561 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -711,7 +711,7 @@ final class FileCollectionTest extends CIUnitTestCase
 
         $files = $collection->getFileMultiple('userfiletest');
 
-        $this->assertNull( $files);
+        $this->assertNull($files);
     }
 
     //--------------------------------------------------------------------
@@ -766,7 +766,7 @@ final class FileCollectionTest extends CIUnitTestCase
         $collection = new FileCollection();
 
         $files = $collection->getFileMultiple('my-form.details.avatars');
-        $this->assertIsArray( $files);
+        $this->assertIsArray($files);
         $this->assertCount(2, $files);
 
         $this->assertInstanceOf(UploadedFile::class, $files[0]);
@@ -821,7 +821,7 @@ final class FileCollectionTest extends CIUnitTestCase
         $collection = new FileCollection();
 
         $files = $collection->getFileMultiple('my-form.details.avatars');
-        $this->assertNull( $files);
+        $this->assertNull($files);
     }
 
     //--------------------------------------------------------------------
@@ -854,7 +854,7 @@ final class FileCollectionTest extends CIUnitTestCase
 
         $files = $collection->getFileMultiple('userfile');
         $this->assertCount(2, $files);
-        $this->assertIsArray( $files);
+        $this->assertIsArray($files);
 
         $this->assertInstanceOf(UploadedFile::class, $files[0]);
         $this->assertSame(124, $files[0]->getSize());
@@ -888,7 +888,7 @@ final class FileCollectionTest extends CIUnitTestCase
         $collection = new FileCollection();
 
         $files = $collection->getFileMultiple('userfile');
-        $this->assertNull( $files);
+        $this->assertNull($files);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 15c5a6b393..94ec312f00 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -317,7 +317,7 @@ function rrmdir($src)
     $dir = opendir($src);
 
     while (false !== $file = readdir($dir)) {
-        if (( $file !== '.' ) && ( $file !== '..' )) {
+        if (($file !== '.') && ($file !== '..')) {
             $full = $src . '/' . $file;
 
             if (is_dir($full)) {
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index cfeef89ee2..ed1beda9a3 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -50,27 +50,27 @@ final class BootstrapFCPATHTest extends CIUnitTestCase
 
     private function buildDirectories() : void
     {
-        mkdir( $this->dir1, 0777, true);
+        mkdir($this->dir1, 0777, true);
     }
 
     private function deleteDirectories() : void
     {
         // these need to be executed in reverse order: dir 2 in inside dir1
         if (is_dir($this->dir1)) {
-            rmdir( $this->dir1 );
+            rmdir($this->dir1);
         }
     }
 
     private function writeFiles() : void
     {
-        file_put_contents( $this->file1, $this->fileContents());
+        file_put_contents($this->file1, $this->fileContents());
         chmod($this->file1, 0777);
     }
 
     private function deleteFiles() : void
     {
         if (file_exists($this->file1)) {
-            unlink( $this->file1 );
+            unlink($this->file1);
         }
     }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 86fb3ba80f..dc7ba2fb7d 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -165,10 +165,21 @@ final class CodeIgniter4 extends AbstractRuleset
             'no_alias_language_construct_call'        => true,
             'no_blank_lines_after_class_opening'      => true,
             'no_blank_lines_after_phpdoc'             => false, // @todo enable fully when `header_comment` is required
+            'no_blank_lines_before_namespace'         => false, // conflicts with `single_blank_line_before_namespace`
+            'no_break_comment'                        => ['comment_text' => 'no break'],
+            'no_closing_tag'                          => true,
+            'no_leading_import_slash'                 => true,
             'no_short_bool_cast'                      => true,
+            'no_spaces_after_function_name'           => true,
+            'no_spaces_inside_parenthesis'            => true,
             'no_trailing_comma_in_singleline_array'   => true,
+            'no_trailing_whitespace'                  => true,
+            'no_trailing_whitespace_in_comment'       => true,
+            'no_trailing_whitespace_in_string'        => true,
+            'no_unreachable_default_argument_value'   => true,
             'no_unset_cast'                           => true,
             'no_whitespace_before_comma_in_array'     => ['after_heredoc' => true],
+            'no_whitespace_in_blank_line'             => true,
             'not_operator_with_space'                 => false,
             'not_operator_with_successor_space'       => true,
             'normalize_index_brace'                   => true,
@@ -287,6 +298,7 @@ final class CodeIgniter4 extends AbstractRuleset
             'set_type_to_cast'                    => true,
             'short_scalar_cast'                   => true,
             'simple_to_complex_string_variable'   => true,
+            'single_blank_line_before_namespace'  => true,
             'standardize_increment'               => true,
             'static_lambda'                       => true,
             'switch_case_semicolon_to_colon'      => true,