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

[FORMATTING] Add option to split a string to array by both a comma and a space

This commit is contained in:
Hugo Sales 2020-07-27 03:44:25 +00:00 committed by Hugo Sales
parent 921da28884
commit b3bce3efa1
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Util/Formatting.php
View File

@ -158,13 +158,14 @@ abstract class Formatting
const SPLIT_BY_SPACE = ' '; const SPLIT_BY_SPACE = ' ';
const SPLIT_BY_COMMA = ', '; const SPLIT_BY_COMMA = ', ';
const SPLIT_BY_BOTH = '/[, ]/';
/** /**
* Convert scalars, objects implementing __toString or arrays to strings * Convert scalars, objects implementing __toString or arrays to strings
* *
* @param mixed $value * @param mixed $value
*/ */
public static function toString($value, string $split_type = SPLIT_BY_COMMA): string public static function toString($value, string $split_type = self::SPLIT_BY_COMMA): string
{ {
if (!is_array($value)) { if (!is_array($value)) {
return (string) $value; return (string) $value;
@ -178,11 +179,21 @@ abstract class Formatting
* *
* @param mixed $output * @param mixed $output
*/ */
public static function toArray(string $input, &$output, string $split_type = SPLIT_BY_COMMA): bool public static function toArray(string $input, &$output, string $split_type = self::SPLIT_BY_COMMA): bool
{ {
$matches = []; $matches = [];
if (preg_match('/^ *\[?([^,]+(, ?[^,]+)*)\]? *$/', $input, $matches)) { if (preg_match('/^ *\[?([^,]+(, ?[^,]+)*)\]? *$/', $input, $matches)) {
$output = str_replace([' \'', '\'', ' "', '"'], '', explode($split_type[0], $matches[1])); switch ($split_type) {
case self::SPLIT_BY_BOTH:
$arr = preg_split($split_type, $matches[1], 0, PREG_SPLIT_NO_EMPTY);
break;
case self::SPLIT_BY_COMMA:
$arr = preg_split('/, ?/', $matches[1]);
break;
default:
$arr = explode($split_type[0], $matches[1]);
}
$output = str_replace([' \'', '\'', ' "', '"'], '', $arr);
$output = F\map($output, F\ary('trim', 1)); $output = F\map($output, F\ary('trim', 1));
return true; return true;
} }