diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index f24e98fb9a49..6222edf75144 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -4,7 +4,7 @@
 
 // The main Exception
 CLI::newLine();
-CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
+CLI::write('[' . $exception::class . ']', 'light_gray', 'red');
 CLI::newLine();
 CLI::write($message);
 CLI::newLine();
@@ -41,20 +41,11 @@
             $function .= $padClass . $error['function'];
         }
 
-        $args = implode(', ', array_map(static function ($value) {
-            switch (true) {
-                case is_object($value):
-                    return 'Object(' . get_class($value) . ')';
-
-                case is_array($value):
-                    return count($value) ? '[...]' : '[]';
-
-                case $value === null:
-                    return 'null'; // return the lowercased version
-
-                default:
-                    return var_export($value, true);
-            }
+        $args = implode(', ', array_map(static fn ($value) => match (true) {
+            is_object($value) => 'Object(' . $value::class . ')',
+            is_array($value)  => count($value) ? '[...]' : '[]',
+            $value === null   => 'null',
+            default           => var_export($value, true),
         }, array_values($error['args'] ?? [])));
 
         $function .= '(' . $args . ')';
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index f311d910c0fa..b6a84ca3f640 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -90,7 +90,7 @@
                                         <?php
                                         $params = null;
                                         // Reflection by name is not available for closure function
-                                        if (substr($row['function'], -1) !== '}') {
+                                        if (!str_ends_with($row['function'], '}')) {
                                             $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);
                                             $params = $mirror->getParameters();
                                         }
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index a06ffc2c6252..081f9628a416 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -274,7 +274,7 @@ public function loadClass(string $class): void
      */
     protected function loadInNamespace(string $class)
     {
-        if (strpos($class, '\\') === false) {
+        if (! str_contains($class, '\\')) {
             return false;
         }
 
@@ -282,7 +282,7 @@ protected function loadInNamespace(string $class)
             foreach ($directories as $directory) {
                 $directory = rtrim($directory, '\\/');
 
-                if (strpos($class, $namespace) === 0) {
+                if (str_starts_with($class, $namespace)) {
                     $filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
                     $filename = $this->includeFile($filePath);
 
@@ -412,7 +412,7 @@ private function loadComposerNamespaces(ClassLoader $composer, array $composerPa
 
             foreach ($srcPaths as $path) {
                 foreach ($installPaths as $installPath) {
-                    if ($installPath === substr($path, 0, strlen($installPath))) {
+                    if (str_starts_with($path, $installPath)) {
                         $add = true;
                         break 2;
                     }
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index bc18bd31b980..74db1064e6b9 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -51,12 +51,12 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $file = $this->ensureExt($file, $ext);
 
         // Clears the folder name if it is at the beginning of the filename
-        if (! empty($folder) && strpos($file, $folder) === 0) {
+        if (! empty($folder) && str_starts_with($file, $folder)) {
             $file = substr($file, strlen($folder . '/'));
         }
 
         // Is not namespaced? Try the application folder.
-        if (strpos($file, '\\') === false) {
+        if (! str_contains($file, '\\')) {
             return $this->legacyLocate($file, $folder);
         }
 
@@ -101,7 +101,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
             // If we have a folder name, then the calling function
             // expects this file to be within that folder, like 'Views',
             // or 'libraries'.
-            if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false) {
+            if (! empty($folder) && ! str_contains($path . $filename, '/' . $folder . '/')) {
                 $path .= trim($folder, '/') . '/';
             }
 
@@ -184,7 +184,7 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
 
                 if ($prioritizeApp) {
                     $foundPaths[] = $fullPath;
-                } elseif (strpos($fullPath, APPPATH) === 0) {
+                } elseif (str_starts_with($fullPath, APPPATH)) {
                     $appPaths[] = $fullPath;
                 } else {
                     $foundPaths[] = $fullPath;
@@ -208,7 +208,7 @@ protected function ensureExt(string $path, string $ext): string
         if ($ext) {
             $ext = '.' . $ext;
 
-            if (substr($path, -strlen($ext)) !== $ext) {
+            if (! str_ends_with($path, $ext)) {
                 $path .= $ext;
             }
         }
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 0cf63ac9f3ec..220ee07a9a89 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -587,7 +587,7 @@ public function find($id = null)
      */
     public function findColumn(string $columnName)
     {
-        if (strpos($columnName, ',') !== false) {
+        if (str_contains($columnName, ',')) {
             throw DataException::forFindColumnHaveMultipleColumns();
         }
 
@@ -1317,19 +1317,12 @@ protected function setDate(?int $userData = null)
      */
     protected function intToDate(int $value)
     {
-        switch ($this->dateFormat) {
-            case 'int':
-                return $value;
-
-            case 'datetime':
-                return date('Y-m-d H:i:s', $value);
-
-            case 'date':
-                return date('Y-m-d', $value);
-
-            default:
-                throw ModelException::forNoDateFormat(static::class);
-        }
+        return match ($this->dateFormat) {
+            'int'      => $value,
+            'datetime' => date('Y-m-d H:i:s', $value),
+            'date'     => date('Y-m-d', $value),
+            default    => throw ModelException::forNoDateFormat(static::class),
+        };
     }
 
     /**
@@ -1346,19 +1339,12 @@ protected function intToDate(int $value)
      */
     protected function timeToDate(Time $value)
     {
-        switch ($this->dateFormat) {
-            case 'datetime':
-                return $value->format('Y-m-d H:i:s');
-
-            case 'date':
-                return $value->format('Y-m-d');
-
-            case 'int':
-                return $value->getTimestamp();
-
-            default:
-                return (string) $value;
-        }
+        return match ($this->dateFormat) {
+            'datetime' => $value->format('Y-m-d H:i:s'),
+            'date'     => $value->format('Y-m-d'),
+            'int'      => $value->getTimestamp(),
+            default    => (string) $value,
+        };
     }
 
     /**
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 29f424d1ec53..e51fd2a7ba06 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -598,7 +598,7 @@ public static function color(string $text, string $foreground, ?string $backgrou
         $newText = '';
 
         // Detect if color method was already in use with this text
-        if (strpos($text, "\033[0m") !== false) {
+        if (str_contains($text, "\033[0m")) {
             $pattern = '/\\033\\[0;.+?\\033\\[0m/u';
 
             preg_match_all($pattern, $text, $matches);
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index df28e533a354..5a51f34d27df 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -173,7 +173,7 @@ protected function getCommandAlternatives(string $name, array $collection): arra
         foreach (array_keys($collection) as $commandName) {
             $lev = levenshtein($name, $commandName);
 
-            if ($lev <= strlen($commandName) / 3 || strpos($commandName, $name) !== false) {
+            if ($lev <= strlen($commandName) / 3 || str_contains($commandName, $name)) {
                 $alternatives[$commandName] = $lev;
             }
         }
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index 7b6066380739..169fa569e041 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -254,7 +254,7 @@ protected function qualifyClassName(): string
         // Gets the namespace from input. Don't forget the ending backslash!
         $namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\') . '\\';
 
-        if (strncmp($class, $namespace, strlen($namespace)) === 0) {
+        if (str_starts_with($class, $namespace)) {
             return $class; // @codeCoverageIgnore
         }
 
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 4e06b85bc8ce..0dab42a25635 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -86,22 +86,11 @@ public function get(string $key)
             return null;
         }
 
-        switch ($data['__ci_type']) {
-            case 'array':
-            case 'object':
-                return unserialize($data['__ci_value']);
-
-            case 'boolean':
-            case 'integer':
-            case 'double': // Yes, 'double' is returned and NOT 'float'
-            case 'string':
-            case 'NULL':
-                return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
-
-            case 'resource':
-            default:
-                return null;
-        }
+        return match ($data['__ci_type']) {
+            'array', 'object' => unserialize($data['__ci_value']),
+            'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,
+            default => null,
+        };
     }
 
     /**
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 9d1ddf3c15d4..24b40bf98da0 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -112,22 +112,11 @@ public function get(string $key)
             return null;
         }
 
-        switch ($data['__ci_type']) {
-            case 'array':
-            case 'object':
-                return unserialize($data['__ci_value']);
-
-            case 'boolean':
-            case 'integer':
-            case 'double': // Yes, 'double' is returned and NOT 'float'
-            case 'string':
-            case 'NULL':
-                return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
-
-            case 'resource':
-            default:
-                return null;
-        }
+        return match ($data['__ci_type']) {
+            'array', 'object' => unserialize($data['__ci_value']),
+            'boolean', 'integer', 'double', 'string', 'NULL' => settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null,
+            default => null,
+        };
     }
 
     /**
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 288c170681f7..cbccdd506d5f 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -868,7 +868,7 @@ protected function startController()
         $this->benchmark->start('controller_constructor');
 
         // Is it routed to a Closure?
-        if (is_object($this->controller) && (get_class($this->controller) === 'Closure')) {
+        if (is_object($this->controller) && ($this->controller::class === 'Closure')) {
             $controller = $this->controller;
 
             return $controller(...$this->router->params());
@@ -1040,7 +1040,7 @@ public function storePreviousURL($uri)
         }
 
         // Ignore non-HTML responses
-        if (strpos($this->response->getHeaderLine('Content-Type'), 'text/html') === false) {
+        if (! str_contains($this->response->getHeaderLine('Content-Type'), 'text/html')) {
             return;
         }
 
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index d103d97f689a..32643320b00f 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -107,7 +107,7 @@ public function run(array $params)
                 $config->{$group}['database'] = $name;
 
                 if ($name !== ':memory:') {
-                    $dbName = strpos($name, DIRECTORY_SEPARATOR) === false ? WRITEPATH . $name : $name;
+                    $dbName = ! str_contains($name, DIRECTORY_SEPARATOR) ? WRITEPATH . $name : $name;
 
                     if (is_file($dbName)) {
                         CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 5837bfb02636..664fc9f40ade 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -166,7 +166,7 @@ protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey):
         $oldFileContents = (string) file_get_contents($envFile);
         $replacementKey  = "\nencryption.key = {$newKey}";
 
-        if (strpos($oldFileContents, 'encryption.key') === false) {
+        if (! str_contains($oldFileContents, 'encryption.key')) {
             return file_put_contents($envFile, $replacementKey, FILE_APPEND) !== false;
         }
 
diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
index cfed0472c439..d7cb840bd3b1 100644
--- a/system/Commands/Utilities/Publish.php
+++ b/system/Commands/Utilities/Publish.php
@@ -83,13 +83,13 @@ public function run(array $params)
         foreach ($publishers as $publisher) {
             if ($publisher->publish()) {
                 CLI::write(lang('Publisher.publishSuccess', [
-                    get_class($publisher),
+                    $publisher::class,
                     count($publisher->getPublished()),
                     $publisher->getDestination(),
                 ]), 'green');
             } else {
                 CLI::error(lang('Publisher.publishFailure', [
-                    get_class($publisher),
+                    $publisher::class,
                     $publisher->getDestination(),
                 ]), 'light_gray', 'red');
 
diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
index a8b6912d4bf7..59f6f10a3505 100644
--- a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
@@ -67,7 +67,7 @@ public function read(string $class, string $defaultController = 'Home', string $
             $methodName = $method->getName();
 
             foreach ($this->httpMethods as $httpVerb) {
-                if (strpos($methodName, $httpVerb) === 0) {
+                if (str_starts_with($methodName, $httpVerb)) {
                     // Remove HTTP verb prefix.
                     $methodInUri = lcfirst(substr($methodName, strlen($httpVerb)));
 
diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
index 40a834df52f1..66f512e082da 100644
--- a/system/Commands/Utilities/Routes/FilterFinder.php
+++ b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -58,12 +58,12 @@ public function find(string $uri): array
             $this->filters->initialize($uri);
 
             return $this->filters->getFilters();
-        } catch (RedirectException $e) {
+        } catch (RedirectException) {
             return [
                 'before' => [],
                 'after'  => [],
             ];
-        } catch (PageNotFoundException $e) {
+        } catch (PageNotFoundException) {
             return [
                 'before' => ['<unknown>'],
                 'after'  => ['<unknown>'],
diff --git a/system/Common.php b/system/Common.php
index ebfd8e2565e8..e7644c080a13 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -94,29 +94,18 @@ function clean_path(string $path): string
         // Resolve relative paths
         try {
             $path = realpath($path) ?: $path;
-        } catch (ErrorException|ValueError $e) {
+        } catch (ErrorException|ValueError) {
             $path = 'error file path: ' . urlencode($path);
         }
 
-        switch (true) {
-            case strpos($path, APPPATH) === 0:
-                return 'APPPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(APPPATH));
-
-            case strpos($path, SYSTEMPATH) === 0:
-                return 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(SYSTEMPATH));
-
-            case strpos($path, FCPATH) === 0:
-                return 'FCPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(FCPATH));
-
-            case defined('VENDORPATH') && strpos($path, VENDORPATH) === 0:
-                return 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(VENDORPATH));
-
-            case strpos($path, ROOTPATH) === 0:
-                return 'ROOTPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(ROOTPATH));
-
-            default:
-                return $path;
-        }
+        return match (true) {
+            str_starts_with($path, APPPATH)                             => 'APPPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(APPPATH)),
+            str_starts_with($path, SYSTEMPATH)                          => 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(SYSTEMPATH)),
+            str_starts_with($path, FCPATH)                              => 'FCPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(FCPATH)),
+            defined('VENDORPATH') && str_starts_with($path, VENDORPATH) => 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(VENDORPATH)),
+            str_starts_with($path, ROOTPATH)                            => 'ROOTPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(ROOTPATH)),
+            default                                                     => $path,
+        };
     }
 }
 
@@ -384,22 +373,13 @@ function env(string $key, $default = null)
             return $default;
         }
 
-        // Handle any boolean values
-        switch (strtolower($value)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'empty':
-                return '';
-
-            case 'null':
-                return null;
-        }
-
-        return $value;
+        return match (strtolower($value)) {
+            'true'  => true,
+            'false' => false,
+            'empty' => '',
+            'null'  => null,
+            default => $value,
+        };
     }
 }
 
@@ -504,9 +484,9 @@ function force_https(
 
         $baseURL = config(App::class)->baseURL;
 
-        if (strpos($baseURL, 'https://') === 0) {
+        if (str_starts_with($baseURL, 'https://')) {
             $authority = substr($baseURL, strlen('https://'));
-        } elseif (strpos($baseURL, 'http://') === 0) {
+        } elseif (str_starts_with($baseURL, 'http://')) {
             $authority = substr($baseURL, strlen('http://'));
         } else {
             $authority = $baseURL;
@@ -610,7 +590,7 @@ function helper($filenames): void
             $appHelper     = null;
             $localIncludes = [];
 
-            if (strpos($filename, '_helper') === false) {
+            if (! str_contains($filename, '_helper')) {
                 $filename .= '_helper';
             }
 
@@ -621,7 +601,7 @@ function helper($filenames): void
 
             // If the file is namespaced, we'll just grab that
             // file and not search for any others
-            if (strpos($filename, '\\') !== false) {
+            if (str_contains($filename, '\\')) {
                 $path = $loader->locateFile($filename, 'Helpers');
 
                 if (empty($path)) {
@@ -635,9 +615,9 @@ function helper($filenames): void
                 $paths = $loader->search('Helpers/' . $filename);
 
                 foreach ($paths as $path) {
-                    if (strpos($path, APPPATH . 'Helpers' . DIRECTORY_SEPARATOR) === 0) {
+                    if (str_starts_with($path, APPPATH . 'Helpers' . DIRECTORY_SEPARATOR)) {
                         $appHelper = $path;
-                    } elseif (strpos($path, SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR) === 0) {
+                    } elseif (str_starts_with($path, SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR)) {
                         $systemHelper = $path;
                     } else {
                         $localIncludes[] = $path;
@@ -1225,7 +1205,7 @@ function view_cell(string $library, $params = null, int $ttl = 0, ?string $cache
      */
     function class_basename($class)
     {
-        $class = is_object($class) ? get_class($class) : $class;
+        $class = is_object($class) ? $class::class : $class;
 
         return basename(str_replace('\\', '/', $class));
     }
@@ -1244,7 +1224,7 @@ function class_basename($class)
     function class_uses_recursive($class)
     {
         if (is_object($class)) {
-            $class = get_class($class);
+            $class = $class::class;
         }
 
         $results = [];
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index b95bdf54c4ae..eaf81a45c964 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -71,7 +71,7 @@ public static function postUpdate()
 
         foreach (self::$dependencies as $key => $dependency) {
             // Kint may be removed.
-            if (! is_dir($dependency['from']) && strpos($key, 'kint') === 0) {
+            if (! is_dir($dependency['from']) && str_starts_with($key, 'kint')) {
                 continue;
             }
 
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index 87166737e746..3d441efead57 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -99,10 +99,10 @@ public function __construct()
             $this->initEnvValue($this->{$property}, $property, $prefix, $shortPrefix);
 
             if ($this instanceof Encryption && $property === 'key') {
-                if (strpos($this->{$property}, 'hex2bin:') === 0) {
+                if (str_starts_with($this->{$property}, 'hex2bin:')) {
                     // Handle hex2bin prefix
                     $this->{$property} = hex2bin(substr($this->{$property}, 8));
-                } elseif (strpos($this->{$property}, 'base64:') === 0) {
+                } elseif (str_starts_with($this->{$property}, 'base64:')) {
                     // Handle base64 prefix
                     $this->{$property} = base64_decode(substr($this->{$property}, 7), true);
                 }
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 05ecab900c3e..01c51ebf2f9e 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -68,12 +68,12 @@ public function parse(): ?array
 
         foreach ($lines as $line) {
             // Is it a comment?
-            if (strpos(trim($line), '#') === 0) {
+            if (str_starts_with(trim($line), '#')) {
                 continue;
             }
 
             // If there is an equal sign, then we know we are assigning a variable.
-            if (strpos($line, '=') !== false) {
+            if (str_contains($line, '=')) {
                 [$name, $value] = $this->normaliseVariable($line);
                 $vars[$name]    = $value;
                 $this->setVariable($name, $value);
@@ -112,7 +112,7 @@ protected function setVariable(string $name, string $value = '')
     public function normaliseVariable(string $name, string $value = ''): array
     {
         // Split our compound string into its parts.
-        if (strpos($name, '=') !== false) {
+        if (str_contains($name, '=')) {
             [$name, $value] = explode('=', $name, 2);
         }
 
@@ -192,7 +192,7 @@ protected function sanitizeValue(string $value): string
      */
     protected function resolveNestedVariables(string $value): string
     {
-        if (strpos($value, '$') !== false) {
+        if (str_contains($value, '$')) {
             $value = preg_replace_callback(
                 '/\${([a-zA-Z0-9_\.]+)}/',
                 function ($matchedPatterns) {
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index b455969049e2..f250c3a8ec28 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -314,7 +314,7 @@ class_exists($alias, false)
      */
     private static function isNamespaced(string $alias): bool
     {
-        return strpos($alias, '\\') !== false;
+        return str_contains($alias, '\\');
     }
 
     /**
@@ -332,10 +332,10 @@ protected static function verifyPreferApp(array $options, string $alias): bool
 
         // Special case for Config since its App namespace is actually \Config
         if (self::isConfig($options['component'])) {
-            return strpos($alias, 'Config') === 0;
+            return str_starts_with($alias, 'Config');
         }
 
-        return strpos($alias, APP_NAMESPACE) === 0;
+        return str_starts_with($alias, APP_NAMESPACE);
     }
 
     /**
@@ -456,7 +456,7 @@ public static function injectMock(string $component, string $alias, object $inst
         $component = strtolower($component);
         self::getOptions($component);
 
-        $class = get_class($instance);
+        $class = $instance::class;
 
         self::$instances[$component][$class] = $instance;
         self::$aliases[$component][$alias]   = $class;
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 69e40017bb65..96248099a02e 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -19,6 +19,7 @@
 use InvalidArgumentException;
 use LogicException;
 use ReturnTypeWillChange;
+use Stringable;
 
 /**
  * A `Cookie` class represents an immutable HTTP cookie value object.
@@ -41,7 +42,7 @@
  * @template-implements ArrayAccess<string, bool|int|string>
  * @see \CodeIgniter\Cookie\CookieTest
  */
-class Cookie implements ArrayAccess, CloneableCookieInterface
+class Cookie implements ArrayAccess, CloneableCookieInterface, Stringable
 {
     /**
      * @var string
@@ -159,7 +160,6 @@ public static function setDefaults($config = [])
     // =========================================================================
     // CONSTRUCTORS
     // =========================================================================
-
     /**
      * Create a new Cookie instance from a `Set-Cookie` header.
      *
@@ -180,7 +180,7 @@ public static function fromHeaderString(string $cookie, bool $raw = false)
         unset($part);
 
         foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
+            if (str_contains($part, '=')) {
                 [$attr, $val] = explode('=', $part);
             } else {
                 $attr = $part;
@@ -245,7 +245,6 @@ final public function __construct(string $name, string $value = '', array $optio
     // =========================================================================
     // GETTERS
     // =========================================================================
-
     /**
      * {@inheritDoc}
      */
@@ -398,7 +397,6 @@ public function getOptions(): array
     // =========================================================================
     // CLONING
     // =========================================================================
-
     /**
      * {@inheritDoc}
      */
@@ -563,7 +561,6 @@ public function withRaw(bool $raw = true)
     // =========================================================================
     // ARRAY ACCESS FOR BC
     // =========================================================================
-
     /**
      * Whether an offset exists.
      *
@@ -621,7 +618,6 @@ public function offsetUnset($offset): void
     // =========================================================================
     // CONVERTERS
     // =========================================================================
-
     /**
      * {@inheritDoc}
      */
@@ -633,7 +629,7 @@ public function toHeaderString(): string
     /**
      * {@inheritDoc}
      */
-    public function __toString()
+    public function __toString(): string
     {
         $cookieHeader = [];
 
@@ -723,7 +719,6 @@ protected static function convertExpiresTimestamp($expires = 0): int
     // =========================================================================
     // VALIDATION
     // =========================================================================
-
     /**
      * Validates the cookie name per RFC 2616.
      *
@@ -750,11 +745,11 @@ protected function validateName(string $name, bool $raw): void
      */
     protected function validatePrefix(string $prefix, bool $secure, string $path, string $domain): void
     {
-        if (strpos($prefix, '__Secure-') === 0 && ! $secure) {
+        if (str_starts_with($prefix, '__Secure-') && ! $secure) {
             throw CookieException::forInvalidSecurePrefix();
         }
 
-        if (strpos($prefix, '__Host-') === 0 && (! $secure || $domain !== '' || $path !== '/')) {
+        if (str_starts_with($prefix, '__Host-') && (! $secure || $domain !== '' || $path !== '/')) {
             throw CookieException::forInvalidHostPrefix();
         }
     }
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index d893a4add116..867ffcecf976 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -223,7 +223,7 @@ public function getIterator(): Traversable
     protected function validateCookies(array $cookies): void
     {
         foreach ($cookies as $index => $cookie) {
-            $type = is_object($cookie) ? get_class($cookie) : gettype($cookie);
+            $type = get_debug_type($cookie);
 
             if (! $cookie instanceof Cookie) {
                 throw CookieException::forInvalidCookieInstance([static::class, Cookie::class, $type, $index]);
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 302020323577..89eb4cc347d8 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -313,7 +313,7 @@ public function __construct($tableName, ConnectionInterface $db, ?array $options
         $this->db = $db;
 
         // If it contains `,`, it has multiple tables
-        if (is_string($tableName) && strpos($tableName, ',') === false) {
+        if (is_string($tableName) && ! str_contains($tableName, ',')) {
             $this->tableName = $tableName;  // @TODO remove alias if exists
         } else {
             $this->tableName = '';
@@ -511,7 +511,7 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
             throw DataException::forEmptyInputGiven('Select');
         }
 
-        if (strpos($select, ',') !== false) {
+        if (str_contains($select, ',')) {
             throw DataException::forInvalidArgument('column name not separated by comma');
         }
 
@@ -538,7 +538,7 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
      */
     protected function createAliasFromTable(string $item): string
     {
-        if (strpos($item, '.') !== false) {
+        if (str_contains($item, '.')) {
             $item = explode('.', $item);
 
             return end($item);
@@ -574,7 +574,7 @@ public function from($from, bool $overwrite = false): self
         }
 
         foreach ((array) $from as $table) {
-            if (strpos($table, ',') !== false) {
+            if (str_contains($table, ',')) {
                 $this->from(explode(',', $table));
             } else {
                 $table = trim($table);
@@ -763,7 +763,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     $op = trim(current($op));
 
                     // Does the key end with operator?
-                    if (substr($k, -strlen($op)) === $op) {
+                    if (str_ends_with($k, $op)) {
                         $k  = rtrim(substr($k, 0, -strlen($op)));
                         $op = " {$op}";
                     } else {
@@ -2325,7 +2325,7 @@ public function insert($set = null, ?bool $escape = null)
      */
     protected function removeAlias(string $from): string
     {
-        if (strpos($from, ' ') !== false) {
+        if (str_contains($from, ' ')) {
             // if the alias is written with the AS keyword, remove it
             $from = preg_replace('/\s+AS\s+/i', ' ', $from);
 
@@ -2977,12 +2977,12 @@ protected function trackAliases($table)
 
         // Does the string contain a comma?  If so, we need to separate
         // the string into discreet statements
-        if (strpos($table, ',') !== false) {
+        if (str_contains($table, ',')) {
             return $this->trackAliases(explode(',', $table));
         }
 
         // if a table alias is used we can recognize it by a space
-        if (strpos($table, ' ') !== false) {
+        if (str_contains($table, ' ')) {
             // if the alias is written with the AS keyword, remove it
             $table = preg_replace('/\s+AS\s+/i', ' ', $table);
 
@@ -3122,11 +3122,11 @@ protected function compileWhereHaving(string $qbKey): string
 
                     if (! empty($matches[4])) {
                         $protectIdentifiers = false;
-                        if (strpos($matches[4], '.') !== false) {
+                        if (str_contains($matches[4], '.')) {
                             $protectIdentifiers = true;
                         }
 
-                        if (strpos($matches[4], ':') === false) {
+                        if (! str_contains($matches[4], ':')) {
                             $matches[4] = $this->db->protectIdentifiers(trim($matches[4]), false, $protectIdentifiers);
                         }
 
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 83303fea963d..f2cf615dcf55 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1066,7 +1066,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
         // Break the string apart if it contains periods, then insert the table prefix
         // in the correct location, assuming the period doesn't indicate that we're dealing
         // with an alias. While we're at it, we will escape the components
-        if (strpos($item, '.') !== false) {
+        if (str_contains($item, '.')) {
             return $this->protectDotItem($item, $alias, $protectIdentifiers, $fieldExists);
         }
 
@@ -1078,11 +1078,11 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
         // Is there a table prefix? If not, no need to insert it
         if ($this->DBPrefix !== '') {
             // Verify table prefix and replace if necessary
-            if ($this->swapPre !== '' && strpos($item, $this->swapPre) === 0) {
+            if ($this->swapPre !== '' && str_starts_with($item, $this->swapPre)) {
                 $item = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $item);
             }
             // Do we prefix an item with no segments?
-            elseif ($prefixSingle === true && strpos($item, $this->DBPrefix) !== 0) {
+            elseif ($prefixSingle === true && ! str_starts_with($item, $this->DBPrefix)) {
                 $item = $this->DBPrefix . $item;
             }
         }
@@ -1144,11 +1144,11 @@ private function protectDotItem(string $item, string $alias, bool $protectIdenti
             }
 
             // Verify table prefix and replace if necessary
-            if ($this->swapPre !== '' && strpos($parts[$i], $this->swapPre) === 0) {
+            if ($this->swapPre !== '' && str_starts_with($parts[$i], $this->swapPre)) {
                 $parts[$i] = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $parts[$i]);
             }
             // We only add the table prefix if it does not already exist
-            elseif (strpos($parts[$i], $this->DBPrefix) !== 0) {
+            elseif (! str_starts_with($parts[$i], $this->DBPrefix)) {
                 $parts[$i] = $this->DBPrefix . $parts[$i];
             }
 
@@ -1191,7 +1191,7 @@ public function escapeIdentifiers($item)
         if (ctype_digit($item)
             || $item[0] === "'"
             || ($this->escapeChar !== '"' && $item[0] === '"')
-            || strpos($item, '(') !== false) {
+            || str_contains($item, '(')) {
             return $item;
         }
 
@@ -1211,7 +1211,7 @@ public function escapeIdentifiers($item)
 
         foreach ($this->reservedIdentifiers as $id) {
             /** @psalm-suppress NoValue I don't know why ERROR. */
-            if (strpos($item, '.' . $id) !== false) {
+            if (str_contains($item, '.' . $id)) {
                 return preg_replace(
                     '/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?\./i',
                     $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '.',
@@ -1357,7 +1357,7 @@ public function callFunction(string $functionName, ...$params): bool
     {
         $driver = $this->getDriverFunctionPrefix();
 
-        if (strpos($driver, $functionName) === false) {
+        if (! str_contains($driver, $functionName)) {
             $functionName = $driver . $functionName;
         }
 
diff --git a/system/Database/Database.php b/system/Database/Database.php
index 2818fe220928..7d8921663faf 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -44,7 +44,7 @@ public function load(array $params = [], string $alias = '')
             throw new InvalidArgumentException('You must supply the parameter: alias.');
         }
 
-        if (! empty($params['DSN']) && strpos($params['DSN'], '://') !== false) {
+        if (! empty($params['DSN']) && str_contains($params['DSN'], '://')) {
             $params = $this->parseDSN($params);
         }
 
@@ -130,7 +130,7 @@ protected function parseDSN(array $params): array
      */
     protected function initDriver(string $driver, string $class, $argument): object
     {
-        $classname = (strpos($driver, '\\') === false)
+        $classname = (! str_contains($driver, '\\'))
             ? "CodeIgniter\\Database\\{$driver}\\{$class}"
             : $driver . '\\' . $class;
 
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index f83a9acf94a6..a39b9c554e3a 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -368,7 +368,7 @@ public function addField($field)
                 ]);
                 $this->addKey('id', true);
             } else {
-                if (strpos($field, ' ') === false) {
+                if (! str_contains($field, ' ')) {
                     throw new InvalidArgumentException('Field information is required for that operation.');
                 }
 
@@ -624,7 +624,7 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
             return false;
         }
 
-        if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0) {
+        if ($this->db->DBPrefix && str_starts_with($tableName, $this->db->DBPrefix)) {
             $tableName = substr($tableName, strlen($this->db->DBPrefix));
         }
 
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 241a9e6da5fa..ac867aaf5a94 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -450,7 +450,7 @@ public function findNamespaceMigrations(string $namespace): array
      */
     protected function migrationFromFile(string $path, string $namespace)
     {
-        if (substr($path, -4) !== '.php') {
+        if (! str_ends_with($path, '.php')) {
             return false;
         }
 
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index dd54bf9d4a11..f8b58599568b 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -221,7 +221,7 @@ protected function execute(string $sql)
     public function parseInsertTableName(string $sql): string
     {
         $commentStrippedSql = preg_replace(['/\/\*(.|\n)*?\*\//m', '/--.+/'], '', $sql);
-        $isInsertQuery      = strpos(strtoupper(ltrim($commentStrippedSql)), 'INSERT') === 0;
+        $isInsertQuery      = str_starts_with(strtoupper(ltrim($commentStrippedSql)), 'INSERT');
 
         if (! $isInsertQuery) {
             return '';
@@ -230,7 +230,7 @@ public function parseInsertTableName(string $sql): string
         preg_match('/(?is)\b(?:into)\s+("?\w+"?)/', $commentStrippedSql, $match);
         $tableName = $match[1] ?? '';
 
-        return strpos($tableName, '"') === 0 ? trim($tableName, '"') : strtoupper($tableName);
+        return str_starts_with($tableName, '"') ? trim($tableName, '"') : strtoupper($tableName);
     }
 
     /**
@@ -267,7 +267,7 @@ protected function _listTables(bool $prefixLimit = false, ?string $tableName = n
      */
     protected function _listColumns(string $table = ''): string
     {
-        if (strpos($table, '.') !== false) {
+        if (str_contains($table, '.')) {
             sscanf($table, '%[^.].%s', $owner, $table);
         } else {
             $owner = $this->username;
@@ -287,7 +287,7 @@ protected function _listColumns(string $table = ''): string
      */
     protected function _fieldData(string $table): array
     {
-        if (strpos($table, '.') !== false) {
+        if (str_contains($table, '.')) {
             sscanf($table, '%[^.].%s', $owner, $table);
         } else {
             $owner = $this->username;
@@ -335,7 +335,7 @@ protected function _fieldData(string $table): array
      */
     protected function _indexData(string $table): array
     {
-        if (strpos($table, '.') !== false) {
+        if (str_contains($table, '.')) {
             sscanf($table, '%[^.].%s', $owner, $table);
         } else {
             $owner = $this->username;
@@ -633,7 +633,7 @@ protected function buildDSN()
             return;
         }
 
-        $isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === false && strpos($this->hostname, ':') === false;
+        $isEasyConnectableHostName = $this->hostname !== '' && ! str_contains($this->hostname, '/') && ! str_contains($this->hostname, ':');
         $easyConnectablePort       = ! empty($this->port) && ctype_digit($this->port) ? ':' . $this->port : '';
         $easyConnectableDatabase   = $this->database !== '' ? '/' . ltrim($this->database, '/') : '';
 
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 6e1e85f666a1..be2dc2181f0c 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -122,7 +122,7 @@ protected function _alterTable(string $alterType, string $table, $field)
                 // so add null constraint is used only when it is different from the current null constraint.
                 // If a not null constraint is added to a column with a not null constraint,
                 // ORA-01442 will occur.
-                $wantToAddNull   = strpos($field[$i]['null'], ' NOT') === false;
+                $wantToAddNull   = ! str_contains($field[$i]['null'], ' NOT');
                 $currentNullable = $nullableMap[$field[$i]['name']];
 
                 if ($wantToAddNull === true && $currentNullable === true) {
@@ -188,7 +188,7 @@ protected function _processColumn(array $field): string
     {
         $constraint = '';
         // @todo: can't cover multi pattern when set type.
-        if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) {
+        if ($field['type'] === 'VARCHAR2' && str_starts_with($field['length'], "('")) {
             $constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
                 . ' IN ' . $field['length'] . ')';
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 56905ec922d2..53fe40ea4ca0 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -353,10 +353,10 @@ protected function _indexData(string $table): array
             $_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
             $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 
-            if (strpos($row->indexdef, 'CREATE UNIQUE INDEX pk') === 0) {
+            if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
                 $obj->type = 'PRIMARY';
             } else {
-                $obj->type = (strpos($row->indexdef, 'CREATE UNIQUE') === 0) ? 'UNIQUE' : 'INDEX';
+                $obj->type = (str_starts_with($row->indexdef, 'CREATE UNIQUE')) ? 'UNIQUE' : 'INDEX';
             }
 
             $retVal[$obj->name] = $obj;
@@ -493,7 +493,7 @@ protected function buildDSN()
         }
 
         // If UNIX sockets are used, we shouldn't set a port
-        if (strpos($this->hostname, '/') !== false) {
+        if (str_contains($this->hostname, '/')) {
             $this->port = '';
         }
 
diff --git a/system/Database/Query.php b/system/Database/Query.php
index a78190a21798..112b08720cad 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -11,10 +11,12 @@
 
 namespace CodeIgniter\Database;
 
+use Stringable;
+
 /**
  * Query builder
  */
-class Query implements QueryInterface
+class Query implements QueryInterface, Stringable
 {
     /**
      * The query string, as provided by the user.
diff --git a/system/Database/RawSql.php b/system/Database/RawSql.php
index efa97d30736c..e45921d42e7a 100644
--- a/system/Database/RawSql.php
+++ b/system/Database/RawSql.php
@@ -11,10 +11,12 @@
 
 namespace CodeIgniter\Database;
 
+use Stringable;
+
 /**
  * @see \CodeIgniter\Database\RawSqlTest
  */
-class RawSql
+class RawSql implements Stringable
 {
     /**
      * @var string Raw SQL string
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 5e3e4a73bb11..b2c207f6dc3f 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -69,7 +69,7 @@ protected function _fromTables(): string
         $from = [];
 
         foreach ($this->QBFrom as $value) {
-            $from[] = strpos($value, '(SELECT') === 0 ? $value : $this->getFullName($value);
+            $from[] = str_starts_with($value, '(SELECT') ? $value : $this->getFullName($value);
         }
 
         return implode(', ', $from);
@@ -280,7 +280,7 @@ private function getFullName(string $table): string
     {
         $alias = '';
 
-        if (strpos($table, ' ') !== false) {
+        if (str_contains($table, ' ')) {
             $alias = explode(' ', $table);
             $table = array_shift($alias);
             $alias = ' ' . implode(' ', $alias);
@@ -439,7 +439,7 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
             throw DataException::forEmptyInputGiven('Select');
         }
 
-        if (strpos($select, ',') !== false) {
+        if (str_contains($select, ',')) {
             throw DataException::forInvalidArgument('Column name not separated by comma');
         }
 
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index f1a9fb0b433a..784f527790a1 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -121,7 +121,7 @@ public function connect(bool $persistent = false)
             unset($connection['UID'], $connection['PWD']);
         }
 
-        if (strpos($this->hostname, ',') === false && $this->port !== '') {
+        if (! str_contains($this->hostname, ',') && $this->port !== '') {
             $this->hostname .= ', ' . $this->port;
         }
 
@@ -253,10 +253,10 @@ protected function _indexData(string $table): array
             $_fields     = explode(',', trim($row->index_keys));
             $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 
-            if (strpos($row->index_description, 'primary key located on') !== false) {
+            if (str_contains($row->index_description, 'primary key located on')) {
                 $obj->type = 'PRIMARY';
             } else {
-                $obj->type = (strpos($row->index_description, 'nonclustered, unique') !== false) ? 'UNIQUE' : 'INDEX';
+                $obj->type = (str_contains($row->index_description, 'nonclustered, unique')) ? 'UNIQUE' : 'INDEX';
             }
 
             $retVal[$obj->name] = $obj;
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index f41c8e4de792..dcebba75a9ab 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -81,7 +81,7 @@ public function connect(bool $persistent = false)
         }
 
         try {
-            if ($this->database !== ':memory:' && strpos($this->database, DIRECTORY_SEPARATOR) === false) {
+            if ($this->database !== ':memory:' && ! str_contains($this->database, DIRECTORY_SEPARATOR)) {
                 $this->database = WRITEPATH . $this->database;
             }
 
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index b1dcb1dd599b..6487c94bbc4c 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -143,7 +143,7 @@ protected function _alterTable(string $alterType, string $table, $field)
      */
     protected function _processColumn(array $field): string
     {
-        if ($field['type'] === 'TEXT' && strpos($field['length'], "('") === 0) {
+        if ($field['type'] === 'TEXT' && str_starts_with($field['length'], "('")) {
             $field['type'] .= ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
                 . ' IN ' . $field['length'] . ')';
         }
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 4ed9b5152eea..f9749dab03a8 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -97,7 +97,7 @@ public function fromTable(string $table)
 
         $prefix = $this->db->DBPrefix;
 
-        if (! empty($prefix) && strpos($table, $prefix) === 0) {
+        if (! empty($prefix) && str_starts_with($table, $prefix)) {
             $table = substr($table, strlen($prefix));
         }
 
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index f51fa417b4ed..ef7f7c746157 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -124,7 +124,7 @@ public function call(string $class)
             throw new InvalidArgumentException('No seeder was specified.');
         }
 
-        if (strpos($class, '\\') === false) {
+        if (! str_contains($class, '\\')) {
             $path = $this->seedPath . str_replace('.php', '', $class) . '.php';
 
             if (! is_file($path)) {
diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index 0330c53cf97c..ed73377230c9 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -74,8 +74,8 @@ protected function collectVars(Throwable $exception, int $statusCode): array
         }
 
         return [
-            'title'   => get_class($exception),
-            'type'    => get_class($exception),
+            'title'   => $exception::class,
+            'type'    => $exception::class,
             'code'    => $statusCode,
             'message' => $exception->getMessage(),
             'file'    => $exception->getFile(),
@@ -107,7 +107,7 @@ private function maskData($args, array $keysToMask, string $path = '')
             $explode = explode('/', $keyToMask);
             $index   = end($explode);
 
-            if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0) {
+            if (str_starts_with(strrev($path . '/' . $index), strrev($keyToMask))) {
                 if (is_array($args) && array_key_exists($index, $args)) {
                     $args[$index] = '******************';
                 } elseif (
@@ -169,7 +169,7 @@ protected static function highlightFile(string $file, int $lineNumber, int $line
 
         try {
             $source = file_get_contents($file);
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return false;
         }
 
diff --git a/system/Debug/ExceptionHandler.php b/system/Debug/ExceptionHandler.php
index 33b114e30341..fddf3f853e73 100644
--- a/system/Debug/ExceptionHandler.php
+++ b/system/Debug/ExceptionHandler.php
@@ -54,7 +54,7 @@ public function handle(
         if ($request instanceof IncomingRequest) {
             try {
                 $response->setStatusCode($statusCode);
-            } catch (HTTPException $e) {
+            } catch (HTTPException) {
                 // Workaround for invalid HTTP status code.
                 $statusCode = 500;
                 $response->setStatusCode($statusCode);
@@ -73,7 +73,7 @@ public function handle(
                 );
             }
 
-            if (strpos($request->getHeaderLine('accept'), 'text/html') === false) {
+            if (! str_contains($request->getHeaderLine('accept'), 'text/html')) {
                 $data = (ENVIRONMENT === 'development' || ENVIRONMENT === 'testing')
                     ? $this->collectVars($exception, $statusCode)
                     : '';
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index f3a69c32b29a..e93562e5c6d8 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -160,7 +160,7 @@ public function exceptionHandler(Throwable $exception)
         if (! is_cli()) {
             try {
                 $this->response->setStatusCode($statusCode);
-            } catch (HTTPException $e) {
+            } catch (HTTPException) {
                 // Workaround for invalid HTTP status code.
                 $statusCode = 500;
                 $this->response->setStatusCode($statusCode);
@@ -170,7 +170,7 @@ public function exceptionHandler(Throwable $exception)
                 header(sprintf('HTTP/%s %s %s', $this->request->getProtocolVersion(), $this->response->getStatusCode(), $this->response->getReasonPhrase()), true, $statusCode);
             }
 
-            if (strpos($this->request->getHeaderLine('accept'), 'text/html') === false) {
+            if (! str_contains($this->request->getHeaderLine('accept'), 'text/html')) {
                 $this->respond(ENVIRONMENT === 'development' ? $this->collectVars($exception, $statusCode) : '', $statusCode)->send();
 
                 exit($exitCode);
@@ -229,7 +229,7 @@ public function shutdownHandler()
 
         if ($this->exceptionCaughtByExceptionHandler) {
             $message .= "\n【Previous Exception】\n"
-                . get_class($this->exceptionCaughtByExceptionHandler) . "\n"
+                . $this->exceptionCaughtByExceptionHandler::class . "\n"
                 . $this->exceptionCaughtByExceptionHandler->getMessage() . "\n"
                 . $this->exceptionCaughtByExceptionHandler->getTraceAsString();
         }
@@ -329,8 +329,8 @@ protected function collectVars(Throwable $exception, int $statusCode): array
         }
 
         return [
-            'title'   => get_class($exception),
-            'type'    => get_class($exception),
+            'title'   => $exception::class,
+            'type'    => $exception::class,
             'code'    => $statusCode,
             'message' => $exception->getMessage(),
             'file'    => $exception->getFile(),
@@ -370,7 +370,7 @@ private function maskData($args, array $keysToMask, string $path = '')
             $explode = explode('/', $keyToMask);
             $index   = end($explode);
 
-            if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0) {
+            if (str_starts_with(strrev($path . '/' . $index), strrev($keyToMask))) {
                 if (is_array($args) && array_key_exists($index, $args)) {
                     $args[$index] = '******************';
                 } elseif (
@@ -454,25 +454,13 @@ private function handleDeprecationError(string $message, ?string $file = null, ?
      */
     public static function cleanPath(string $file): string
     {
-        switch (true) {
-            case strpos($file, APPPATH) === 0:
-                $file = 'APPPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(APPPATH));
-                break;
-
-            case strpos($file, SYSTEMPATH) === 0:
-                $file = 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(SYSTEMPATH));
-                break;
-
-            case strpos($file, FCPATH) === 0:
-                $file = 'FCPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(FCPATH));
-                break;
-
-            case defined('VENDORPATH') && strpos($file, VENDORPATH) === 0:
-                $file = 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(VENDORPATH));
-                break;
-        }
-
-        return $file;
+        return match (true) {
+            str_starts_with($file, APPPATH)                             => 'APPPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(APPPATH)),
+            str_starts_with($file, SYSTEMPATH)                          => 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(SYSTEMPATH)),
+            str_starts_with($file, FCPATH)                              => 'FCPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(FCPATH)),
+            defined('VENDORPATH') && str_starts_with($file, VENDORPATH) => 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(VENDORPATH)),
+            default                                                     => $file,
+        };
     }
 
     /**
@@ -518,7 +506,7 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
 
         try {
             $source = file_get_contents($file);
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return false;
         }
 
@@ -583,23 +571,12 @@ private static function renderBacktrace(array $backtrace): string
             $idx = $index;
             $idx = str_pad((string) ++$idx, 2, ' ', STR_PAD_LEFT);
 
-            $args = implode(', ', array_map(static function ($value): string {
-                switch (true) {
-                    case is_object($value):
-                        return sprintf('Object(%s)', get_class($value));
-
-                    case is_array($value):
-                        return $value !== [] ? '[...]' : '[]';
-
-                    case $value === null:
-                        return 'null';
-
-                    case is_resource($value):
-                        return sprintf('resource (%s)', get_resource_type($value));
-
-                    default:
-                        return var_export($value, true);
-                }
+            $args = implode(', ', array_map(static fn ($value): string => match (true) {
+                is_object($value)   => sprintf('Object(%s)', $value::class),
+                is_array($value)    => $value !== [] ? '[...]' : '[]',
+                $value === null     => 'null',
+                is_resource($value) => sprintf('resource (%s)', get_resource_type($value)),
+                default             => var_export($value, true),
             }, $frame['args']));
 
             $backtraces[] = sprintf(
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 19a67b455db3..21a012ec4476 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -389,7 +389,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             // Non-HTML formats should not include the debugbar
             // then we send headers saying where to find the debug data
             // for this response
-            if ($request->isAJAX() || strpos($format, 'html') === false) {
+            if ($request->isAJAX() || ! str_contains($format, 'html')) {
                 $response->setHeader('Debugbar-Time', "{$time}")
                     ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"));
 
@@ -412,7 +412,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
                 . $kintScript
                 . PHP_EOL;
 
-            if (strpos($response->getBody(), '<head>') !== false) {
+            if (str_contains($response->getBody(), '<head>')) {
                 $response->setBody(
                     preg_replace(
                         '/<head>/',
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 4b2ff96fe8b5..b52978197d0c 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -162,7 +162,7 @@ public function display(): array
                 }
 
                 // find the first trace line that does not originate from `system/`
-                if ($firstNonSystemLine === '' && strpos($line['file'], 'SYSTEMPATH') === false) {
+                if ($firstNonSystemLine === '' && ! str_contains($line['file'], 'SYSTEMPATH')) {
                     $firstNonSystemLine = $line['file'];
                 }
 
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index ea14dcfd1ec3..bc57975e73c6 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -60,7 +60,7 @@ public function display(): array
         foreach ($rawFiles as $file) {
             $path = clean_path($file);
 
-            if (strpos($path, 'SYSTEMPATH') !== false) {
+            if (str_contains($path, 'SYSTEMPATH')) {
                 $coreFiles[] = [
                     'name' => basename($file),
                     'path' => $path,
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index 0420c19b92dd..8932c6aa58ad 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -63,7 +63,7 @@ public function display(): array
         } else {
             try {
                 $method = new ReflectionMethod($router->controllerName(), $router->methodName());
-            } catch (ReflectionException $e) {
+            } catch (ReflectionException) {
                 // If we're here, the method doesn't exist
                 // and is likely calculated in _remap.
                 $method = new ReflectionMethod($router->controllerName(), '_remap');
diff --git a/system/Email/Email.php b/system/Email/Email.php
index a6ad2d993204..bca9577f4e90 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -659,7 +659,7 @@ public function setMessage($body)
     public function attach($file, $disposition = '', $newname = null, $mime = '')
     {
         if ($mime === '') {
-            if (strpos($file, '://') === false && ! is_file($file)) {
+            if (! str_contains($file, '://') && ! is_file($file)) {
                 $this->setErrorMessage(lang('Email.attachmentMissing', [$file]));
 
                 return false;
@@ -739,7 +739,7 @@ public function setHeader($header, $value)
     protected function stringToArray($email)
     {
         if (! is_array($email)) {
-            return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
+            return (str_contains($email, ',')) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
         }
 
         return $email;
@@ -863,7 +863,7 @@ protected function getEncoding()
         }
 
         foreach ($this->baseCharsets as $charset) {
-            if (strpos($this->charset, $charset) === 0) {
+            if (str_starts_with($this->charset, $charset)) {
                 $this->encoding = '7bit';
 
                 break;
@@ -1012,7 +1012,7 @@ public function wordWrap($str, $charlim = null)
             $charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
         }
 
-        if (strpos($str, "\r") !== false) {
+        if (str_contains($str, "\r")) {
             $str = str_replace(["\r\n", "\r"], "\n", $str);
         }
 
@@ -1410,7 +1410,7 @@ protected function prepQuotedPrintable($str)
         $str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
 
         // Standardize newlines
-        if (strpos($str, "\r") !== false) {
+        if (str_contains($str, "\r")) {
             $str = str_replace(["\r\n", "\r"], "\n", $str);
         }
 
@@ -1662,7 +1662,7 @@ protected function unwrapSpecials()
      */
     protected function removeNLCallback($matches)
     {
-        if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false) {
+        if (str_contains($matches[1], "\r") || str_contains($matches[1], "\n")) {
             $matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
         }
 
@@ -1843,7 +1843,7 @@ protected function sendWithSmtp()
         $this->setErrorMessage($reply);
         $this->SMTPEnd();
 
-        if (strpos($reply, '250') !== 0) {
+        if (! str_starts_with($reply, '250')) {
             $this->setErrorMessage(lang('Email.SMTPError', [$reply]));
 
             return false;
@@ -2015,11 +2015,11 @@ protected function SMTPAuthenticate()
         $this->sendData('AUTH LOGIN');
         $reply = $this->getSMTPData();
 
-        if (strpos($reply, '503') === 0) {    // Already authenticated
+        if (str_starts_with($reply, '503')) {    // Already authenticated
             return true;
         }
 
-        if (strpos($reply, '334') !== 0) {
+        if (! str_starts_with($reply, '334')) {
             $this->setErrorMessage(lang('Email.failedSMTPLogin', [$reply]));
 
             return false;
@@ -2028,7 +2028,7 @@ protected function SMTPAuthenticate()
         $this->sendData(base64_encode($this->SMTPUser));
         $reply = $this->getSMTPData();
 
-        if (strpos($reply, '334') !== 0) {
+        if (! str_starts_with($reply, '334')) {
             $this->setErrorMessage(lang('Email.SMTPAuthUsername', [$reply]));
 
             return false;
@@ -2037,7 +2037,7 @@ protected function SMTPAuthenticate()
         $this->sendData(base64_encode($this->SMTPPass));
         $reply = $this->getSMTPData();
 
-        if (strpos($reply, '235') !== 0) {
+        if (! str_starts_with($reply, '235')) {
             $this->setErrorMessage(lang('Email.SMTPAuthPassword', [$reply]));
 
             return false;
diff --git a/system/Entity/Cast/ArrayCast.php b/system/Entity/Cast/ArrayCast.php
index 315f2e582fec..d68d17c187de 100644
--- a/system/Entity/Cast/ArrayCast.php
+++ b/system/Entity/Cast/ArrayCast.php
@@ -21,7 +21,7 @@ class ArrayCast extends BaseCast
      */
     public static function get($value, array $params = []): array
     {
-        if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)) {
+        if (is_string($value) && (str_starts_with($value, 'a:') || str_starts_with($value, 's:'))) {
             $value = unserialize($value);
         }
 
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 65898c012dc9..1f414f1f6011 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -168,7 +168,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
     {
         $this->_cast = $cast;
 
-        $keys = array_filter(array_keys($this->attributes), static fn ($key) => strpos($key, '_') !== 0);
+        $keys = array_filter(array_keys($this->attributes), static fn ($key) => ! str_starts_with($key, '_'));
 
         if (is_array($this->datamap)) {
             $keys = array_unique(
@@ -369,7 +369,7 @@ protected function castAs($value, string $attribute, string $method = 'get')
 
         $isNullable = false;
 
-        if (strpos($type, '?') === 0) {
+        if (str_starts_with($type, '?')) {
             $isNullable = true;
 
             if ($value === null) {
diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php
index e259447b3f76..4bcb62be8067 100644
--- a/system/Entity/Exceptions/CastException.php
+++ b/system/Entity/Exceptions/CastException.php
@@ -41,25 +41,14 @@ public static function forInvalidInterface(string $class)
      */
     public static function forInvalidJsonFormat(int $error)
     {
-        switch ($error) {
-            case JSON_ERROR_DEPTH:
-                return new static(lang('Cast.jsonErrorDepth'));
-
-            case JSON_ERROR_STATE_MISMATCH:
-                return new static(lang('Cast.jsonErrorStateMismatch'));
-
-            case JSON_ERROR_CTRL_CHAR:
-                return new static(lang('Cast.jsonErrorCtrlChar'));
-
-            case JSON_ERROR_SYNTAX:
-                return new static(lang('Cast.jsonErrorSyntax'));
-
-            case JSON_ERROR_UTF8:
-                return new static(lang('Cast.jsonErrorUtf8'));
-
-            default:
-                return new static(lang('Cast.jsonErrorUnknown'));
-        }
+        return match ($error) {
+            JSON_ERROR_DEPTH          => new static(lang('Cast.jsonErrorDepth')),
+            JSON_ERROR_STATE_MISMATCH => new static(lang('Cast.jsonErrorStateMismatch')),
+            JSON_ERROR_CTRL_CHAR      => new static(lang('Cast.jsonErrorCtrlChar')),
+            JSON_ERROR_SYNTAX         => new static(lang('Cast.jsonErrorSyntax')),
+            JSON_ERROR_UTF8           => new static(lang('Cast.jsonErrorUtf8')),
+            default                   => new static(lang('Cast.jsonErrorUnknown')),
+        };
     }
 
     /**
diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php
index 8dfb29543a78..e316f8726d9a 100644
--- a/system/Exceptions/CastException.php
+++ b/system/Exceptions/CastException.php
@@ -32,24 +32,13 @@ public function getExitCode(): int
      */
     public static function forInvalidJsonFormatException(int $error)
     {
-        switch ($error) {
-            case JSON_ERROR_DEPTH:
-                return new static(lang('Cast.jsonErrorDepth'));
-
-            case JSON_ERROR_STATE_MISMATCH:
-                return new static(lang('Cast.jsonErrorStateMismatch'));
-
-            case JSON_ERROR_CTRL_CHAR:
-                return new static(lang('Cast.jsonErrorCtrlChar'));
-
-            case JSON_ERROR_SYNTAX:
-                return new static(lang('Cast.jsonErrorSyntax'));
-
-            case JSON_ERROR_UTF8:
-                return new static(lang('Cast.jsonErrorUtf8'));
-
-            default:
-                return new static(lang('Cast.jsonErrorUnknown'));
-        }
+        return match ($error) {
+            JSON_ERROR_DEPTH          => new static(lang('Cast.jsonErrorDepth')),
+            JSON_ERROR_STATE_MISMATCH => new static(lang('Cast.jsonErrorStateMismatch')),
+            JSON_ERROR_CTRL_CHAR      => new static(lang('Cast.jsonErrorCtrlChar')),
+            JSON_ERROR_SYNTAX         => new static(lang('Cast.jsonErrorSyntax')),
+            JSON_ERROR_UTF8           => new static(lang('Cast.jsonErrorUtf8')),
+            default                   => new static(lang('Cast.jsonErrorUnknown')),
+        };
     }
 }
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index 4cafd71177e2..5106b8b9ce03 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -60,7 +60,7 @@ public static function forCopyError(string $path)
      */
     public static function forMissingExtension(string $extension)
     {
-        if (strpos($extension, 'intl') !== false) {
+        if (str_contains($extension, 'intl')) {
             // @codeCoverageIgnoreStart
             $message = sprintf(
                 'The framework needs the following extension(s) installed and loaded: %s.',
diff --git a/system/Files/File.php b/system/Files/File.php
index 4e4ee388047e..d0842fb6bb7a 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -74,16 +74,11 @@ public function getSize()
      */
     public function getSizeByUnit(string $unit = 'b')
     {
-        switch (strtolower($unit)) {
-            case 'kb':
-                return number_format($this->getSize() / 1024, 3);
-
-            case 'mb':
-                return number_format(($this->getSize() / 1024) / 1024, 3);
-
-            default:
-                return $this->getSize();
-        }
+        return match (strtolower($unit)) {
+            'kb'    => number_format($this->getSize() / 1024, 3),
+            'mb'    => number_format(($this->getSize() / 1024) / 1024, 3),
+            default => $this->getSize(),
+        };
     }
 
     /**
@@ -173,7 +168,7 @@ public function getDestination(string $destination, string $delimiter = '_', int
             $info      = pathinfo($destination);
             $extension = isset($info['extension']) ? '.' . $info['extension'] : '';
 
-            if (strpos($info['filename'], $delimiter) !== false) {
+            if (str_contains($info['filename'], $delimiter)) {
                 $parts = explode($delimiter, $info['filename']);
 
                 if (is_numeric(end($parts))) {
diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index 87f987eb8f1e..545f8997a3b0 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -83,7 +83,7 @@ final protected static function filterFiles(array $files, string $directory): ar
     {
         $directory = self::resolveDirectory($directory);
 
-        return array_filter($files, static fn (string $value): bool => strpos($value, $directory) === 0);
+        return array_filter($files, static fn (string $value): bool => str_starts_with($value, $directory));
     }
 
     /**
@@ -180,7 +180,7 @@ public function add($paths, bool $recursive = true)
             try {
                 // Test for a directory
                 self::resolveDirectory($path);
-            } catch (FileException $e) {
+            } catch (FileException) {
                 $this->addFile($path);
 
                 continue;
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 33101aa512db..6c9b1fddffb2 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -175,7 +175,7 @@ public function run(string $uri, string $position = 'before')
             $class = new $className();
 
             if (! $class instanceof FilterInterface) {
-                throw FilterException::forIncorrectInterface(get_class($class));
+                throw FilterException::forIncorrectInterface($class::class);
             }
 
             if ($position === 'before') {
@@ -372,7 +372,7 @@ private function getCleanName(string $name): array
     {
         $arguments = [];
 
-        if (strpos($name, ':') !== false) {
+        if (str_contains($name, ':')) {
             [$name, $arguments] = explode(':', $name);
 
             $arguments = explode(',', $arguments);
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 0604c3367b7a..d35b7a5fa180 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -323,7 +323,7 @@ protected function parseOptions(array $options)
     protected function prepareURL(string $url): string
     {
         // If it's a full URI, then we have nothing to do here...
-        if (strpos($url, '://') !== false) {
+        if (str_contains($url, '://')) {
             return $url;
         }
 
@@ -389,16 +389,16 @@ public function send(string $method, string $url)
         // Set the string we want to break our response from
         $breakString = "\r\n\r\n";
 
-        if (strpos($output, 'HTTP/1.1 100 Continue') === 0) {
+        if (str_starts_with($output, 'HTTP/1.1 100 Continue')) {
             $output = substr($output, strpos($output, $breakString) + 4);
         }
 
-        if (strpos($output, 'HTTP/1.1 200 Connection established') === 0) {
+        if (str_starts_with($output, 'HTTP/1.1 200 Connection established')) {
             $output = substr($output, strpos($output, $breakString) + 4);
         }
 
         // If request and response have Digest
-        if (isset($this->config['auth'][2]) && $this->config['auth'][2] === 'digest' && strpos($output, 'WWW-Authenticate: Digest') !== false) {
+        if (isset($this->config['auth'][2]) && $this->config['auth'][2] === 'digest' && str_contains($output, 'WWW-Authenticate: Digest')) {
             $output = substr($output, strpos($output, $breakString) + 4);
         }
 
@@ -496,7 +496,7 @@ protected function setResponseHeaders(array $headers = [])
                 $value = substr($header, $pos + 1);
 
                 $this->response->setHeader($title, $value);
-            } elseif (strpos($header, 'HTTP') === 0) {
+            } elseif (str_starts_with($header, 'HTTP')) {
                 preg_match('#^HTTP\/([12](?:\.[01])?) (\d+) (.+)#', $header, $matches);
 
                 if (isset($matches[1])) {
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 37b0ce650ff7..17790aafd2e6 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -795,7 +795,7 @@ protected function addToHeader(string $name, $values = null)
                 $reportOnly = $this->reportOnly;
             }
 
-            if (strpos($value, 'nonce-') === 0) {
+            if (str_starts_with($value, 'nonce-')) {
                 $value = "'{$value}'";
             }
 
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index f01cc69f5902..62b2ba9a3b1d 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -57,7 +57,7 @@ public function getFile(string $name)
         $this->populateFiles();
 
         if ($this->hasFile($name)) {
-            if (strpos($name, '.') !== false) {
+            if (str_contains($name, '.')) {
                 $name         = explode('.', $name);
                 $uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
 
@@ -84,7 +84,7 @@ public function getFileMultiple(string $name)
         $this->populateFiles();
 
         if ($this->hasFile($name)) {
-            if (strpos($name, '.') !== false) {
+            if (str_contains($name, '.')) {
                 $name         = explode('.', $name);
                 $uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
 
@@ -113,7 +113,7 @@ public function hasFile(string $fileID): bool
     {
         $this->populateFiles();
 
-        if (strpos($fileID, '.') !== false) {
+        if (str_contains($fileID, '.')) {
             $segments = explode('.', $fileID);
 
             $el = $this->files;
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 70ece748d834..b81881c62cb3 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -151,7 +151,7 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
 
         try {
             $this->hasMoved = move_uploaded_file($this->path, $destination);
-        } catch (Exception $e) {
+        } catch (Exception) {
             $error   = error_get_last();
             $message = strip_tags($error['message'] ?? '');
 
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index 67c6cb0636d3..ad4f785ac772 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\HTTP;
 
+use Stringable;
+
 /**
  * Class Header
  *
@@ -18,7 +20,7 @@
  *
  * @see \CodeIgniter\HTTP\HeaderTest
  */
-class Header
+class Header implements Stringable
 {
     /**
      * The name of the header.
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 458e8ef88043..fc355e7572ac 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -162,7 +162,7 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U
             $body === 'php://input'
             // php://input is not available with enctype="multipart/form-data".
             // See https://www.php.net/manual/en/wrappers.php.php#wrappers.php.input
-            && strpos($this->getHeaderLine('Content-Type'), 'multipart/form-data') === false
+            && ! str_contains($this->getHeaderLine('Content-Type'), 'multipart/form-data')
             && (int) $this->getHeaderLine('Content-Length') <= $this->getPostMaxSize()
         ) {
             // Get our body from php://input
@@ -190,24 +190,12 @@ private function getPostMaxSize(): int
     {
         $postMaxSize = ini_get('post_max_size');
 
-        switch (strtoupper(substr($postMaxSize, -1))) {
-            case 'G':
-                $postMaxSize = (int) str_replace('G', '', $postMaxSize) * 1024 ** 3;
-                break;
-
-            case 'M':
-                $postMaxSize = (int) str_replace('M', '', $postMaxSize) * 1024 ** 2;
-                break;
-
-            case 'K':
-                $postMaxSize = (int) str_replace('K', '', $postMaxSize) * 1024;
-                break;
-
-            default:
-                $postMaxSize = (int) $postMaxSize;
-        }
-
-        return $postMaxSize;
+        return match (strtoupper(substr($postMaxSize, -1))) {
+            'G'     => (int) str_replace('G', '', $postMaxSize) * 1024 ** 3,
+            'M'     => (int) str_replace('M', '', $postMaxSize) * 1024 ** 2,
+            'K'     => (int) str_replace('K', '', $postMaxSize) * 1024,
+            default => (int) $postMaxSize,
+        };
     }
 
     /**
@@ -255,20 +243,11 @@ public function detectPath(string $protocol = ''): string
             $protocol = 'REQUEST_URI';
         }
 
-        switch ($protocol) {
-            case 'REQUEST_URI':
-                $this->path = $this->parseRequestURI();
-                break;
-
-            case 'QUERY_STRING':
-                $this->path = $this->parseQueryString();
-                break;
-
-            case 'PATH_INFO':
-            default:
-                $this->path = $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI();
-                break;
-        }
+        $this->path = match ($protocol) {
+            'REQUEST_URI'  => $this->parseRequestURI(),
+            'QUERY_STRING' => $this->parseQueryString(),
+            default        => $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI(),
+        };
 
         return $this->path;
     }
@@ -316,7 +295,7 @@ protected function parseRequestURI(): string
 
         // This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct
         // URI is found, and also fixes the QUERY_STRING Server var and $_GET array.
-        if (trim($uri, '/') === '' && strncmp($query, '/', 1) === 0) {
+        if (trim($uri, '/') === '' && str_starts_with($query, '/')) {
             $query                   = explode('?', $query, 2);
             $uri                     = $query[0];
             $_SERVER['QUERY_STRING'] = $query[1] ?? '';
@@ -349,7 +328,7 @@ protected function parseQueryString(): string
             return '/';
         }
 
-        if (strncmp($uri, '/', 1) === 0) {
+        if (str_starts_with($uri, '/')) {
             $uri                     = explode('?', $uri, 2);
             $_SERVER['QUERY_STRING'] = $uri[1] ?? '';
             $uri                     = $uri[0];
@@ -375,21 +354,13 @@ public function negotiate(string $type, array $supported, bool $strictMatch = fa
             $this->negotiator = Services::negotiator($this, true);
         }
 
-        switch (strtolower($type)) {
-            case 'media':
-                return $this->negotiator->media($supported, $strictMatch);
-
-            case 'charset':
-                return $this->negotiator->charset($supported);
-
-            case 'encoding':
-                return $this->negotiator->encoding($supported);
-
-            case 'language':
-                return $this->negotiator->language($supported);
-        }
-
-        throw HTTPException::forInvalidNegotiationType($type);
+        return match (strtolower($type)) {
+            'media'    => $this->negotiator->media($supported, $strictMatch),
+            'charset'  => $this->negotiator->charset($supported),
+            'encoding' => $this->negotiator->encoding($supported),
+            'language' => $this->negotiator->language($supported),
+            default    => throw HTTPException::forInvalidNegotiationType($type),
+        };
     }
 
     /**
@@ -409,7 +380,7 @@ public function is(string $type): bool
         }
 
         if ($valueUpper === 'JSON') {
-            return strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false;
+            return str_contains($this->getHeaderLine('Content-Type'), 'application/json');
         }
 
         if ($valueUpper === 'AJAX') {
@@ -545,7 +516,7 @@ public function getDefaultLocale(): string
     public function getVar($index = null, $filter = null, $flags = null)
     {
         if (
-            strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false
+            str_contains($this->getHeaderLine('Content-Type'), 'application/json')
             && $this->body !== null
         ) {
             return $this->getJsonVar($index, false, $filter, $flags);
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index d6f234ca9f68..78eee910edc2 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -35,7 +35,7 @@ public function to(string $uri, ?int $code = null, string $method = 'auto')
     {
         // If it appears to be a relative URL, then convert to full URL
         // for better security.
-        if (strpos($uri, 'http') !== 0) {
+        if (! str_starts_with($uri, 'http')) {
             $uri = site_url($uri);
         }
 
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 52ffa812a315..9b6694a810d6 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -78,7 +78,7 @@ public function getIPAddress(): string
         // @TODO Extract all this IP address logic to another class.
         foreach ($proxyIPs as $proxyIP => $header) {
             // Check if we have an IP address or a subnet
-            if (strpos($proxyIP, '/') === false) {
+            if (! str_contains($proxyIP, '/')) {
                 // An IP address (and not a subnet) is specified.
                 // We can compare right away.
                 if ($proxyIP === $this->ipAddress) {
@@ -99,7 +99,7 @@ public function getIPAddress(): string
             }
 
             // If the proxy entry doesn't match the IP protocol - skip it
-            if (strpos($proxyIP, $separator) === false) {
+            if (! str_contains($proxyIP, $separator)) {
                 continue;
             }
 
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 7c0741317bc0..815e7db61dcf 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -507,7 +507,7 @@ public function redirect(string $uri, string $method = 'auto', ?int $code = null
         if (
             $method === 'auto'
             && isset($_SERVER['SERVER_SOFTWARE'])
-            && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false
+            && str_contains($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS')
         ) {
             $method = 'refresh';
         } elseif ($method !== 'refresh' && $code === null) {
@@ -531,15 +531,10 @@ public function redirect(string $uri, string $method = 'auto', ?int $code = null
             $code = 302;
         }
 
-        switch ($method) {
-            case 'refresh':
-                $this->setHeader('Refresh', '0;url=' . $uri);
-                break;
-
-            default:
-                $this->setHeader('Location', $uri);
-                break;
-        }
+        match ($method) {
+            'refresh' => $this->setHeader('Refresh', '0;url=' . $uri),
+            default   => $this->setHeader('Location', $uri),
+        };
 
         $this->setStatusCode($code);
 
diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
index 3a163bdac428..5fb5fa68fbc8 100644
--- a/system/HTTP/SiteURI.php
+++ b/system/HTTP/SiteURI.php
@@ -15,13 +15,14 @@
 use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
+use Stringable;
 
 /**
  * URI for the application site
  *
  * @see \CodeIgniter\HTTP\SiteURITest
  */
-class SiteURI extends URI
+class SiteURI extends URI implements Stringable
 {
     /**
      * The current baseURL.
diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php
index 36b9d705b28c..fd4921be913c 100644
--- a/system/HTTP/SiteURIFactory.php
+++ b/system/HTTP/SiteURIFactory.php
@@ -95,20 +95,11 @@ public function detectRoutePath(string $protocol = ''): string
             $protocol = $this->appConfig->uriProtocol;
         }
 
-        switch ($protocol) {
-            case 'REQUEST_URI':
-                $routePath = $this->parseRequestURI();
-                break;
-
-            case 'QUERY_STRING':
-                $routePath = $this->parseQueryString();
-                break;
-
-            case 'PATH_INFO':
-            default:
-                $routePath = $this->superglobals->server($protocol) ?? $this->parseRequestURI();
-                break;
-        }
+        $routePath = match ($protocol) {
+            'REQUEST_URI'  => $this->parseRequestURI(),
+            'QUERY_STRING' => $this->parseQueryString(),
+            default        => $this->superglobals->server($protocol) ?? $this->parseRequestURI(),
+        };
 
         return ($routePath === '/' || $routePath === '') ? '/' : ltrim($routePath, '/');
     }
@@ -161,7 +152,7 @@ private function parseRequestURI(): string
         // This section ensures that even on servers that require the URI to
         // contain the query string (Nginx) a correct URI is found, and also
         // fixes the QUERY_STRING Server var and $_GET array.
-        if (trim($path, '/') === '' && strncmp($query, '/', 1) === 0) {
+        if (trim($path, '/') === '' && str_starts_with($query, '/')) {
             $parts    = explode('?', $query, 2);
             $path     = $parts[0];
             $newQuery = $query[1] ?? '';
@@ -193,7 +184,7 @@ private function parseQueryString(): string
             return '/';
         }
 
-        if (strncmp($query, '/', 1) === 0) {
+        if (str_starts_with($query, '/')) {
             $parts    = explode('?', $query, 2);
             $path     = $parts[0];
             $newQuery = $parts[1] ?? '';
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index c6fd64ae4418..d965a471895e 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -15,13 +15,14 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
 use InvalidArgumentException;
+use Stringable;
 
 /**
  * Abstraction for a uniform resource identifier (URI).
  *
  * @see \CodeIgniter\HTTP\URITest
  */
-class URI
+class URI implements Stringable
 {
     /**
      * Sub-delimiters used in query strings and fragments.
@@ -172,7 +173,7 @@ public static function createURIString(
         }
 
         if (isset($path) && $path !== '') {
-            $uri .= substr($uri, -1, 1) !== '/'
+            $uri .= ! str_ends_with($uri, '/')
                 ? '/' . ltrim($path, '/')
                 : ltrim($path, '/');
         }
@@ -228,12 +229,12 @@ public static function removeDotSegments(string $path): string
         $output = trim($output, '/ ');
 
         // Add leading slash if necessary
-        if (strpos($path, '/') === 0) {
+        if (str_starts_with($path, '/')) {
             $output = '/' . $output;
         }
 
         // Add trailing slash if necessary
-        if ($output !== '/' && substr($path, -1, 1) === '/') {
+        if ($output !== '/' && str_ends_with($path, '/')) {
             $output .= '/';
         }
 
@@ -652,14 +653,14 @@ private function changeSchemeAndPath(string $scheme, string $path): array
         $baseUri = new self($config->baseURL);
 
         if (
-            substr($this->getScheme(), 0, 4) === 'http'
+            str_starts_with($this->getScheme(), 'http')
             && $this->getHost() === $baseUri->getHost()
         ) {
             // Check for additional segments
             $basePath = trim($baseUri->getPath(), '/') . '/';
             $trimPath = ltrim($path, '/');
 
-            if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0) {
+            if ($basePath !== '/' && ! str_starts_with($trimPath, $basePath)) {
                 $path = $basePath . $trimPath;
             }
 
@@ -877,7 +878,7 @@ public function refreshPath()
      */
     public function setQuery(string $query)
     {
-        if (strpos($query, '#') !== false) {
+        if (str_contains($query, '#')) {
             if ($this->silent) {
                 return $this;
             }
@@ -886,7 +887,7 @@ public function setQuery(string $query)
         }
 
         // Can't have leading ?
-        if (! empty($query) && strpos($query, '?') === 0) {
+        if (! empty($query) && str_starts_with($query, '?')) {
             $query = substr($query, 1);
         }
 
@@ -1008,10 +1009,10 @@ protected function filterPath(?string $path = null): string
         $path = self::removeDotSegments($path);
 
         // Fix up some leading slash edge cases...
-        if (strpos($orig, './') === 0) {
+        if (str_starts_with($orig, './')) {
             $path = '/' . $path;
         }
-        if (strpos($orig, '../') === 0) {
+        if (str_starts_with($orig, '../')) {
             $path = '/' . $path;
         }
 
@@ -1112,7 +1113,7 @@ public function resolveRelativeURI(string $uri)
                     $transformed->setQuery($this->getQuery());
                 }
             } else {
-                if (strpos($relative->getPath(), '/') === 0) {
+                if (str_starts_with($relative->getPath(), '/')) {
                     $transformed->setPath($relative->getPath());
                 } else {
                     $transformed->setPath($this->mergePaths($this, $relative));
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 77e7cb4392fc..4461ddc9db93 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -12,13 +12,14 @@
 namespace CodeIgniter\HTTP;
 
 use Config\UserAgents;
+use Stringable;
 
 /**
  * Abstraction for an HTTP user agent
  *
  * @see \CodeIgniter\HTTP\UserAgentTest
  */
-class UserAgent
+class UserAgent implements Stringable
 {
     /**
      * Current user-agent
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 47c829bbc3c6..cd46d7dc3721 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -53,7 +53,7 @@ function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden
             closedir($fp);
 
             return $fileData;
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return [];
         }
     }
@@ -129,7 +129,7 @@ function write_file(string $path, string $data, string $mode = 'wb'): bool
             fclose($fp);
 
             return is_int($result);
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return false;
         }
     }
@@ -178,7 +178,7 @@ function delete_files(string $path, bool $delDir = false, bool $htdocs = false,
             }
 
             return true;
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return false;
         }
     }
@@ -227,7 +227,7 @@ function get_filenames(
                     }
                 }
             }
-        } catch (Throwable $e) {
+        } catch (Throwable) {
             return [];
         }
 
@@ -277,7 +277,7 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r
             closedir($fp);
 
             return $fileData;
-        } catch (Throwable $fe) {
+        } catch (Throwable) {
             return [];
         }
     }
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 7f8f191a3a6f..74523f21d0c4 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -32,9 +32,9 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
         if (! $action) {
             $action = current_url(true);
         } // If an action is not a full URL then turn it into one
-        elseif (strpos($action, '://') === false) {
+        elseif (! str_contains($action, '://')) {
             // If an action has {locale}
-            if (strpos($action, '{locale}') !== false) {
+            if (str_contains($action, '{locale}')) {
                 $action = str_replace('{locale}', Services::request()->getLocale(), $action);
             }
 
@@ -61,7 +61,7 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
         // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
         $before = Services::filters()->getFilters()['before'];
 
-        if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && strpos($action, base_url()) !== false && ! stripos($form, 'method="get"')) {
+        if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && str_contains($action, base_url()) && ! stripos($form, 'method="get"')) {
             $form .= csrf_field($csrfId ?? null);
         }
 
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index c7a36e270860..b7ffcc73ccb4 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -108,7 +108,7 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string
         $img = '<img';
 
         // Check for a relative URI
-        if (! preg_match('#^([a-z]+:)?//#i', $src['src']) && strpos($src['src'], 'data:') !== 0) {
+        if (! preg_match('#^([a-z]+:)?//#i', $src['src']) && ! str_starts_with($src['src'], 'data:')) {
             if ($indexPage === true) {
                 $img .= ' src="' . site_url($src['src']) . '"';
             } else {
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 74173501e177..a318e4d54a19 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -25,7 +25,7 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
         try {
             // @phpstan-ignore-next-line
             $num = 0 + str_replace(',', '', $num);
-        } catch (ErrorException $ee) {
+        } catch (ErrorException) {
             // Catch "Warning:  A non-numeric value encountered"
             return false;
         }
@@ -80,7 +80,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
         try {
             // @phpstan-ignore-next-line
             $num = 0 + str_replace(',', '', $num);
-        } catch (ErrorException $ee) {
+        } catch (ErrorException) {
             return false;
         }
 
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 56cf856fbda7..b62adca3a9a9 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -341,7 +341,7 @@ function word_wrap(string $str, int $charlim = 76): string
         $str = preg_replace('| +|', ' ', $str);
 
         // Standardize newlines
-        if (strpos($str, "\r") !== false) {
+        if (str_contains($str, "\r")) {
             $str = str_replace(["\r\n", "\r"], "\n", $str);
         }
 
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index c2f3cf67cc7b..250a434b1602 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -44,7 +44,7 @@ public function __construct(HoneypotConfig $config)
             throw HoneypotException::forNoHiddenValue();
         }
 
-        if (empty($this->config->container) || strpos($this->config->container, '{template}') === false) {
+        if (empty($this->config->container) || ! str_contains($this->config->container, '{template}')) {
             $this->config->container = '<div style="display:none">{template}</div>';
         }
 
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index cf23fd0fcd23..2d2412a28cf2 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -471,31 +471,16 @@ public function reorient(bool $silent = false)
     {
         $orientation = $this->getEXIF('Orientation', $silent);
 
-        switch ($orientation) {
-            case 2:
-                return $this->flip('horizontal');
-
-            case 3:
-                return $this->rotate(180);
-
-            case 4:
-                return $this->rotate(180)->flip('horizontal');
-
-            case 5:
-                return $this->rotate(270)->flip('horizontal');
-
-            case 6:
-                return $this->rotate(270);
-
-            case 7:
-                return $this->rotate(90)->flip('horizontal');
-
-            case 8:
-                return $this->rotate(90);
-
-            default:
-                return $this;
-        }
+        return match ($orientation) {
+            2       => $this->flip('horizontal'),
+            3       => $this->rotate(180),
+            4       => $this->rotate(180)->flip('horizontal'),
+            5       => $this->rotate(270)->flip('horizontal'),
+            6       => $this->rotate(270),
+            7       => $this->rotate(90)->flip('horizontal'),
+            8       => $this->rotate(90),
+            default => $this,
+        };
     }
 
     /**
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 857a273d5372..839a2e4790cc 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -448,30 +448,15 @@ public function reorient(bool $silent = false)
     {
         $orientation = $this->getEXIF('Orientation', $silent);
 
-        switch ($orientation) {
-            case 2:
-                return $this->flip('horizontal');
-
-            case 3:
-                return $this->rotate(180);
-
-            case 4:
-                return $this->rotate(180)->flip('horizontal');
-
-            case 5:
-                return $this->rotate(90)->flip('horizontal');
-
-            case 6:
-                return $this->rotate(90);
-
-            case 7:
-                return $this->rotate(270)->flip('horizontal');
-
-            case 8:
-                return $this->rotate(270);
-
-            default:
-                return $this;
-        }
+        return match ($orientation) {
+            2       => $this->flip('horizontal'),
+            3       => $this->rotate(180),
+            4       => $this->rotate(180)->flip('horizontal'),
+            5       => $this->rotate(90)->flip('horizontal'),
+            6       => $this->rotate(90),
+            7       => $this->rotate(270)->flip('horizontal'),
+            8       => $this->rotate(270),
+            default => $this,
+        };
     }
 }
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 70d109e2319b..264837318bdc 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -92,7 +92,7 @@ public function getLocale(): string
     public function getLine(string $line, array $args = [])
     {
         // if no file is given, just parse the line
-        if (strpos($line, '.') === false) {
+        if (! str_contains($line, '.')) {
             return $this->formatMessage($line, $args);
         }
 
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index b04d6f69238c..983ee274c6fc 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -142,7 +142,7 @@ protected function format($object)
         // @todo Modify formatting of objects once we can view them in browser.
         $objectArray = (array) $object;
 
-        $objectArray['___class_name'] = get_class($object);
+        $objectArray['___class_name'] = $object::class;
 
         return $objectArray;
     }
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 88e384781a70..7c10d3231503 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -88,7 +88,7 @@ public function handle($level, $message): bool
         }
 
         // Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
-        if (strpos($this->dateFormat, 'u') !== false) {
+        if (str_contains($this->dateFormat, 'u')) {
             $microtimeFull  = microtime(true);
             $microtimeShort = sprintf('%06d', ($microtimeFull - floor($microtimeFull)) * 1_000_000);
             $date           = new DateTime(date('Y-m-d H:i:s.' . $microtimeShort, (int) $microtimeFull));
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index b1583f5d789c..2a577d6fb415 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -341,7 +341,7 @@ protected function interpolate($message, array $context = [])
         $replace['{env}']       = ENVIRONMENT;
 
         // Allow us to log the file/line that we are logging from
-        if (strpos($message, '{file}') !== false) {
+        if (str_contains($message, '{file}')) {
             [$file, $line] = $this->determineFile();
 
             $replace['{file}'] = $file;
@@ -349,7 +349,7 @@ protected function interpolate($message, array $context = [])
         }
 
         // Match up environment variables in {env:foo} tags.
-        if (strpos($message, 'env:') !== false) {
+        if (str_contains($message, 'env:')) {
             preg_match('/env:[^}]+/', $message, $matches);
 
             foreach ($matches as $str) {
diff --git a/system/Model.php b/system/Model.php
index e53c0aae4bd1..b7448032af39 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -502,7 +502,7 @@ protected function doErrors()
             return [];
         }
 
-        return [get_class($this->db) => $error['message']];
+        return [$this->db::class => $error['message']];
     }
 
     /**
@@ -931,22 +931,12 @@ public static function classToArray($data, $primaryKey = null, string $dateForma
         if ($properties) {
             foreach ($properties as $key => $value) {
                 if ($value instanceof Time) {
-                    switch ($dateFormat) {
-                        case 'datetime':
-                            $converted = $value->format('Y-m-d H:i:s');
-                            break;
-
-                        case 'date':
-                            $converted = $value->format('Y-m-d');
-                            break;
-
-                        case 'int':
-                            $converted = $value->getTimestamp();
-                            break;
-
-                        default:
-                            $converted = (string) $value;
-                    }
+                    $converted = match ($dateFormat) {
+                        'datetime' => $value->format('Y-m-d H:i:s'),
+                        'date'     => $value->format('Y-m-d'),
+                        'int'      => $value->getTimestamp(),
+                        default    => (string) $value,
+                    };
 
                     $properties[$key] = $converted;
                 }
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 648bb1e5e4de..e089a6ad5694 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -425,7 +425,7 @@ protected function calculateCurrentPage(string $group)
             try {
                 $this->groups[$group]['currentPage'] = (int) $this->groups[$group]['currentUri']
                     ->setSilent(false)->getSegment($this->segment[$group]);
-            } catch (HTTPException $e) {
+            } catch (HTTPException) {
                 $this->groups[$group]['currentPage'] = 1;
             }
         } else {
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index e40a14c88905..c138a440c2e5 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -167,7 +167,7 @@ public function __construct(?string $source = null, ?string $destination = null)
 
         // Make sure the destination is allowed
         foreach (array_keys($this->restrictions) as $directory) {
-            if (strpos($this->destination, $directory) === 0) {
+            if (str_starts_with($this->destination, $directory)) {
                 return;
             }
         }
@@ -470,7 +470,7 @@ private function verifyAllowed(string $from, string $to): void
     {
         // Verify this is an allowed file for its destination
         foreach ($this->restrictions as $directory => $pattern) {
-            if (strpos($to, $directory) === 0 && self::matchFiles([$to], $pattern) === []) {
+            if (str_starts_with($to, $directory) && self::matchFiles([$to], $pattern) === []) {
                 throw PublisherException::forFileNotAllowed($from, $directory, $pattern);
             }
         }
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index 1c21f65da860..269014ee8b77 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -69,7 +69,7 @@ public function setModel($which = null)
         }
 
         if (! empty($this->model) && empty($this->modelName)) {
-            $this->modelName = get_class($this->model);
+            $this->modelName = $this->model::class;
         }
     }
 }
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index f7cd02a3d329..2fdce3208d79 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -134,13 +134,13 @@ public function getRoute(string $uri, string $httpVerb): array
                     $handler = strtolower($handler);
 
                     // Like $routes->cli('hello/(:segment)', 'Home::$1')
-                    if (strpos($handler, '::$') !== false) {
+                    if (str_contains($handler, '::$')) {
                         throw new PageNotFoundException(
                             'Cannot access CLI Route: ' . $uri
                         );
                     }
 
-                    if (strpos($handler, $controller . '::' . $methodName) === 0) {
+                    if (str_starts_with($handler, $controller . '::' . $methodName)) {
                         throw new PageNotFoundException(
                             'Cannot access CLI Route: ' . $uri
                         );
@@ -163,7 +163,7 @@ public function getRoute(string $uri, string $httpVerb): array
 
         // Ensure the controller stores the fully-qualified class name
         // We have to check for a length over 1, since by default it will be '\'
-        if (strpos($this->controller, '\\') === false && strlen($this->defaultNamespace) > 1) {
+        if (! str_contains($this->controller, '\\') && strlen($this->defaultNamespace) > 1) {
             $this->controller = '\\' . ltrim(
                 str_replace(
                     '/',
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 0a26fc12f865..12c566b45ed8 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -344,7 +344,7 @@ public function getRoute(string $uri, string $httpVerb): array
         // Check parameter count
         try {
             $this->checkParameters($uri);
-        } catch (MethodNotFoundException $e) {
+        } catch (MethodNotFoundException) {
             throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
         }
 
@@ -418,7 +418,7 @@ private function checkParameters(string $uri): void
         try {
             $refMethod = $refClass->getMethod($this->method);
             $refParams = $refMethod->getParameters();
-        } catch (ReflectionException $e) {
+        } catch (ReflectionException) {
             throw new MethodNotFoundException();
         }
 
@@ -445,7 +445,7 @@ private function checkRemap(): void
                 'AutoRouterImproved does not support `_remap()` method.'
                 . ' Controller:' . $this->controller
             );
-        } catch (ReflectionException $e) {
+        } catch (ReflectionException) {
             // Do nothing.
         }
     }
@@ -459,7 +459,7 @@ private function checkUnderscore(string $uri): void
         $paramPos = $this->paramPos ?? count($this->segments);
 
         for ($i = 0; $i < $paramPos; $i++) {
-            if (strpos($this->segments[$i], '_') !== false) {
+            if (str_contains($this->segments[$i], '_')) {
                 throw new PageNotFoundException(
                     'AutoRouterImproved prohibits access to the URI'
                     . ' containing underscores ("' . $this->segments[$i] . '")'
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index ca080152ff28..86c244ece63f 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1170,8 +1170,8 @@ public function reverseRoute(string $search, ...$params)
         // Add the default namespace if needed.
         $namespace = trim($this->defaultNamespace, '\\') . '\\';
         if (
-            substr($search, 0, 1) !== '\\'
-            && substr($search, 0, strlen($namespace)) !== $namespace
+            ! str_starts_with($search, '\\')
+            && ! str_starts_with($search, $namespace)
         ) {
             $search = $namespace . $search;
         }
@@ -1195,7 +1195,7 @@ public function reverseRoute(string $search, ...$params)
 
                 // If there's any chance of a match, then it will
                 // be with $search at the beginning of the $to string.
-                if (strpos($to, $search) !== 0) {
+                if (! str_starts_with($to, $search)) {
                     continue;
                 }
 
@@ -1316,7 +1316,7 @@ protected function buildReverseRoute(string $from, array $params): string
         preg_match_all('/\(([^)]+)\)/', $from, $matches);
 
         if (empty($matches[0])) {
-            if (strpos($from, '{locale}') !== false) {
+            if (str_contains($from, '{locale}')) {
                 $locale = $params[0] ?? null;
             }
 
@@ -1372,7 +1372,7 @@ protected function buildReverseRoute(string $from, array $params): string
      */
     private function replaceLocale(string $route, ?string $locale = null): string
     {
-        if (strpos($route, '{locale}') === false) {
+        if (! str_contains($route, '{locale}')) {
             return $route;
         }
 
@@ -1477,7 +1477,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         // If is redirect, No processing
         if (! isset($options['redirect']) && is_string($to)) {
             // If no namespace found, add the default namespace
-            if (strpos($to, '\\') === false || strpos($to, '\\') > 0) {
+            if (! str_contains($to, '\\') || strpos($to, '\\') > 0) {
                 $namespace = $options['namespace'] ?? $this->defaultNamespace;
                 $to        = trim($namespace, '\\') . '\\' . $to;
             }
@@ -1616,7 +1616,7 @@ private function determineCurrentSubdomain()
         // on the URL else parse_url will mis-interpret
         // 'host' as the 'path'.
         $url = $this->httpHost;
-        if (strpos($url, 'http') !== 0) {
+        if (! str_starts_with($url, 'http')) {
             $url = 'http://' . $url;
         }
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 3e2f504b38bb..c5715362a9e1 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -387,7 +387,7 @@ protected function checkRoutes(string $uri): bool
             $matchedKey = $routeKey;
 
             // Are we dealing with a locale?
-            if (strpos($routeKey, '{locale}') !== false) {
+            if (str_contains($routeKey, '{locale}')) {
                 $routeKey = str_replace('{locale}', '[^/]+', $routeKey);
             }
 
@@ -409,7 +409,7 @@ protected function checkRoutes(string $uri): bool
                 }
                 // Store our locale so CodeIgniter object can
                 // assign it to the Request.
-                if (strpos($matchedKey, '{locale}') !== false) {
+                if (str_contains($matchedKey, '{locale}')) {
                     preg_match(
                         '#^' . str_replace('{locale}', '(?<locale>[^/]+)', $matchedKey) . '$#u',
                         $uri,
@@ -446,13 +446,13 @@ protected function checkRoutes(string $uri): bool
                 [$controller] = explode('::', $handler);
 
                 // Checks `/` in controller name
-                if (strpos($controller, '/') !== false) {
+                if (str_contains($controller, '/')) {
                     throw RouterException::forInvalidControllerName($handler);
                 }
 
-                if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
+                if (str_contains($handler, '$') && str_contains($routeKey, '(')) {
                     // Checks dynamic controller
-                    if (strpos($controller, '$') !== false) {
+                    if (str_contains($controller, '$')) {
                         throw RouterException::forDynamicController($handler);
                     }
 
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 4ba665639f36..89574b6e2b6b 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -291,7 +291,7 @@ public function verify(RequestInterface $request)
         try {
             $token = ($postedToken !== null && $this->config->tokenRandomize)
                 ? $this->derandomize($postedToken) : $postedToken;
-        } catch (InvalidArgumentException $e) {
+        } catch (InvalidArgumentException) {
             $token = null;
         }
 
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index a0c84c48f2b7..fcd23bb34a91 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -478,7 +478,7 @@ public function assertCloseEnoughString($expected, $actual, string $message = ''
             $difference = abs($expected - $actual);
 
             $this->assertLessThanOrEqual($tolerance, $difference, $message);
-        } catch (Exception $e) {
+        } catch (Exception) {
             return false;
         }
     }
@@ -516,7 +516,7 @@ protected function getHeaderEmitted(string $header, bool $ignoreCase = false, st
         foreach (xdebug_get_headers() as $emittedHeader) {
             $found = $ignoreCase
                 ? (stripos($emittedHeader, $header) === 0)
-                : (strpos($emittedHeader, $header) === 0);
+                : (str_starts_with($emittedHeader, $header));
 
             if ($found) {
                 return $emittedHeader;
diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
index 7e4091be6175..aca345b68139 100644
--- a/system/Test/ControllerTestTrait.php
+++ b/system/Test/ControllerTestTrait.php
@@ -202,7 +202,7 @@ public function execute(string $method, ...$params)
             // getStatusCode() throws for empty codes
             try {
                 $response->getStatusCode();
-            } catch (HTTPException $e) {
+            } catch (HTTPException) {
                 // If no code has been set then assume success
                 $response->setStatusCode(200);
             }
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 1a2cbb0d61aa..4cc56071670a 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -258,11 +258,11 @@ public function parseSelector(string $selector)
         $attr  = null;
 
         // ID?
-        if (strpos($selector, '#') !== false) {
+        if (str_contains($selector, '#')) {
             [$tag, $id] = explode('#', $selector);
         }
         // Attribute
-        elseif (strpos($selector, '[') !== false && strpos($selector, ']') !== false) {
+        elseif (str_contains($selector, '[') && str_contains($selector, ']')) {
             $open  = strpos($selector, '[');
             $close = strpos($selector, ']');
 
@@ -280,7 +280,7 @@ public function parseSelector(string $selector)
             $attr  = [$name => trim($value, '] ')];
         }
         // Class?
-        elseif (strpos($selector, '.') !== false) {
+        elseif (str_contains($selector, '.')) {
             [$tag, $class] = explode('.', $selector);
         }
         // Otherwise, assume the entire string is our tag
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index d7b8b02ddaa8..247cc74ee564 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -239,7 +239,7 @@ protected function clearInsertCache()
      */
     public function loadBuilder(string $tableName)
     {
-        $builderClass = str_replace('Connection', 'Builder', get_class($this->db));
+        $builderClass = str_replace('Connection', 'Builder', $this->db::class);
 
         return new $builderClass($tableName, $this->db);
     }
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 3a28f281d127..66a685fc8d30 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -305,7 +305,7 @@ protected function guessFormatter($field): string
             $this->faker->getFormatter($field);
 
             return $field;
-        } catch (InvalidArgumentException $e) {
+        } catch (InvalidArgumentException) {
             // No match, keep going
         }
 
@@ -497,18 +497,11 @@ public function create(?int $count = null, bool $mock = false)
      */
     protected function createMock(?int $count = null)
     {
-        switch ($this->model->dateFormat) {
-            case 'datetime':
-                $datetime = date('Y-m-d H:i:s');
-                break;
-
-            case 'date':
-                $datetime = date('Y-m-d');
-                break;
-
-            default:
-                $datetime = Time::now()->getTimestamp();
-        }
+        $datetime = match ($this->model->dateFormat) {
+            'datetime' => date('Y-m-d H:i:s'),
+            'date'     => date('Y-m-d'),
+            default    => Time::now()->getTimestamp(),
+        };
 
         // Determine which fields we will need
         $fields = [];
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 4901a585ce20..926978ef786c 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -127,7 +127,7 @@ protected function getFilterCaller($filter, string $position): Closure
 
         if (is_string($filter)) {
             // Check for an alias (no namespace)
-            if (strpos($filter, '\\') === false) {
+            if (! str_contains($filter, '\\')) {
                 if (! isset($this->filtersConfig->aliases[$filter])) {
                     throw new RuntimeException("No filter found with alias '{$filter}'");
                 }
@@ -140,7 +140,7 @@ protected function getFilterCaller($filter, string $position): Closure
         }
 
         if (! $filter instanceof FilterInterface) {
-            throw FilterException::forIncorrectInterface(get_class($filter));
+            throw FilterException::forIncorrectInterface($filter::class);
         }
 
         $request = clone $this->request;
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index 240f5c6d95b5..bb18d30a0096 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -79,7 +79,7 @@ public static function didLog(string $level, $message, bool $useExactComparison
                 continue;
             }
 
-            if (strpos($log['message'], $message) !== false) {
+            if (str_contains($log['message'], $message)) {
                 return true;
             }
         }
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index fd763cd52e86..1442c2f6e51a 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -82,7 +82,7 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
         }
 
         // Standardize Newlines to make matching easier
-        if (strpos($str, "\r") !== false) {
+        if (str_contains($str, "\r")) {
             $str = str_replace(["\r\n", "\r"], "\n", $str);
         }
 
@@ -94,7 +94,7 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
 
         // HTML comment tags don't conform to patterns of normal tags, so pull them out separately, only if needed
         $htmlComments = [];
-        if (strpos($str, '<!--') !== false && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches)) {
+        if (str_contains($str, '<!--') && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches)) {
             for ($i = 0, $total = count($matches[0]); $i < $total; $i++) {
                 $htmlComments[] = $matches[0][$i];
                 $str            = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
@@ -103,7 +103,7 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
 
         // match and yank <pre> tags if they exist.  It's cheaper to do this separately since most content will
         // not contain <pre> tags, and it keeps the PCRE patterns below simpler and faster
-        if (strpos($str, '<pre') !== false) {
+        if (str_contains($str, '<pre')) {
             $str = preg_replace_callback('#<pre.*?>.*?</pre>#si', [$this, 'protectCharacters'], $str);
         }
 
@@ -283,7 +283,7 @@ public function formatCharacters(string $str): string
      */
     protected function formatNewLines(string $str): string
     {
-        if ($str === '' || (strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true))) {
+        if ($str === '' || (! str_contains($str, "\n") && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true))) {
             return $str;
         }
 
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 61f59d7bfe86..e490b004e33b 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -215,7 +215,7 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
         $validPrefix = false;
 
         foreach ($prefixes as $prefix) {
-            if (strpos($ccNumber, $prefix) === 0) {
+            if (str_starts_with($ccNumber, $prefix)) {
                 $validPrefix = true;
                 break;
             }
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 5089f5a0961f..5a13718dc9e5 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -166,7 +166,7 @@ public function numeric(?string $str = null): bool
      */
     public function regex_match(?string $str, string $pattern): bool
     {
-        if (strpos($pattern, '/') !== 0) {
+        if (! str_starts_with($pattern, '/')) {
             $pattern = "/{$pattern}/";
         }
 
@@ -256,18 +256,11 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
             return false;
         }
 
-        switch (strtolower($which ?? '')) {
-            case 'ipv4':
-                $option = FILTER_FLAG_IPV4;
-                break;
-
-            case 'ipv6':
-                $option = FILTER_FLAG_IPV6;
-                break;
-
-            default:
-                $option = 0;
-        }
+        $option = match (strtolower($which ?? '')) {
+            'ipv4'  => FILTER_FLAG_IPV4,
+            'ipv6'  => FILTER_FLAG_IPV6,
+            default => 0,
+        };
 
         return filter_var($ip, FILTER_VALIDATE_IP, $option) !== false
             || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $option) !== false);
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index b7c585f56c30..54e8b942b8bc 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -28,7 +28,7 @@ class Rules
      */
     public function differs(?string $str, string $field, array $data): bool
     {
-        if (strpos($field, '.') !== false) {
+        if (str_contains($field, '.')) {
             return $str !== dot_array_search($field, $data);
         }
 
@@ -181,7 +181,7 @@ public function less_than_equal_to(?string $str, string $max): bool
      */
     public function matches(?string $str, string $field, array $data): bool
     {
-        if (strpos($field, '.') !== false) {
+        if (str_contains($field, '.')) {
             return $str === dot_array_search($field, $data);
         }
 
@@ -275,7 +275,7 @@ public function required_with($str = null, ?string $fields = null, array $data =
         foreach (explode(',', $fields) as $field) {
             if (
                 (array_key_exists($field, $data) && ! empty($data[$field]))
-                || (strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))
+                || (str_contains($field, '.') && ! empty(dot_array_search($field, $data)))
             ) {
                 $requiredFields[] = $field;
             }
@@ -320,13 +320,13 @@ public function required_without(
         // any of the fields are not present in $data
         foreach (explode(',', $otherFields) as $otherField) {
             if (
-                (strpos($otherField, '.') === false)
+                (! str_contains($otherField, '.'))
                 && (! array_key_exists($otherField, $data) || empty($data[$otherField]))
             ) {
                 return false;
             }
 
-            if (strpos($otherField, '.') !== false) {
+            if (str_contains($otherField, '.')) {
                 if ($field === null) {
                     throw new InvalidArgumentException('You must supply the parameters: field.');
                 }
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index b40bc91048bc..5386cfb2dd4a 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -167,7 +167,7 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
                 $rules = $this->splitRules($rules);
             }
 
-            if (strpos($field, '*') !== false) {
+            if (str_contains($field, '*')) {
                 $values = array_filter(array_flatten_with_dots($data), static fn ($key) => preg_match(
                     '/^'
                     . str_replace(['\.\*', '\*\.'], ['\..+', '.+\.'], preg_quote($field, '/'))
@@ -187,7 +187,7 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
                 continue;
             }
 
-            if (strpos($field, '*') !== false) {
+            if (str_contains($field, '*')) {
                 // Process multiple fields
                 foreach ($values as $dotField => $value) {
                     $this->processRules($dotField, $setup['label'] ?? $field, $value, $rules, $data, $field);
@@ -361,7 +361,7 @@ private function processIfExist(string $field, array $rules, array $data)
             $flattenedData = array_flatten_with_dots($data);
             $ifExistField  = $field;
 
-            if (strpos($field, '.*') !== false) {
+            if (str_contains($field, '.*')) {
                 // We'll change the dot notation into a PCRE pattern that can be used later
                 $ifExistField   = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
                 $dataIsExisting = false;
@@ -477,14 +477,14 @@ private function isStringList(array $array): bool
     public function withRequest(RequestInterface $request): ValidationInterface
     {
         /** @var IncomingRequest $request */
-        if (strpos($request->getHeaderLine('Content-Type'), 'application/json') !== false) {
+        if (str_contains($request->getHeaderLine('Content-Type'), 'application/json')) {
             $this->data = $request->getJSON(true);
 
             return $this;
         }
 
         if (in_array(strtolower($request->getMethod()), ['put', 'patch', 'delete'], true)
-            && strpos($request->getHeaderLine('Content-Type'), 'multipart/form-data') === false
+            && ! str_contains($request->getHeaderLine('Content-Type'), 'multipart/form-data')
         ) {
             $this->data = $request->getRawInput();
         } else {
@@ -907,7 +907,7 @@ protected function getErrorMessage(
      */
     protected function splitRules(string $rules): array
     {
-        if (strpos($rules, '|') === false) {
+        if (! str_contains($rules, '|')) {
             return [$rules];
         }
 
diff --git a/system/View/Cell.php b/system/View/Cell.php
index f654e97a376d..670ad1d45be1 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -78,7 +78,7 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c
         [$instance, $method] = $this->determineClass($library);
 
         $class = is_object($instance)
-            ? get_class($instance)
+            ? $instance::class
             : null;
 
         $params = $this->prepareParams($params);
@@ -131,7 +131,7 @@ public function prepareParams($params)
             $newParams = [];
             $separator = ' ';
 
-            if (strpos($params, ',') !== false) {
+            if (str_contains($params, ',')) {
                 $separator = ',';
             }
 
@@ -169,7 +169,7 @@ protected function determineClass(string $library): array
 
         // controlled cells might be called with just
         // the class name, so add a default method
-        if (strpos($library, ':') === false) {
+        if (! str_contains($library, ':')) {
             $library .= ':render';
         }
 
@@ -251,7 +251,7 @@ private function getMethodParams(BaseCell $instance, string $method, array $para
                     $mountParams[] = $params[$paramName];
                 }
             }
-        } catch (ReflectionException $e) {
+        } catch (ReflectionException) {
             // do nothing
         }
 
diff --git a/system/View/Cells/Cell.php b/system/View/Cells/Cell.php
index dc97fd996544..b8c43e173b45 100644
--- a/system/View/Cells/Cell.php
+++ b/system/View/Cells/Cell.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Traits\PropertiesTrait;
 use LogicException;
 use ReflectionClass;
+use Stringable;
 
 /**
  * Class Cell
@@ -24,7 +25,7 @@
  *
  * @function mount()
  */
-class Cell
+class Cell implements Stringable
 {
     use PropertiesTrait;
 
@@ -118,7 +119,7 @@ final protected function view(?string $view, array $data = []): string
     /**
      * Provides capability to render on string casting.
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->render();
     }
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 65dfe6dff943..8f5d2a0a0ad3 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -225,19 +225,12 @@ public static function round(string $value, $precision = 2, string $type = 'comm
             $precision = (int) $precision;
         }
 
-        switch ($type) {
-            case 'common':
-                return round((float) $value, $precision);
-
-            case 'ceil':
-                return ceil((float) $value);
-
-            case 'floor':
-                return floor((float) $value);
-        }
-
-        // Still here, just return the value.
-        return $value;
+        return match ($type) {
+            'common' => round((float) $value, $precision),
+            'ceil'   => ceil((float) $value),
+            'floor'  => floor((float) $value),
+            default  => $value,
+        };
     }
 
     /**
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 120570079d2b..8cdc78a1587b 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -332,7 +332,7 @@ protected function parsePair(string $variable, array $data, string $template): a
                     }
 
                     if (is_object($val)) {
-                        $val = 'Class: ' . get_class($val);
+                        $val = 'Class: ' . $val::class;
                     } elseif (is_resource($val)) {
                         $val = 'Resource';
                     }
@@ -462,7 +462,7 @@ protected function parseConditionals(string $template): string
 
         try {
             eval('?>' . $template . '<?php ');
-        } catch (ParseError $e) {
+        } catch (ParseError) {
             ob_end_clean();
 
             throw ViewException::forTagSyntaxError(str_replace(['?>', '<?php '], '', $template));
@@ -515,7 +515,7 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
         return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
             // Check for {! !} syntax to not escape this one.
             if (
-                strpos($matches[0], $this->leftDelimiter . '!') === 0
+                str_starts_with($matches[0], $this->leftDelimiter . '!')
                 && substr($matches[0], -1 - strlen($this->rightDelimiter)) === '!' . $this->rightDelimiter
             ) {
                 $escape = false;
@@ -562,11 +562,11 @@ public function shouldAddEscaping(string $key)
             }
         }
         // No pipes, then we know we need to escape
-        elseif (strpos($key, '|') === false) {
+        elseif (! str_contains($key, '|')) {
             $escape = 'html';
         }
         // If there's a `noescape` then we're definitely false.
-        elseif (strpos($key, 'noescape') !== false) {
+        elseif (str_contains($key, 'noescape')) {
             $escape = false;
         }
         // If no `esc` filter is found, then we'll need to add one.
diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php
index ecc57c028cba..ae8c5987bce6 100644
--- a/tests/system/AutoReview/ComposerJsonTest.php
+++ b/tests/system/AutoReview/ComposerJsonTest.php
@@ -92,18 +92,11 @@ public function testStarterConfigIsTheSameWithDevSuggest(): void
 
     private function checkSection(string $section, string $component): void
     {
-        switch (strtolower($component)) {
-            case 'framework':
-                $sectionContent = $this->frameworkComposer[$section] ?? null;
-                break;
-
-            case 'starter':
-                $sectionContent = $this->starterComposer[$section] ?? null;
-                break;
-
-            default:
-                throw new InvalidArgumentException(sprintf('Unknown component: %s.', $component));
-        }
+        $sectionContent = match (strtolower($component)) {
+            'framework' => $this->frameworkComposer[$section] ?? null,
+            'starter'   => $this->starterComposer[$section] ?? null,
+            default     => throw new InvalidArgumentException(sprintf('Unknown component: %s.', $component)),
+        };
 
         $this->assertSame(
             $this->devComposer[$section],
diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php
index e61e0663836b..b33761a2ed61 100644
--- a/tests/system/AutoReview/FrameworkCodeTest.php
+++ b/tests/system/AutoReview/FrameworkCodeTest.php
@@ -122,8 +122,8 @@ static function (SplFileInfo $file) use ($directory): string {
             array_filter(
                 iterator_to_array($iterator, false),
                 static fn (SplFileInfo $file): bool => $file->isFile()
-                    && strpos($file->getPathname(), DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR) === false
-                    && strpos($file->getPathname(), DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR) === false
+                    && ! str_contains($file->getPathname(), DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR)
+                    && ! str_contains($file->getPathname(), DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR)
             )
         );
 
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 64ab5a21d2d9..b76e574947da 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -32,7 +32,7 @@ protected function tearDown(): void
         if (is_file($file)) {
             unlink($file);
         }
-        if (is_dir($dir) && strpos($dir, 'Commands') !== false) {
+        if (is_dir($dir) && str_contains($dir, 'Commands')) {
             rmdir($dir);
         }
     }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index b6702c5a7376..0b8ffbf43358 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -752,7 +752,7 @@ public function testLangOnCLI(): void
 
     public function testIsWindows(): void
     {
-        $this->assertSame(strpos(php_uname(), 'Windows') !== false, is_windows());
+        $this->assertSame(str_contains(php_uname(), 'Windows'), is_windows());
         $this->assertSame(defined('PHP_WINDOWS_VERSION_MAJOR'), is_windows());
     }
 
@@ -767,7 +767,7 @@ public function testIsWindowsUsingMock(): void
         $this->assertNotTrue(is_windows());
 
         is_windows(null);
-        $this->assertSame(strpos(php_uname(), 'Windows') !== false, is_windows());
+        $this->assertSame(str_contains(php_uname(), 'Windows'), is_windows());
         $this->assertSame(defined('PHP_WINDOWS_VERSION_MAJOR'), is_windows());
     }
 }
diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index 46603dee30ad..8a2117cecaac 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Autoloader\FileLocator;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
+use PHPUnit\Framework\Attributes\CoversFunction;
 use PHPUnit\Framework\MockObject\MockObject;
 use RuntimeException;
 use Tests\Support\Autoloader\FatalLocator;
@@ -22,9 +23,8 @@
  * @internal
  *
  * @group Others
- *
- * @covers ::helper
  */
+#[CoversFunction('helper')]
 final class CommonHelperTest extends CIUnitTestCase
 {
     private array $dummyHelpers = [
@@ -94,7 +94,7 @@ public function testHelperWithFatalLocatorThrowsException(): void
         try {
             helper('baguette');
             $exception = false;
-        } catch (RuntimeException $e) {
+        } catch (RuntimeException) {
             $exception = true;
         }
 
@@ -113,7 +113,7 @@ public function testHelperLoadsOnce(): void
         try {
             helper('baguette');
             $exception = false;
-        } catch (RuntimeException $e) {
+        } catch (RuntimeException) {
             $exception = true;
         }
 
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index e95e4c493136..9d5c65f49224 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -38,7 +38,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
 
         assert($service1 !== null);
 
-        $this->assertInstanceOf(get_class($service1), $service2);
+        $this->assertInstanceOf($service1::class, $service2);
         $this->assertNotSame($service1, $service2);
     }
 
@@ -68,7 +68,7 @@ public function testSingleServiceWithAtLeastOneParamSupplied(string $service): v
 
         assert($service1 !== null);
 
-        $this->assertInstanceOf(get_class($service1), $service2);
+        $this->assertInstanceOf($service1::class, $service2);
         $this->assertNotSame($service1, $service2);
 
         if ($service === 'commands') {
@@ -86,7 +86,7 @@ public function testSingleServiceWithAllParamsSupplied(): void
 
         // Assert that even passing true as last param this will
         // not create a shared instance.
-        $this->assertInstanceOf(get_class($cache1), $cache2);
+        $this->assertInstanceOf($cache1::class, $cache2);
         $this->assertNotSame($cache1, $cache2);
     }
 
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 668cf9b1bc68..e762267b5b2e 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -82,7 +82,7 @@ public function testConstructorHTTPS(): void
                 protected $forceHTTPS = 1;
             };
             $this->controller->initController($this->request, $this->response, $this->logger);
-        } catch (RedirectException $e) {
+        } catch (RedirectException) {
         }
 
         $this->assertInstanceOf(Controller::class, $this->controller);
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 4383d32b78a0..65b6212e000c 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -67,7 +67,7 @@ public function testDeleteWithLimit(): void
         try {
             $this->db->table('user')->delete(['country' => 'US'], 1);
         } catch (DatabaseException $e) {
-            if (strpos($e->getMessage(), 'does not allow LIMITs on DELETE queries.') !== false) {
+            if (str_contains($e->getMessage(), 'does not allow LIMITs on DELETE queries.')) {
                 return;
             }
         }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 7ee169d55843..885a2ebc239b 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -239,7 +239,7 @@ public function testGetRowWithCustomReturnType(): void
             public $deleted_at;
         };
 
-        $user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
+        $user = $this->db->table('user')->get()->getRow(0, $testClass::class);
 
         $this->assertSame('Derek Jones', $user->name);
     }
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 2bb2c7419696..1b97b8543511 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -45,7 +45,7 @@ protected function tearDown(): void
 
         try {
             $this->query->close();
-        } catch (BadMethodCallException $e) {
+        } catch (BadMethodCallException) {
             $this->query = null;
         }
     }
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 1c6ae8a430b6..dc6701f7f3d9 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -69,7 +69,7 @@ public function testUpdateSetsAllWithoutWhereAndLimit(): void
 
             $this->assertSame('Richard A Causey', $result[2]->name);
             $this->assertSame('Chris Martin', $result[3]->name);
-        } catch (DatabaseException $e) {
+        } catch (DatabaseException) {
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
             $this->assertTrue(true);
@@ -104,7 +104,7 @@ public function testUpdateWithWhereAndLimit(): void
             $this->assertSame('Ahmadinejad', $result[1]->name);
             $this->assertSame('Richard A Causey', $result[2]->name);
             $this->assertSame('Chris Martin', $result[3]->name);
-        } catch (DatabaseException $e) {
+        } catch (DatabaseException) {
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
             $this->assertTrue(true);
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 4a30a32f1133..0a403c8df557 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -73,7 +73,7 @@ public function testDeprecationsOnPhp81DoNotThrow(): void
         try {
             strlen($maybeNull);
             $this->assertLogContains('error', '[DEPRECATED] strlen(): ');
-        } catch (ErrorException $e) {
+        } catch (ErrorException) {
             $this->fail('The catch block should not be reached.');
         } finally {
             restore_error_handler();
diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php
index c50b496facff..97bb8b8fd896 100644
--- a/tests/system/DebugTraceableTraitTest.php
+++ b/tests/system/DebugTraceableTraitTest.php
@@ -14,14 +14,14 @@
 use CodeIgniter\Exceptions\DebugTraceableTrait;
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Test\CIUnitTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
 /**
  * @internal
  *
  * @group Others
- *
- * @covers \CodeIgniter\Exceptions\DebugTraceableTrait
  */
+#[CoversClass(\CodeIgniter\Exceptions\DebugTraceableTrait::class)]
 final class DebugTraceableTraitTest extends CIUnitTestCase
 {
     public function testFactoryInstanceReturnsWhereItIsRaised(): void
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 81fd2d998602..cb5c3faeca90 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -469,7 +469,7 @@ public function testBodyScriptNonce(): void
         $result     = $this->work($body);
         $nonceStyle = array_filter(
             $this->getPrivateProperty($this->csp, 'styleSrc'),
-            static fn ($value) => strpos($value, 'nonce-') === 0
+            static fn ($value) => str_starts_with($value, 'nonce-')
         );
 
         $this->assertStringContainsString('nonce=', $this->response->getBody());
@@ -546,7 +546,7 @@ public function testBodyStyleNonce(): void
         $result      = $this->work($body);
         $nonceScript = array_filter(
             $this->getPrivateProperty($this->csp, 'scriptSrc'),
-            static fn ($value) => strpos($value, 'nonce-') === 0
+            static fn ($value) => str_starts_with($value, 'nonce-')
         );
 
         $this->assertStringContainsString('nonce=', $this->response->getBody());
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index 121ff40600fe..ac7d0ae6a894 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -191,7 +191,7 @@ public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue): void
 
         try {
             $this->createModel(UserModel::class)->delete($emptyValue);
-        } catch (DatabaseException $e) {
+        } catch (DatabaseException) {
             // Do nothing.
         }