Use modern string functions

config/components.php

@@ -393,7 +393,7 @@
 		// keep relative urls
 		if (
 			$path !== null &&
-			(substr($path, 0, 2) === './' || substr($path, 0, 3) === '../')
+			(str_starts_with($path, './')  || str_starts_with($path, '../'))
 		) {
 			return $path;
 		}

src/Cms/AppCaches.php

@@ -111,7 +111,7 @@ protected function cacheOptionsKey(string $key): string
 
 		// plain keys without dots don't need further investigation
 		// since they can never be from a plugin.
-		if (strpos($key, '.') === false) {
+		if (str_contains($key, '.') === false) {
 			return $prefixedKey;
 		}
 

src/Cms/AppPlugins.php

@@ -914,7 +914,10 @@ protected function pluginsLoader(): array
 		$loaded = [];
 
 		foreach (Dir::read($root) as $dirname) {
-			if (in_array(substr($dirname, 0, 1), ['.', '_']) === true) {
+			if (
+				str_starts_with($dirname, '.') ||
+				str_starts_with($dirname, '_')
+			) {
 				continue;
 			}
 

src/Cms/HasFiles.php

@@ -76,7 +76,7 @@ public function file(
 			return Uuid::for($filename, $this->$in())->model();
 		}
 
-		if (strpos($filename, '/') !== false) {
+		if (str_contains($filename, '/') === true) {
 			$path     = dirname($filename);
 			$filename = basename($filename);
 

src/Cms/Pages.php

@@ -206,7 +206,7 @@ public function findByKey(string|null $key = null): Page|null
 		$key = trim($key, '/');
 
 		// strip extensions from the id
-		if (strpos($key, '.') !== false) {
+		if (str_contains($key, '.') === true) {
 			$info = pathinfo($key);
 
 			if ($info['dirname'] !== '.') {

src/Cms/Roles.php

@@ -99,7 +99,7 @@ public static function load(string|null $root = null, array $inject = []): stati
 
 		// load roles from plugins
 		foreach ($kirby->extensions('blueprints') as $name => $blueprint) {
-			if (substr($name, 0, 6) !== 'users/') {
+			if (str_starts_with($name, 'users/') === false) {
 				continue;
 			}
 

src/Database/Sql.php

@@ -690,11 +690,17 @@ public function tableName(string $table): string
 	public function unquoteIdentifier(string $identifier): string
 	{
 		// remove quotes around the identifier
-		if (in_array(Str::substr($identifier, 0, 1), ['"', '`']) === true) {
+		if (
+			str_starts_with($identifier, '"') ||
+			str_starts_with($identifier, '`')
+		) {
 			$identifier = Str::substr($identifier, 1);
 		}
 
-		if (in_array(Str::substr($identifier, -1), ['"', '`']) === true) {
+		if (
+			str_ends_with($identifier, '"') ||
+			str_ends_with($identifier, '`')
+		) {
 			$identifier = Str::substr($identifier, 0, -1);
 		}
 

src/Filesystem/Dir.php

@@ -242,7 +242,10 @@ public static function inventory(
 		// loop through all directory items and collect all relevant information
 		foreach ($items as $item) {
 			// ignore all items with a leading dot or underscore
-			if (in_array(substr($item, 0, 1), ['.', '_']) === true) {
+			if (
+				str_starts_with($item, '.') ||
+				str_starts_with($item, '_')
+			) {
 				continue;
 			}
 

src/Filesystem/F.php

@@ -293,7 +293,7 @@ public static function is(string $file, string $value): bool
 		}
 
 		// check for the mime type
-		if (strpos($value, '/') !== false) {
+		if (str_contains($value, '/') === true) {
 			return static::mime($file) === $value;
 		}
 
@@ -653,7 +653,7 @@ public static function realpath(string $file, string|null $in = null): string
 				throw new Exception(sprintf('The parent directory does not exist: "%s"', $in));
 			}
 
-			if (substr($realpath, 0, strlen($parent)) !== $parent) {
+			if (str_starts_with($realpath, $parent) === false) {
 				throw new Exception('The file is not within the parent directory');
 			}
 		}
@@ -711,7 +711,7 @@ public static function relativepath(string $file, string|null $in = null): strin
 	 */
 	public static function remove(string $file): bool
 	{
-		if (strpos($file, '*') !== false) {
+		if (str_contains($file, '*') === true) {
 			foreach (glob($file) as $f) {
 				static::remove($f);
 			}

src/Http/Cookie.php

@@ -171,7 +171,7 @@ protected static function hmac(string $value): string
 	protected static function parse(string $string): string|null
 	{
 		// if no hash-value separator is present, we can't parse the value
-		if (strpos($string, '+') === false) {
+		if (str_contains($string, '+') === false) {
 			return null;
 		}
 

src/Http/Environment.php

@@ -330,7 +330,7 @@ protected function detectCli(bool|null $override = null): bool
 		$term = getenv('TERM');
 
 		if (
-			substr($sapi, 0, 3) === 'cgi' &&
+			str_starts_with($sapi, 'cgi') === true &&
 			$term &&
 			$term !== 'unknown'
 		) {

src/Http/Params.php

@@ -49,7 +49,7 @@ public static function extract(string|array|null $path = null): array
 		$slash = false;
 
 		if (is_string($path) === true) {
-			$slash = substr($path, -1, 1) === '/';
+			$slash = str_ends_with($path, '/') === true;
 			$path  = Str::split($path, '/');
 		}
 
@@ -58,7 +58,7 @@ public static function extract(string|array|null $path = null): array
 			$separator = static::separator();
 
 			foreach ($path as $index => $p) {
-				if (strpos($p, $separator) === false) {
+				if (str_contains($p, $separator) === false) {
 					continue;
 				}
 

src/Http/Request.php

@@ -310,8 +310,8 @@ public function headers(): array
 
 		foreach (Environment::getGlobally() as $key => $value) {
 			if (
-				substr($key, 0, 5) !== 'HTTP_' &&
-				substr($key, 0, 14) !== 'REDIRECT_HTTP_'
+				str_starts_with($key, 'HTTP_') === false &&
+				str_starts_with($key, 'REDIRECT_HTTP_') === false
 			) {
 				continue;
 			}

src/Http/Request/Body.php

@@ -86,7 +86,7 @@ public function data(): array
 			return $this->data = $json;
 		}
 
-		if (strstr($contents, '=') !== false) {
+		if (str_contains($contents, '=') === true) {
 			// try to parse the body as query string
 			parse_str($contents, $parsed);
 

src/Http/Response.php

@@ -75,7 +75,7 @@ public function __construct(
 		$this->charset = $charset ?? 'UTF-8';
 
 		// automatic mime type detection
-		if (strpos($this->type, '/') === false) {
+		if (str_contains($this->type, '/') === false) {
 			$this->type = F::extensionToMime($this->type) ?? 'text/html';
 		}
 	}

src/Http/Route.php

@@ -177,7 +177,7 @@ public function parse(string $pattern, string $path): array|false
 		// We only need to check routes with regular expression since all others
 		// would have been able to be matched by the search for literal matches
 		// we just did before we started searching.
-		if (strpos($pattern, '(') === false) {
+		if (str_contains($pattern, '(') === false) {
 			return false;
 		}
 

src/Http/Uri.php

@@ -506,7 +506,7 @@ protected static function parsePath(array $props): array
 		// use the full path;
 		// automatically detect the trailing slash from it if possible
 		if (is_string($props['path']) === true) {
-			$props['slash'] = substr($props['path'], -1, 1) === '/';
+			$props['slash'] = str_ends_with($props['path'], '/') === true;
 		}
 
 		return $props;

src/Http/Url.php

@@ -116,7 +116,7 @@ public static function makeAbsolute(string|null $path = null, string|null $home
 			return $home ?? static::home();
 		}
 
-		if (substr($path, 0, 1) === '#') {
+		if (str_starts_with($path, '#') === true) {
 			return $path;
 		}
 
@@ -226,7 +226,10 @@ public static function to(
 		$path ??= '';
 
 		// keep relative urls
-		if (substr($path, 0, 2) === './' || substr($path, 0, 3) === '../') {
+		if (
+			str_starts_with($path, './') === true ||
+			str_starts_with($path, '../') === true
+		) {
 			return $path;
 		}
 

src/Query/Argument.php

@@ -70,7 +70,7 @@ public static function factory(string $argument): static
 
 		// numeric
 		if (is_numeric($argument) === true) {
-			if (strpos($argument, '.') === false) {
+			if (str_contains($argument, '.') === false) {
 				return new static((int)$argument);
 			}
 

src/Text/KirbyTag.php

@@ -172,7 +172,7 @@ public static function parse(
 
 		// use substr instead of rtrim to keep non-tagged brackets
 		// (link: file.pdf text: Download (PDF))
-		if (substr($tag, -1) === ')') {
+		if (str_ends_with($tag, ')') === true) {
 			$tag = substr($tag, 0, -1);
 		}
 

src/Toolkit/A.php

@@ -289,7 +289,7 @@ public static function get(
 		}
 
 		// extract data from nested array structures using the dot notation
-		if (strpos($key, '.') !== false) {
+		if (str_contains($key, '.') === true) {
 			$keys     = explode('.', $key);
 			$firstKey = array_shift($keys);
 

src/Toolkit/Collection.php

@@ -1184,15 +1184,15 @@ public function without(string ...$keys): static
  * Contains Filter
  */
 Collection::$filters['*='] = [
-	'validator' => fn ($value, $test) => strpos($value, $test) !== false,
+	'validator' => fn ($value, $test) => str_contains($value, $test) === true,
 	'strict'    => false
 ];
 
 /**
  * Not Contains Filter
  */
 Collection::$filters['!*='] = [
-	'validator' => fn ($value, $test) => strpos($value, $test) === false
+	'validator' => fn ($value, $test) => str_contains($value, $test) === false
 ];
 
 /**

src/Toolkit/Str.php

@@ -516,7 +516,7 @@ public static function float(string|int|float|null $value): string
 		$value = (string)$value;
 
 		// Convert exponential to decimal, 1e-8 as 0.00000001
-		if (strpos(strtolower($value), 'e') !== false) {
+		if (str_contains(strtolower($value), 'e') === true) {
 			$value = rtrim(sprintf('%.16f', (float)$value), '0');
 		}
 

src/Toolkit/Xml.php

@@ -339,7 +339,10 @@ public static function simplify(
 			// of the respective type to a simple string;
 			// don't do anything with special `@` metadata keys
 			foreach ($array as $name => $item) {
-				if (substr($name, 0, 1) !== '@' && count($item) === 1) {
+				if (
+					str_starts_with($name, '@') === false &&
+					count($item) === 1
+				) {
 					$array[$name] = $item[0];
 				}
 			}

tests/Panel/AssetsTest.php

@@ -414,7 +414,7 @@ public function testIcons(): void
 		$icons = $assets->icons();
 
 		$this->assertNotNull($icons);
-		$this->assertTrue(strpos($icons, '<svg', 0) !== false);
+		$this->assertTrue(str_contains($icons, '<svg'));
 	}
 
 	/**