GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[UTIL][Formatting] Make it possible to supply string|array to either or both argument of Formatting::{starts,ends}With

Browse Source
This commit is contained in:
Hugo Sales 2021-10-10 05:43:07 +01:00 committed by Diogo Peralta Cordeiro
parent 99ab24ec23
commit d575f8aef5
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Util/Formatting.php
View File

@ -103,44 +103,34 @@ abstract class Formatting
/** /**
* Check whether $haystack starts with $needle * Check whether $haystack starts with $needle
* *
* @param array|string $haystack if array, check that all strings start with $needle * @param array|string $haystack if array, check that all strings start with $needle (see below)
* @param string $needle * @param array|string $needle if array, check that one of the $needles is found
* *
* @return bool * @return bool
*/ */
public static function startsWith($haystack, string $needle): bool public static function startsWith(array|string $haystack, array|string $needle): bool
{ {
if (is_string($haystack)) { if (is_string($haystack)) {
$length = strlen($needle); return F\some(is_array($needle) ? $needle : [$needle], fn ($n) => str_starts_with($haystack, $n));
return substr($haystack, 0, $length) === $needle; } else {
return F\every($haystack, fn ($haystack) => self::startsWith($haystack, $needle));
} }
return F\every($haystack,
function ($haystack) use ($needle) {
return self::startsWith($haystack, $needle);
});
} }
/** /**
* Check whether $haystack ends with $needle * Check whether $haystack ends with $needle
* *
* @param array|string $haystack if array, check that all strings end with $needle * @param array|string $haystack if array, check that all strings end with $needle (see below)
* @param string $needle * @param array|string $needle if array, check that one of the $needles is found
* *
* @return bool * @return bool
*/ */
public static function endsWith($haystack, string $needle) public static function endsWith(array|string $haystack, array|string $needle): bool
{ {
if (is_string($haystack)) { if (is_string($haystack)) {
$length = strlen($needle); return F\some(is_array($needle) ? $needle : [$needle], fn ($n) => str_ends_with($haystack, $n));
if ($length == 0) { } else {
return true; return F\every($haystack, fn ($haystack) => self::endsWith($haystack, $needle));
}
return substr($haystack, -$length) === $needle;
} }
return F\every($haystack,
function ($haystack) use ($needle) {
return self::endsWith($haystack, $needle);
});
} }
/** /**