php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-10-30 01:56:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #18115: Allow to load action-injected services from module's container

Browse Source
This commit is contained in:
ErickSkrauch
2020-06-22 23:49:02 +03:00
committed by GitHub
parent d755004c41
commit 2e21a8275c
6 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/base/Controller.php
View File

@ -565,9 +565,12 @@ class Controller extends Component implements ViewContextInterface
if (($component = $this->module->get($name, false)) instanceof $typeName) {
$args[] = $component;
$requestedParams[$name] = "Component: " . get_class($component) . " \$$name";
} elseif ($this->module->has($typeName) && ($service = $this->module->get($typeName)) instanceof $typeName) {
$args[] = $service;
$requestedParams[$name] = 'Module ' . get_class($this->module) . " DI: $typeName \$$name";
} elseif (\Yii::$container->has($typeName) && ($service = \Yii::$container->get($typeName)) instanceof $typeName) {
$args[] = $service;
$requestedParams[$name] = "DI: $typeName \$$name";
$requestedParams[$name] = "Container DI: $typeName \$$name";
} elseif ($type->allowsNull()) {
$args[] = null;
$requestedParams[$name] = "Unavailable service: $name";