wip

Author: devajmeireles

src/FractionBuilder.php

@@ -15,18 +15,19 @@
 use Fraction\Interpreters\AsQueue;
 use Fraction\ValueObjects\Then;
 use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Foundation\Application;
 use InvalidArgumentException;
 use Laravel\SerializableClosure\SerializableClosure;
 use UnitEnum;
 
-final class FractionBuilder
+final class FractionBuilder implements Arrayable
 {
-    public array $then = [];
+    private array $then = [];
 
-    public ?QueueUsing $queued = null;
+    private ?QueueUsing $queued = null;
 
-    public ?DeferUsing $deferred = null;
+    private ?DeferUsing $deferred = null;
 
     public function __construct(
         public Application $application,
@@ -59,7 +60,7 @@ public function __invoke(...$arguments): mixed
 
         $instance = $interpreter->then($this->then);
 
-        if ($interpreter instanceof Configurable) {
+        if ($interpreter instanceof Configurable && ($this->queued || $this->deferred)) {
             $interpreter->configure($this->queued?->toArray() ?? $this->deferred->toArray());
         }
 
@@ -97,4 +98,15 @@ public function deferred(
 
         return $this;
     }
+
+    public function toArray(): array
+    {
+        return [
+            'action'   => $this->action,
+            'closure'  => $this->closure,
+            'then'     => $this->then,
+            'queued'   => $this->queued,
+            'deferred' => $this->deferred,
+        ];
+    }
 }

src/FractionManager.php

@@ -13,7 +13,7 @@
 
 final class FractionManager
 {
-    public array $fractions = [];
+    private array $fractions = [];
 
     public function __construct(public Application $application)
     {

tests/Feature/Execution/AsDefaultTest.php

@@ -72,15 +72,15 @@
         return 1;
     });
 
-    expect($builder->queued)->toBeNull();
+    expect($builder->toArray()['queued'])->toBeNull();
 });
 
 test('not deferred', function () {
     $builder = execute('testing', function () {
         return 1;
     });
 
-    expect($builder->deferred)->toBeNull();
+    expect($builder->toArray()['deferred'])->toBeNull();
 });
 
 test('call then', function () {
@@ -159,19 +159,21 @@
         ->then('tree')
         ->then('four');
 
-    expect($builder->then)
+    $array = $builder->toArray();
+
+    expect($array['then'])
         ->toHaveCount(3)
-        ->and($builder->then[0])
+        ->and($array['then'][0])
         ->toBeInstanceOf(Then::class)
-        ->and($builder->then[0]->then)
+        ->and($array['then'][0]->then)
         ->toBe('two')
-        ->and($builder->then[1])
+        ->and($array['then'][1])
         ->toBeInstanceOf(Then::class)
-        ->and($builder->then[1]->then)
+        ->and($array['then'][1]->then)
         ->toBe('tree')
-        ->and($builder->then[2])
+        ->and($array['then'][2])
         ->toBeInstanceOf(Then::class)
-        ->and($builder->then[2]->then)
+        ->and($array['then'][2]->then)
         ->toBe('four');
 });
 

tests/Feature/Execution/AsDeferTest.php

@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-use Fraction\ValueObjects\Then;
-
 beforeEach(fn () => __delete());
 
 afterAll(fn () => __delete());
@@ -21,7 +19,7 @@
         return 1;
     })->deferred();
 
-    expect($builder->queued)->toBeNull();
+    expect($builder->toArray()['queued'])->toBeNull();
 });
 
 test('call then', function () {
@@ -38,63 +36,3 @@
 
     expect($test)->toBeTrue();
 });
-
-test('call then sequentially', function () {
-    execute('one', function () {
-        return 1;
-    })
-        ->then('two')
-        ->then('tree')
-        ->then('four');
-
-    execute('two', function () {
-        __output('two');
-    });
-
-    execute('tree', function () {
-        __output('tree');
-    });
-
-    execute('four', function () {
-        __output('four');
-    });
-
-    $test = run('one');
-
-    expect($test)
-        ->toBe(1)
-        ->and(__exists('two'))
-        ->toBeTrue()
-        ->and(__exists('tree'))
-        ->toBeTrue()
-        ->and(__exists('four'))
-        ->toBeTrue();
-});
-
-test('ensure then order', function () {
-    $builder = execute('one', function () {
-        return 1;
-    })
-        ->deferred()
-        ->then('two')
-        ->then('tree')
-        ->then('four');
-
-    expect($builder->deferred())
-        ->not()
-        ->toBeNull()
-        ->and($builder->then)
-        ->toHaveCount(3)
-        ->and($builder->then[0])
-        ->toBeInstanceOf(Then::class)
-        ->and($builder->then[0]->then)
-        ->toBe('two')
-        ->and($builder->then[1])
-        ->toBeInstanceOf(Then::class)
-        ->and($builder->then[1]->then)
-        ->toBe('tree')
-        ->and($builder->then[2])
-        ->toBeInstanceOf(Then::class)
-        ->and($builder->then[2]->then)
-        ->toBe('four');
-});

tests/Feature/Execution/AsQueueTest.php

@@ -26,7 +26,7 @@
         return 1;
     })->deferred();
 
-    expect($builder->queued)->toBeNull();
+    expect($builder->toArray()['queued'])->toBeNull();
 });
 
 test('call then', function () {