From 7d5cb91cfeb55dff86253897947e19ecf2117201 Mon Sep 17 00:00:00 2001 From: thiemowmde Date: Thu, 4 Apr 2024 08:56:26 +0200 Subject: [PATCH] Use native str_contains/str_starts_with in a few more places This makes the code quit a bit more readable, I believe. Change-Id: I4aef30d5e20d095c421a13ad5104d64c71361c88 --- data/LanguageNameSearch.php | 2 +- includes/FontRepoCompiler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php index 56b9ad22..5354f109 100644 --- a/data/LanguageNameSearch.php +++ b/data/LanguageNameSearch.php @@ -56,7 +56,7 @@ class LanguageNameSearch { if ( $languageNameUtils->isKnownLanguageTag( $searchKey ) ) { $name = mb_strtolower( $languageNameUtils->getLanguageName( $searchKey, $userLanguage ) ); // Check if language code is a prefix of the name - if ( strpos( $name, $searchKey ) === 0 ) { + if ( str_starts_with( $name, $searchKey ) ) { $results[$searchKey] = $name; } else { $results[$searchKey] = "$searchKey – $name"; diff --git a/includes/FontRepoCompiler.php b/includes/FontRepoCompiler.php index a9777870..4b48e311 100644 --- a/includes/FontRepoCompiler.php +++ b/includes/FontRepoCompiler.php @@ -99,7 +99,7 @@ class FontRepoCompiler { $languages[$code] = [ 'system' ]; } - if ( strpos( $rcode, '*' ) !== false ) { + if ( str_contains( $rcode, '*' ) ) { if ( $languages[$code][0] === 'system' ) { unset( $languages[$code][0] ); }