Removed feedback option

Author: dantleech

example/http_sampler.php

@@ -13,19 +13,27 @@
     [ 'valve/delay', [ 'time' => 10 ] ],
     [ 'sampler/curl', [ 'url' => '%url%', 'concurrency' => 10, 'async' => false ] ],
     [ 'valve/timeout', [ 'time' => 10E6 ]],
-    [ 'distribution/fork', [ 'stages' => [
-        [ 'pipeline', [ 'stages' => [
-            [ 'filter/keys', [ 'keys' => [ 'url', 'total_time', 'connect_time', 'concurrency']]],
-            [ 'aggregator/collector', ['limit' => 2] ],
-            //[ 'aggregator/describe', [ 'group_by' => 'url', 'describe' => 'total_time' ] ],
-            [ 'encoder/json', [ 'pretty' => true ] ],
-            'console/redraw',
-            [ 'output/stream' ],
-        ]]],
-        [ 'pipeline', [ 'stages' => [
-            [ 'encoder/json' ],
-            [ 'output/stream', [ 'stream' => 'report.json', 'mode' => 'a' ]],
-        ]]]
-    ]]],
+    [ 'pipeline', [
+        'stages' => [
+            [
+                'pipeline',
+                ['stages' => [
+                    ['filter/keys', ['keys' => ['url', 'total_time', 'connect_time', 'concurrency']]],
+                    [ 'aggregator/collector', ['limit' => 2] ],
+                    //[ 'aggregator/describe', [ 'group_by' => 'url', 'describe' => 'total_time' ] ],
+                    [ 'encoder/json', [ 'pretty' => true ] ],
+                    'console/redraw',
+                    [ 'output/stream' ]
+                ]]
+            ],
+            [
+                'pipeline',
+                [ 'stages' => [
+                    [ 'encoder/json' ],
+                    [ 'output/stream', [ 'stream' => 'report.json', 'mode' => 'a' ]]
+                ]]
+            ]
+        ]
+    ]],
 ]);
 $builder->run();

lib/Core/Pipeline.php

@@ -23,10 +23,6 @@ public function __invoke(): Generator
         }
 
         while (true) {
-            if (false === $config['feedback']) {
-                $data = $initialData;
-            }
-
             foreach ($configuredGenerators as $configuredGenerator) {
                 $generatorConfig = $configuredGenerator->config();
                 $generatorConfig = $this->replaceTokens($generatorConfig, $data);
@@ -53,7 +49,7 @@ public function __invoke(): Generator
                 $data = $response;
             }
 
-            yield $data;
+            list($config, $data) =yield $data;
         }
     }
 
@@ -79,12 +75,10 @@ public function configure(Schema $schema)
         $schema->setTypes([
             'generator_factory' => GeneratorFactory::class,
             'stages' => 'array',
-            'feedback' => 'boolean',
         ]);
 
         $schema->setDefaults([
             'stages' => [],
-            'feedback' => false,
         ]);
     }
 

lib/Extension/Core/CoreExtension.php

@@ -30,7 +30,6 @@ public function __construct()
         $this->stages = [
             'aggregator/collector' => new CollectorAggregator(),
             'aggregator/describe' => new DescribeAggregator(),
-            'distribution/fork' => new Fork(),
             'encoder/json' => new JsonEncoder(),
             'filter/keys' => new KeysFilter(),
             'output/stream' => new StreamOutput(),

tests/Unit/Core/PipelineTest.php

@@ -159,32 +159,7 @@ function () {
         ]);
     }
 
-    public function testCanEnableFeedback()
-    {
-        $stage = function () {
-            list($config, $data) = yield;
-
-            for ($i = 0; $i < 2; ++$i) {
-                $data[] = 'Hello';
-                list($config, $data) = yield $data;
-            }
-        };
-
-        $this->factory->generatorFor(Argument::type('callable'))->will(function ($args) {
-            return new ConfiguredGenerator($args[0](), []);
-        });
-
-        $result = $this->runPipeline([
-            $stage,
-            $stage,
-        ], [], true);
-
-        $this->assertEquals([
-            'Hello', 'Hello', 'Hello', 'Hello',
-        ], $result);
-    }
-
-    private function runPipeline(array $stages, array $data = [], bool $feedback = false)
+    private function runPipeline(array $stages, array $data = [])
     {
         $generator = (new Pipeline())();
 
@@ -193,7 +168,6 @@ private function runPipeline(array $stages, array $data = [], bool $feedback = f
             $data = $generator->send([[
                 'stages' => $stages,
                 'generator_factory' => $this->factory->reveal(),
-                'feedback' => $feedback,
             ], $data]);
 
             if (null === $data) {