Extract DataRow.of()

Author: danon

src/Internal/Frame/DataRow.php

@@ -17,14 +17,14 @@ public function __construct(array $keys, array $assoc, array $values)
         $this->values = $values;
     }
 
-    public static function empty(): DataRow
+    public static function of(array $values): DataRow
     {
-        return new self([], [], []);
+        return new DataRow($values, \array_fill(0, \count($values), true), $values);
     }
 
-    public static function associative($key, array $values): DataRow
+    public static function dictionaryEntry($key, $value): DataRow
     {
-        return new DataRow([$key], [true], $values);
+        return new DataRow([$key], [true], [$value]);
     }
 
     public function isAssociative(int $index): bool
@@ -42,7 +42,6 @@ public function joined(DataRow $dataRow): DataRow
         return new DataRow(
             \array_merge($this->keys, $dataRow->keys),
             \array_merge($this->associative, $dataRow->associative),
-            \array_merge($this->values, $dataRow->values)
-        );
+            \array_merge($this->values, $dataRow->values));
     }
 }

src/Internal/Provider/DictionaryProvider.php

@@ -18,7 +18,7 @@ protected function dataset(): array
     {
         $dataset = [];
         foreach ($this->dictionary as $key => $value) {
-            $dataset[] = DataRow::associative($key, [$value]);
+            $dataset[] = DataRow::dictionaryEntry($key, $value);
         }
         return $dataset;
     }

src/Internal/Provider/DistinctPairsProvider.php

@@ -22,7 +22,7 @@ protected function dataset(): array
                 if ($index1 === $index2) {
                     continue;
                 }
-                $dataset[] = new DataRow([$augend, $addend], [true, true], [$augend, $addend]);
+                $dataset[] = DataRow::of([$augend, $addend]);
             }
         }
         return $dataset;

src/Internal/Provider/EntriesProvider.php

@@ -18,7 +18,7 @@ protected function dataset(): array
     {
         $dataset = [];
         foreach ($this->dictionary as $key => $value) {
-            $dataset[] = new DataRow([$key, $value], [true, true], [$key, $value]);
+            $dataset[] = DataRow::of([$key, $value]);
         }
         return $dataset;
     }

src/Internal/Provider/ListProvider.php

@@ -18,7 +18,7 @@ protected function dataset(): array
     {
         $dataset = [];
         foreach ($this->values as $value) {
-            $dataset[] = DataRow::associative($value, [$value]);
+            $dataset[] = DataRow::of([$value]);
         }
         return $dataset;
     }

src/Internal/Provider/PairsProvider.php

@@ -19,7 +19,7 @@ protected function dataset(): array
         $dataset = [];
         foreach ($this->values as $augend) {
             foreach ($this->values as $addend) {
-                $dataset[] = new DataRow([$augend, $addend], [true, true], [$augend, $addend]);
+                $dataset[] = DataRow::of([$augend, $addend]);
             }
         }
         return $dataset;

src/Internal/Provider/TuplesProvider.php

@@ -18,7 +18,7 @@ protected function dataset(): array
     {
         $dataset = [];
         foreach ($this->sets as $set) {
-            $dataset[] = new DataRow($set, \array_fill(0, \count($set), true), $set);
+            $dataset[] = DataRow::of($set);
         }
         return $dataset;
     }

src/Internal/Provider/ZipProvider.php

@@ -67,7 +67,7 @@ private function count(): int
 
     private function zippedRow(int $rowIndex): DataRow
     {
-        $joinedRow = DataRow::empty();
+        $joinedRow = DataRow::of([]);
         foreach ($this->dataFrames as $dataProvider) {
             $joinedRow = $joinedRow->joined($dataProvider->dataset()[$rowIndex]);
         }

test/Fixture/HistoryDataProvider.php

@@ -29,7 +29,7 @@ private function arrayDatasets(): array
     {
         $datasets = [];
         foreach ($this->elements as $key => $value) {
-            $datasets[] = DataRow::associative($key, [$value]);
+            $datasets[] = DataRow::dictionaryEntry($key, $value);
         }
         return $datasets;
     }