Add new Settings object to use as a DTO

src/Settings.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Arendsen\FluxQueryBuilder;
+
+class Settings
+{
+    /**
+     * @var array $settings
+     */
+    protected $settings;
+
+    public function __construct(array $settings = [])
+    {
+        $this->settings = $settings;
+    }
+
+    public static function set(array $settings = [])
+    {
+        return new self($settings);
+    }
+
+    public function get(string $key)
+    {
+        return isset($this->settings[$key]) ? $this->settings[$key] : null;
+    }
+}

src/Type.php

@@ -9,10 +9,20 @@ use DateTime;
 
 class Type
 {
-    public function __construct($value, $settings = [])
+    /**
+     * @var mixed $value
+     */
+    protected $value;
+
+    /**
+     * @var Settings|null $settings
+     */
+    protected $settings;
+
+    public function __construct($value, Settings $settings = null)
     {
         $this->value = $value;
-        $this->settings = $settings;
+        $this->settings = $settings ? $settings : Settings::set([]);
     }
 
     public function __toString(): string

src/Type/ArrayType.php

@@ -2,46 +2,67 @@
 
 namespace Arendsen\FluxQueryBuilder\Type;
 
+use Arendsen\FluxQueryBuilder\Settings;
 use Arendsen\FluxQueryBuilder\Type;
 
 class ArrayType implements TypeInterface
 {
+    public const SETTING_IS_NESTED_ARRAY = 'isNestedArray';
+
     /**
      * @var array $value
      */
     protected $value;
 
     /**
-     * @var array $settings
+     * @var Settings|null $settings
      */
     protected $settings;
 
-    public function __construct(array $value, $settings = [])
+    public function __construct(array $value, Settings $settings = null)
     {
         $this->value = $value;
-        $this->settings = $settings;
+        $this->settings = $settings ? $settings : Settings::set([]);
     }
 
     public function __toString(): string
     {
-        if (isset($this->settings['isRecord']) && $this->settings['isRecord']) {
+        if ($this->settings->get(RecordType::SETTING_IS_RECORD)) {
             return new RecordType($this->value);
         }
 
-        $subArray = isset($this->settings['isNestedArray']) && $this->settings['isNestedArray'];
-
         array_walk($this->value, function (&$value, $key) {
-            if (is_string($key)) {
+            if ($this->isAssociativeArray($key)) {
-                $value = $key . ': ' . new Type($value, [
+                $value = $key . ': ' . new Type($value, Settings::set([
-                    'isNestedArray' => is_array($value)
+                    self::SETTING_IS_NESTED_ARRAY => is_array($value)
-                ]);
+                ]));
             } else {
-                $value = new Type($value, [
+                $value = new Type($value, Settings::set([
-                    'isNestedArray' => is_array($value)
+                    self::SETTING_IS_NESTED_ARRAY => is_array($value)
-                ]);
+                ]));
             }
         });
 
-        return ($subArray ? '[' : '') . implode(', ', $this->value) . ($subArray ? ']' : '');
+        return $this->getPrefix() . implode(', ', $this->value) . $this->getSuffix();
+    }
+
+    protected function isAssociativeArray($key): bool
+    {
+        return is_string($key);
+    }
+
+    protected function isNestedArray(): bool
+    {
+        return $this->settings->get(self::SETTING_IS_NESTED_ARRAY) ? true : false;
+    }
+
+    protected function getPrefix(): string
+    {
+        return $this->isNestedArray() ? '[' : '';
+    }
+
+    protected function getSuffix(): string
+    {
+        return $this->isNestedArray() ? ']' : '';
     }
 }

src/Type/RecordType.php

@@ -2,10 +2,13 @@
 
 namespace Arendsen\FluxQueryBuilder\Type;
 
+use Arendsen\FluxQueryBuilder\Settings;
 use Arendsen\FluxQueryBuilder\Type;
 
 class RecordType implements TypeInterface
 {
+    public const SETTING_IS_RECORD = 'isRecord';
+
     public function __construct(array $value)
     {
         $this->value = $value;
@@ -15,13 +18,13 @@ class RecordType implements TypeInterface
     {
         array_walk($this->value, function (&$value, $key) {
             if (is_string($key)) {
-                $value = $key . ': ' . new Type($value, [
+                $value = $key . ': ' . new Type($value, Settings::set([
-                    'isRecord' => true,
+                    self::SETTING_IS_RECORD => true,
-                ]);
+                ]));
             } else {
-                $value = new Type($value, [
+                $value = new Type($value, Settings::set([
-                    'isRecord' => true,
+                    self::SETTING_IS_RECORD => true,
-                ]);
+                ]));
             }
         });