Fix Formatters::valueToString when input is an array

Signed-off-by: davidarendsen <davidarendsen@hey.com>

src/Formatters.php

@@ -14,23 +14,25 @@ class Formatters {
         {
             return $value ? 'true' : 'false';
         }
+        elseif(is_array($value))
+        {
+            return self::toFluxArrayString($value);
+        }
 
         return $value;
     }
 
     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) {
-			$value = $key . ': ' . self::valueToString($value);
+            if(is_string($key))
+            {
+			    $value = $key . ': ' . self::valueToString($value);
+            }
+            else
+            {
+                $value = self::valueToString($value);
+            }
 		});
 
         return implode(', ', $array);

src/Function/From.php

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

src/Function/Range.php

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

src/Function/Reduce.php

@@ -25,7 +25,7 @@ class Reduce extends Base {
     public function __toString()
     {
         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)

tests/QueryBuilderTest.php

@@ -15,7 +15,7 @@ final class QueryBuilderTest extends TestCase {
         $queryBuilder = new QueryBuilder();
         $queryBuilder->from($bucket)
             ->fromMeasurement($measurement)
-			->addRangeStart($range);
+		    ->addRangeStart($range);
 
         if($keyValue)
         {
@@ -92,7 +92,7 @@ final class QueryBuilderTest extends TestCase {
         $queryBuilder = new QueryBuilder();
         $queryBuilder->fromBucket('test_bucket')
             ->fromMeasurement('test_measurement')
-			->addRangeStart('-3h')
+		    ->addRangeStart('-3h')
             ->addFilter(KeyValue::setEqualTo('_field', 'username'))
             ->addMap('r with name: r.user')
             ->addGroup(['_field', 'ip'])