Fixes #17722

framework/web/Controller.php

@@ -125,6 +125,7 @@ public function bindActionParams($action, $params)
         $args = [];
         $missing = [];
         $actionParams = [];
+        $requestedParams = [];
         foreach ($method->getParameters() as $param) {
             $name = $param->getName();
             if (array_key_exists($name, $params)) {
@@ -162,6 +163,19 @@ public function bindActionParams($action, $params)
                 }
                 $args[] = $actionParams[$name] = $params[$name];
                 unset($params[$name]);
+            } elseif (PHP_VERSION_ID >= 70100 && ($type = $param->getType()) !== null && !$type->isBuiltin()) {
+                // Since it is not a builtin type it must be DI injection.
+                $typeName = $type->getName();
+                if (($component = $this->module->get($name, false)) instanceof $typeName) {
+                    $args[] = $component;
+                    $requestedParams[$name] = "Component: " . get_class($component) . " \$$name";
+                } elseif (\Yii::$container->has($typeName) && ($service = \Yii::$container->get($typeName)) instanceof $typeName) {
+                    $args[] = $service;
+                    $requestedParams[$name] = "DI: $typeName \$$name";
+                } elseif ($type->allowsNull()) {
+                    $args[] = null;
+                    $requestedParams[$name] = "Unavailable service: $name";
+                }
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $actionParams[$name] = $param->getDefaultValue();
             } else {
@@ -177,6 +191,11 @@ public function bindActionParams($action, $params)
 
         $this->actionParams = $actionParams;
 
+        // We use a different array here, specifically one that doesn't contain service instances but descriptions instead.
+        if (\Yii::$app->requestedParams === null) {
+            \Yii::$app->requestedParams = array_merge($actionParams, $requestedParams);
+        }
+
         return $args;
     }
 

tests/framework/web/ControllerTest.php

@@ -10,13 +10,16 @@
 use Yii;
 use yii\base\InlineAction;
 use yii\web\Response;
+use yiiunit\framework\web\stubs\VendorImage;
 use yiiunit\TestCase;
 
 /**
  * @group web
  */
 class ControllerTest extends TestCase
 {
+    /** @var FakeController */
+    private $controller;
     public function testBindActionParams()
     {
         $aksi1 = new InlineAction('aksi1', $this->controller, 'actionAksi1');
@@ -32,6 +35,69 @@ public function testBindActionParams()
         $this->assertEquals('avaliable', $other);
     }
 
+    public function testNullableInjectedActionParams()
+    {
+        if (PHP_VERSION_ID < 70100) {
+            $this->markTestSkipped('Can not be tested on PHP < 7.1');
+            return;
+        }
+
+        // Use the PHP71 controller for this test
+        $this->controller = new FakePhp71Controller('fake', new \yii\web\Application([
+            'id' => 'app',
+            'basePath' => __DIR__,
+
+            'components' => [
+                'request' => [
+                    'cookieValidationKey' => 'wefJDF8sfdsfSDefwqdxj9oq',
+                    'scriptFile' => __DIR__ . '/index.php',
+                    'scriptUrl' => '/index.php',
+                ],
+            ],
+        ]));
+        $this->mockWebApplication(['controller' => $this->controller]);
+
+        $injectionAction = new InlineAction('injection', $this->controller, 'actionNullableInjection');
+        $params = [];
+        $args = $this->controller->bindActionParams($injectionAction, $params);
+        $this->assertEquals(\Yii::$app->request, $args[0]);
+        $this->assertNull($args[1]);
+    }
+
+    public function testInjectedActionParams()
+    {
+        if (PHP_VERSION_ID < 70100) {
+            $this->markTestSkipped('Can not be tested on PHP < 7.1');
+            return;
+        }
+        // Use the PHP71 controller for this test
+        $this->controller = new FakePhp71Controller('fake', new \yii\web\Application([
+            'id' => 'app',
+            'basePath' => __DIR__,
+
+            'components' => [
+                'request' => [
+                    'cookieValidationKey' => 'wefJDF8sfdsfSDefwqdxj9oq',
+                    'scriptFile' => __DIR__ . '/index.php',
+                    'scriptUrl' => '/index.php',
+                ],
+            ],
+        ]));
+        $this->mockWebApplication(['controller' => $this->controller]);
+
+        $injectionAction = new InlineAction('injection', $this->controller, 'actionInjection');
+        $params = ['between' => 'test', 'after' => 'another', 'before' => 'test'];
+        $args = $this->controller->bindActionParams($injectionAction, $params);
+        $this->assertEquals($params['before'], $args[0]);
+        $this->assertEquals(\Yii::$app->request, $args[1]);
+        $this->assertEquals('Component: yii\web\Request $request', \Yii::$app->requestedParams['request']);
+        $this->assertEquals($params['between'], $args[2]);
+        $this->assertInstanceOf(VendorImage::className(), $args[3]);
+        $this->assertEquals('DI: yiiunit\framework\web\stubs\VendorImage $vendorImage', \Yii::$app->requestedParams['vendorImage']);
+        $this->assertNull($args[4]);
+        $this->assertEquals('Unavailable service: $post', \Yii::$app->requestedParams['post']);
+        $this->assertEquals($params['after'], $args[5]);
+    }
     /**
      * @see https://github.com/yiisoft/yii2/issues/17701
      */

tests/framework/web/FakeController.php

@@ -8,6 +8,8 @@
 namespace yiiunit\framework\web;
 
 use yii\web\Controller;
+use yii\web\Request;
+use yiiunit\framework\web\stubs\VendorImage;
 
 /**
  * @author Misbahul D Munir <[email protected]>

tests/framework/web/FakePhp71Controller.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yiiunit\framework\web;
+
+use yii\web\Controller;
+use yii\web\Request;
+use yiiunit\framework\web\stubs\VendorImage;
+
+/**
+ * @author Sam Mousa<[email protected]>
+ * @since 2.0.35
+ */
+class FakePhp71Controller extends Controller
+{
+    public $enableCsrfValidation = false;
+
+    public function actionInjection($before, Request $request, $between, VendorImage $vendorImage, Post $post = null, $after)
+    {
+
+    }
+
+    public function actionNullableInjection(?Request $request, ?Post $post)
+    {
+    }
+}