Merge pull request #66 from jstoks/fix-attributes-dynamically-resolve…

…d-from-handle Fixes ignored default values in handle method.
lorisleiva · Oct 17, 2020 · aed0e62 · aed0e62
2 parents ef190a2 + d8fc49d
commit aed0e62
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/src/Action.php b/src/Action.php
@@ -54,9 +54,8 @@ public function __construct()
             $this->resolveAndCall($this, 'initialized');
         }
 
-        if (func_num_args() > 0) {
-            $this->resolveAttributesFromConstructor(...func_get_args());
-        }
+        $args = func_num_args() > 0 ? func_get_args() : [];
+        $this->resolveAttributesFromConstructor(...$args);
     }
 
     protected function resolveAttributesFromConstructor(...$arguments)
@@ -71,12 +70,18 @@ protected function resolveAttributesFromConstructor(...$arguments)
 
         if ($attributes === true && method_exists($this, 'handle')) {
             $reflector = new ReflectionMethod($this, 'handle');
-            $attributes = collect($reflector->getParameters())->map->getName()->toArray();
+            foreach($reflector->getParameters() as $index => $param) {
+               $defaultValue = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null;
+               $this->set($param->getName(), Arr::get($arguments, $index, $defaultValue));
+            }
+            return $this;
         }
 
         foreach (Arr::wrap($attributes) as $index => $name) {
             $this->set($name, Arr::get($arguments, $index, null));
         }
+
+        return $this;
     }
 
     /**

diff --git a/tests/Actions/SimpleCalculatorWithHandleDefaults.php b/tests/Actions/SimpleCalculatorWithHandleDefaults.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Lorisleiva\Actions\Tests\Actions;
+
+use Lorisleiva\Actions\Action;
+
+class SimpleCalculatorWithHandleDefaults extends SimpleCalculator
+{
+    protected $getAttributesFromConstructor = true;
+
+    public function handle($operation, $left = 50, $right = 100)
+    {
+        return parent::handle($operation, $left, $right);
+    }
+}
diff --git a/tests/RegistersActionsTest.php b/tests/RegistersActionsTest.php
@@ -10,6 +10,8 @@
 
 class RegistersActionsTest extends TestCase
 {
+    const ACTION_COUNT = 11;
+
     protected function getEnvironmentSetUp($app)
     {
         $app->instance(ActionManager::class, new class() extends ActionManager {
@@ -30,7 +32,7 @@ public function it_can_register_all_actions_within_a_directory()
         Actions::paths(__DIR__ . '/Actions');
         Actions::registerAllPaths();
 
-        $this->assertCount(10, Actions::getRegisteredActions());
+        $this->assertCount(static::ACTION_COUNT, Actions::getRegisteredActions());
     }
 
     /** @test */
@@ -40,7 +42,7 @@ public function it_only_register_actions_once()
         Actions::registerAllPaths();
         Actions::registerAllPaths();
 
-        $this->assertCount(10, Actions::getRegisteredActions());
+        $this->assertCount(static::ACTION_COUNT, Actions::getRegisteredActions());
     }
 
     /** @test */

diff --git a/tests/RunsAsObjectsTest.php b/tests/RunsAsObjectsTest.php
@@ -5,6 +5,7 @@
 use BadMethodCallException;
 use Lorisleiva\Actions\Action;
 use Lorisleiva\Actions\Tests\Actions\SimpleCalculator;
+use Lorisleiva\Actions\Tests\Actions\SimpleCalculatorWithHandleDefaults;
 
 class RunsAsObjectsTest extends TestCase
 {
@@ -90,6 +91,19 @@ public function it_can_fill_multiple_attributes_at_once()
         $this->assertEquals(5, $action->right);
     }
 
+    /** @test */
+    public function it_can_fill_attributes_dynamically_from_handle()
+    {
+        $action = (new SimpleCalculatorWithHandleDefaults())->fill([
+            'operation' => 'addition',
+        ]);
+
+        $this->assertEquals('addition', $action->operation);
+        $this->assertEquals(50, $action->left);
+        $this->assertEquals(100, $action->right);
+        $this->assertEquals(150, $action->run());
+    }
+
     /** @test */
     public function it_can_run_with_some_additional_data_to_fill()
     {