refactor: more preg_match() and empty string only check

codeigniter4 · Dec 27, 2024 · 5caee6a · 5caee6a
1 parent 2e191e8
commit 5caee6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1329,7 +1329,7 @@ protected function fillRouteParams(string $from, ?array $params = null): string
         $patterns = $matches[0];
 
         foreach ($patterns as $index => $pattern) {
-            if (in_array(preg_match('#^' . $pattern . '$#u', $params[$index]), [0, false], true)) {
+            if (preg_match('#^' . $pattern . '$#u', $params[$index]) !== 1) {
                 throw RouterException::forInvalidParameterType();
             }
 

diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
@@ -374,7 +374,7 @@ public function assertLogContains(string $level, string $logMessage, string $mes
     {
         $this->assertTrue(
             TestLogger::didLog($level, $logMessage, false),
-            $message !== '' && $message !== '0' ? $message : sprintf(
+            $message !== '' ? $message : sprintf(
                 'Failed asserting that logs have a record of message containing "%s" with level "%s".',
                 $logMessage,
                 $level