Rename types to Type suffix

Signed-off-by: davidarendsen <davidarendsen@hey.com>
This commit is contained in:
davidarendsen 2022-08-16 15:49:06 +00:00
commit 923cb7dcb7
12 changed files with 63 additions and 41 deletions

View file

@ -1,25 +0,0 @@
<?php
namespace Arendsen\FluxQueryBuilder;
use Arendsen\FluxQueryBuilder\Type\ArrayType;
use DateTime;
use Arendsen\FluxQueryBuilder\Type\Time;
class Formatters
{
public static function valueToString($value): string
{
return new Type($value);
}
public static function toFluxArrayString(array $array): string
{
return new Type($array);
}
public static function dateTimeToString(DateTime $dateTime): string
{
return new Type($dateTime);
}
}

View file

@ -2,7 +2,7 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Type\Record;
use Arendsen\FluxQueryBuilder\Type\RecordType;
class Reduce extends Base
{
@ -24,7 +24,7 @@ class Reduce extends Base
public function __toString()
{
return '|> reduce(fn: (r, accumulator) => (' . new Record($this->settings) . '), ' .
'identity: ' . new Record($this->identity) . ') ';
return '|> reduce(fn: (r, accumulator) => (' . new RecordType($this->settings) . '), ' .
'identity: ' . new RecordType($this->identity) . ') ';
}
}

View file

@ -4,7 +4,7 @@ namespace Arendsen\FluxQueryBuilder;
use Arendsen\FluxQueryBuilder\Type\ArrayType;
use Arendsen\FluxQueryBuilder\Type\BooleanType;
use Arendsen\FluxQueryBuilder\Type\Time;
use Arendsen\FluxQueryBuilder\Type\TimeType;
use DateTime;
class Type
@ -20,7 +20,7 @@ class Type
switch (gettype($this->value)) {
case 'object':
if ($this->value instanceof DateTime) {
return new Time($this->value);
return new TimeType($this->value);
}
return $this->value->__toString();
case 'string':

View file

@ -25,7 +25,7 @@ class ArrayType implements TypeInterface
public function __toString(): string
{
if (isset($this->settings['isRecord']) && $this->settings['isRecord']) {
return new Record($this->value);
return new RecordType($this->value);
}
$subArray = isset($this->settings['isNestedArray']) && $this->settings['isNestedArray'];

16
src/Type/CustomType.php Normal file
View file

@ -0,0 +1,16 @@
<?php
namespace Arendsen\FluxQueryBuilder\Type;
class CustomType implements TypeInterface
{
public function __construct(string $value)
{
$this->value = $value;
}
public function __toString(): string
{
return $this->value;
}
}

16
src/Type/DurationType.php Normal file
View file

@ -0,0 +1,16 @@
<?php
namespace Arendsen\FluxQueryBuilder\Type;
class DurationType implements TypeInterface
{
public function __construct(string $value)
{
$this->value = $value;
}
public function __toString(): string
{
return $this->value;
}
}

View file

@ -2,7 +2,7 @@
namespace Arendsen\FluxQueryBuilder\Type;
class Math implements TypeInterface
class MathType implements TypeInterface
{
public function __construct(string $value)
{

View file

@ -4,7 +4,7 @@ namespace Arendsen\FluxQueryBuilder\Type;
use Arendsen\FluxQueryBuilder\Type;
class Record implements TypeInterface
class RecordType implements TypeInterface
{
public function __construct(array $value)
{

View file

@ -4,7 +4,7 @@ namespace Arendsen\FluxQueryBuilder\Type;
use DateTime;
class Time implements TypeInterface
class TimeType implements TypeInterface
{
public function __construct(DateTime $dateTime)
{