Hosterra/flux-querybuilder
Hosterra/flux-querybuilder
1
0
Fork 0
Code Issues Pull requests Releases 2 Packages Activity

Fix Formatters::valueToString when input is an array

Browse source 
Signed-off-by: davidarendsen <davidarendsen@hey.com>
This commit is contained in:
davidarendsen 2022-08-11 13:36:57 +00:00
commit 009b2f2d53
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Formatters.php
View file

@ -14,23 +14,25 @@ class Formatters {
{ {
return $value ? 'true' : 'false'; return $value ? 'true' : 'false';
} }
elseif(is_array($value))
{
return self::toFluxArrayString($value);
}
return $value; return $value;
} }
public static function toFluxArrayString(array $array): string public static function toFluxArrayString(array $array): string
{
$array = array_map(function($column) {
return self::valueToString($column);
}, $array);
return implode(', ', $array);
}
public static function toFluxAssociativeArrayString(array $array): string
{ {
array_walk($array, function(&$value, $key) { array_walk($array, function(&$value, $key) {
if(is_string($key))
{
$value = $key . ': ' . self::valueToString($value); $value = $key . ': ' . self::valueToString($value);
}
else
{
$value = self::valueToString($value);
}
}); });
return implode(', ', $array); return implode(', ', $array);

2
src/Function/From.php
View file

@ -18,7 +18,7 @@ class From extends Base {
public function __toString() public function __toString()
{ {
return 'from(' . Formatters::toFluxAssociativeArrayString($this->settings) . ') '; return 'from(' . Formatters::toFluxArrayString($this->settings) . ') ';
} }
} }

2
src/Function/Range.php
View file

@ -18,7 +18,7 @@ class Range extends Base {
public function __toString() public function __toString()
{ {
return '|> range(' . Formatters::toFluxAssociativeArrayString($this->settings) . ') '; return '|> range(' . Formatters::toFluxArrayString($this->settings) . ') ';
} }
} }

2
src/Function/Reduce.php
View file

@ -25,7 +25,7 @@ class Reduce extends Base {
public function __toString() public function __toString()
{ {
return '|> reduce(fn: (r, accumulator) => ({' . implode(', ', $this->formatSettings($this->settings)) . '}), ' . return '|> reduce(fn: (r, accumulator) => ({' . implode(', ', $this->formatSettings($this->settings)) . '}), ' .
'identity: {' . Formatters::toFluxAssociativeArrayString($this->identity) . '}) '; 'identity: {' . Formatters::toFluxArrayString($this->identity) . '}) ';
} }
protected function formatSettings(array $settings) protected function formatSettings(array $settings)