Refactor ValueType to Typ

t-regx · Nov 24, 2023 · 7198f18 · 7198f18
1 parent 69b1c46
commit 7198f18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Internal/Frame/KeyTypes.php b/src/Internal/Frame/KeyTypes.php
@@ -17,8 +17,7 @@ private function types(DataFrame $frame): array
         foreach ($frame->dataset() as $dataRow) {
             foreach ($dataRow->keys as $index => $key) {
                 if ($dataRow->isAssociative($index)) {
-                    $valueType = new ValueType($key);
-                    $types[$valueType->type()] = true;
+                    $types[$this->typeOf($key)] = true;
                 }
             }
         }
@@ -37,4 +36,9 @@ private function arrayKeyTypes(array $types): bool
     {
         return $types == ['string', 'int'] || $types == ['int', 'string'];
     }
+
+    private function typeOf($value): string
+    {
+        return new Type($value);
+    }
 }
diff --git a/src/Internal/Frame/ValueType.php → src/Internal/Frame/Type.php b/src/Internal/Frame/ValueType.php → src/Internal/Frame/Type.php
@@ -1,7 +1,7 @@
 <?php
 namespace TRegx\PhpUnit\DataProviders\Internal\Frame;
 
-class ValueType
+class Type
 {
     /** @var mixed */
     private $value;
@@ -11,7 +11,7 @@ public function __construct($value)
         $this->value = $value;
     }
 
-    public function type(): string
+    public function __toString(): string
     {
         if (\is_string($this->value)) {
             return 'string';