Add DataProviders.mapper()

Author: danon

src/TRegx/CrossData/DataProviders.php

@@ -6,13 +6,17 @@ class DataProviders
     /** @var array */
     private $dataProviders;
 
-    /** @var callable */
+    /** @var callable|null */
     private $mapper;
 
-    public function __construct(array $dataProviders, callable $mapper)
+    /** @var callable */
+    private $keyMapper;
+
+    public function __construct(array $dataProviders, $mapper, callable $keyMapper)
     {
         $this->dataProviders = $dataProviders;
         $this->mapper = $mapper;
+        $this->keyMapper = $keyMapper;
     }
 
     /**
@@ -29,34 +33,51 @@ public function input(array ...$dataProviders)
      * @param callable $mapper
      * @return DataProviders
      */
-    public function keyMapper(callable $mapper)
+    public function mapper(callable $mapper)
     {
         $this->mapper = $mapper;
         return $this;
     }
 
+    /**
+     * @param callable $keyMapper
+     * @return DataProviders
+     */
+    public function keyMapper(callable $keyMapper)
+    {
+        $this->keyMapper = $keyMapper;
+        return $this;
+    }
+
     /**
      * @return array
      */
     public function create()
     {
-        return (new KeyMapper($this->mapper))->map((new ArrayMatrix())->cross($this->dataProviders));
+        $result = (new ArrayMatrix())->cross($this->dataProviders);
+        $mapped = (new KeyMapper($this->keyMapper))->map($result);
+        if ($this->mapper !== null) {
+            $mapped = \array_map(function ($input) {
+                return (array)$input;
+            }, \array_map($this->mapper, $mapped));
+        }
+        return $mapped;
     }
 
     /**
      * @return DataProvidersBuilder
      */
     public static function builder()
     {
-        return new DataProvidersBuilder([], '\json_encode');
+        return new DataProvidersBuilder([], null, '\json_encode');
     }
 
     /**
      * @return DataProviders
      */
     public static function configure()
     {
-        return new DataProviders([], '\json_encode');
+        return new DataProviders([], null, '\json_encode');
     }
 
     /**
@@ -65,6 +86,6 @@ public static function configure()
      */
     public static function crossAll(array ...$dataProviders)
     {
-        return (new DataProviders($dataProviders, '\json_encode'))->create();
+        return (new DataProviders($dataProviders, null, '\json_encode'))->create();
     }
 }

src/TRegx/CrossData/DataProvidersBuilder.php

@@ -6,13 +6,17 @@ class DataProvidersBuilder
     /** @var array */
     private $dataProviders;
 
-    /** @var callable */
+    /** @var callable|null */
     private $mapper;
 
-    public function __construct(array $dataProviders, callable $mapper)
+    /** @var callable */
+    private $keyMapper;
+
+    public function __construct(array $dataProviders, $mapper, callable $keyMapper)
     {
         $this->dataProviders = $dataProviders;
         $this->mapper = $mapper;
+        $this->keyMapper = $keyMapper;
     }
 
     /**
@@ -29,17 +33,27 @@ public function crossing(array $singleDataProvider)
      * @param callable $mapper
      * @return DataProvidersBuilder
      */
-    public function keyMapper(callable $mapper)
+    public function mapper(callable $mapper)
     {
         $this->mapper = $mapper;
         return $this;
     }
 
+    /**
+     * @param callable $mapper
+     * @return DataProvidersBuilder
+     */
+    public function keyMapper(callable $mapper)
+    {
+        $this->keyMapper = $mapper;
+        return $this;
+    }
+
     /**
      * @return array
      */
     public function build()
     {
-        return (new KeyMapper($this->mapper))->map((new ArrayMatrix())->cross($this->dataProviders));
+        return (new DataProviders($this->dataProviders, $this->mapper, $this->keyMapper))->create();
     }
 }

test/TRegx/CrossData/DataProvidersBuilderTest.php

@@ -11,7 +11,7 @@ class DataProvidersBuilderTest extends TestCase
     public function test()
     {
         // given
-        $builder = new DataProvidersBuilder([], '\json_encode');
+        $builder = new DataProvidersBuilder([], null, '\json_encode');
 
         // when
         $result = $builder
@@ -25,4 +25,25 @@ public function test()
         // then
         $this->assertEquals(['0+0' => [1, 'A'], '0+1' => [1, 'B'], '1+0' => [2, 'A'], '1+1' => [2, 'B']], $result);
     }
+
+    /**
+     * @test
+     */
+    public function shouldMap()
+    {
+        // given
+        $builder = new DataProvidersBuilder([], null, '\json_encode');
+
+        // when
+        $result = $builder
+            ->crossing([[1], [2]])
+            ->crossing([['A'], ['B']])
+            ->mapper(function (array $keys) {
+                return join('+', $keys);
+            })
+            ->build();
+
+        // then
+        $this->assertEquals(['[0,0]' => ['1+A'], '[0,1]' => ['1+B'], '[1,0]' => ['2+A'], '[1,1]' => ['2+B']], $result);
+    }
 }

test/TRegx/CrossData/DataProvidersTest.php

@@ -63,6 +63,46 @@ public function shouldKeyMapper()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * @test
+     */
+    public function shouldMap()
+    {
+        // given
+        $builder = new DataProvidersBuilder([], null, '\json_encode');
+
+        // when
+        $result = DataProviders::configure()
+            ->input([[1], [2]], [['A'], ['B']])
+            ->mapper(function (array $keys) {
+                return [join('+', $keys)];
+            })
+            ->create();
+
+        // then
+        $this->assertEquals(['[0,0]' => ['1+A'], '[0,1]' => ['1+B'], '[1,0]' => ['2+A'], '[1,1]' => ['2+B']], $result);
+    }
+
+    /**
+     * @test
+     */
+    public function shouldMap_wrapInArray()
+    {
+        // given
+        $builder = new DataProvidersBuilder([], null, '\json_encode');
+
+        // when
+        $result = DataProviders::configure()
+            ->input([[1], [2]], [['A'], ['B']])
+            ->mapper(function (array $keys) {
+                return join('+', $keys);
+            })
+            ->create();
+
+        // then
+        $this->assertEquals(['[0,0]' => ['1+A'], '[0,1]' => ['1+B'], '[1,0]' => ['2+A'], '[1,1]' => ['2+B']], $result);
+    }
+
     /**
      * @test
      */