[Miscellaneous] [Regex] Implement data providers in tests

This commit is contained in:
Meritoo
2019-12-18 20:32:21 +01:00
parent ddb3f0a544
commit 5cd58aec25
3 changed files with 227 additions and 48 deletions

View File

@@ -889,8 +889,12 @@ class Miscellaneous
* @param string $separator The separator which divides elements of string
* @return array
*/
public static function getStringElements($string, $separator)
public static function getStringElements(string $string, string $separator): array
{
if (empty($string) || empty($separator)) {
return [];
}
$matches = [];
$pattern = sprintf('|[^\%s]+|', $separator);
$matchCount = preg_match_all($pattern, $string, $matches);
@@ -909,21 +913,15 @@ class Miscellaneous
* @param string $separator The separator which divides elements of string
* @return null|string
*/
public static function getLastElementOfString($string, $separator)
public static function getLastElementOfString($string, $separator): ?string
{
$elements = self::getStringElements($string, $separator);
/*
* No elements?
* Nothing to do
*/
if (empty($elements)) {
return null;
}
$element = Arrays::getLastElement($elements);
return trim($element);
return Arrays::getLastElement($elements);
}
/**