Merge branch 'develop'

Author: jreviews

CHANGELOG.md

@@ -1,11 +1,18 @@
 # Changelog
 
-## [Unreleased](https://github.com/clickfwd/yoyo/compare/0.12.0...develop)
+## [Unreleased](https://github.com/clickfwd/yoyo/compare/0.13.1...develop)
+
+## [0.13.1 (2025-08-15)](https://github.com/clickfwd/yoyo/compare/0.13.0...0.13.1)
+
+- Fix parameter validation to correctly handle optional parameters in component actions
 
 ## [0.13.0 (2025-08-15)](https://github.com/clickfwd/yoyo/compare/0.12.0...0.13.0)
 
 - Fix spinners stop working when target is different than current element
 - Add support for variadic parameters in component actions using PHP's `...$params` syntax
+- Add automatic dependency injection for typed parameters in component actions
+- Add new ClassHelpers methods: `methodHasVariadicParameter()` and `getMethodParametersWithTypes()`
+- Enhanced ComponentManager to handle methods with variadic parameters
 - Improved parameter validation to support methods with only typed (DI) parameters
 - Container integration now properly handles mixed regular, typed, and variadic parameters
 

composer.json

@@ -5,7 +5,6 @@
         "framework",
         "yoyo"
     ],
-    "version": "0.11.1",
     "license": "MIT",
     "homepage": "https://github.com/Clickfwd/yoyo",
     "support": {

src/yoyo/ComponentManager.php

@@ -191,9 +191,21 @@ private function processDynamicComponent($action, $variables = [], $attributes =
                     throw new \InvalidArgumentException("Too few parameters passed to [{$this->name}::{$action}]");
                 }
             } else {
+                // Check if all regular parameters are optional
+                $requiredCount = 0;
+                foreach ($regularParams as $param) {
+                    if (! $param['optional']) {
+                        $requiredCount++;
+                    }
+                }
+                
                 // Only validate regular parameters (not typed/DI parameters)
-                if (count($parameterNames) == count($parameters)) {
-                    $args = array_combine($parameterNames, $parameters);
+                if (count($parameters) >= $requiredCount && count($parameters) <= count($parameterNames)) {
+                    // Parameters count is valid (between required and total)
+                    $args = [];
+                    for ($i = 0; $i < count($parameterNames); $i++) {
+                        $args[$parameterNames[$i]] = $parameters[$i] ?? null;
+                    }
                 } elseif (empty($parameterNames) && empty($parameters)) {
                     // Method has only typed parameters (or no parameters at all)
                     $args = [];

tests/Feature/DynamicComponentTest.php

@@ -205,3 +205,19 @@
 
     expect(yoyo_update())->toContain('Post: the comment title, Tags: ["php","laravel","yoyo"]');
 });
+
+it('handles action with typed and optional regular parameter without value', function () {
+    mockYoyoPostRequest('/', 'dependency-injection-action/typedWithOptional', 'dependency-injection-action', [
+        'actionArgs' => [],
+    ]);
+    
+    expect(yoyo_update())->toContain('Post: the comment title, Status: default');
+});
+
+it('handles action with typed and optional regular parameter with value', function () {
+    mockYoyoPostRequest('/', 'dependency-injection-action/typedWithOptional', 'dependency-injection-action', [
+        'actionArgs' => ['active'],
+    ]);
+    
+    expect(yoyo_update())->toContain('Post: the comment title, Status: active');
+});

tests/app/Yoyo/DependencyInjectionAction.php

@@ -42,6 +42,15 @@ public function typedWithVariadic(Post $post, ...$tags)
         $this->result = "Post: {$post->title()}, Tags: " . json_encode($tags);
     }
 
+    /**
+     * Test action with typed and optional regular parameter
+     */
+    public function typedWithOptional(Post $post, ?string $status = null)
+    {
+        $statusText = $status ?? 'default';
+        $this->result = "Post: {$post->title()}, Status: {$statusText}";
+    }
+    
     public function render()
     {
         return $this->view('dependency-injection-action', ['result' => $this->result]);