fix: Revert comparison with null

codeigniter4 · Dec 28, 2024 · 0bae34c · 0bae34c
1 parent 26f3fb6
commit 0bae34c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -230,7 +230,7 @@ public static function prompt(string $field, $options = null, $validation = null
         }
 
         if (! is_array($validation)) {
-            $validation = ((string) $validation !== '') ? explode('|', $validation) : [];
+            $validation = ($validation !== null) ? explode('|', $validation) : [];
         }
 
         if (is_string($options)) {

diff --git a/system/Common.php b/system/Common.php
@@ -75,7 +75,7 @@ function cache(?string $key = null)
         $cache = service('cache');
 
         // No params - return cache object
-        if ((string) $key === '') {
+        if ($key === null) {
             return $cache;
         }
 
@@ -289,7 +289,7 @@ function csrf_hash(): string
      */
     function csrf_field(?string $id = null): string
     {
-        return '<input type="hidden"' . ((string) $id !== '' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<input type="hidden"' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -301,7 +301,7 @@ function csrf_field(?string $id = null): string
      */
     function csrf_meta(?string $id = null): string
     {
-        return '<meta' . ((string) $id !== '' ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
+        return '<meta' . ($id !== null ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '"' . _solidus() . '>';
     }
 }
 
@@ -441,7 +441,7 @@ function esc($data, string $context = 'html', ?string $encoding = null)
                 $escaper = new Escaper($encoding);
             }
 
-            if ((string) $encoding !== '' && $escaper->getEncoding() !== $encoding) {
+            if ($encoding !== null && $escaper->getEncoding() !== $encoding) {
                 $escaper = new Escaper($encoding);
             }
 
@@ -1128,7 +1128,7 @@ function timer(?string $name = null, ?callable $callable = null)
     {
         $timer = service('timer');
 
-        if ((string) $name === '') {
+        if ($name === null) {
             return $timer;
         }
 

diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -161,7 +161,7 @@ public function latest(?string $group = null)
 
         $this->ensureTable();
 
-        if ((string) $group !== '') {
+        if ($group !== null) {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
@@ -326,7 +326,7 @@ public function force(string $path, string $namespace, ?string $group = null)
 
         $this->ensureTable();
 
-        if ((string) $group !== '') {
+        if ($group !== null) {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }

diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
@@ -55,7 +55,7 @@ public function testEmailSendWithClearance($autoClear): void
 
         $this->assertTrue($email->send($autoClear));
 
-        if ($autoClear) {
+        if (! $autoClear) {
             $this->assertSame('foo@foo.com', $email->archive['recipients'][0]);
         }
     }