as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-02-23 00:59:41 +08:00
parent 0a531bcb60
commit 792bbc2c40
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
System/Di/Container.php
+6
View File
@@ -126,6 +126,7 @@ class Container extends BaseObject
*/ */
private function resolve($class, $constrict, $config): object private function resolve($class, $constrict, $config): object
{ {
/** @var ReflectionClass $reflect */
list($reflect, $dependencies) = $this->resolveDependencies($class); list($reflect, $dependencies) = $this->resolveDependencies($class);
foreach ($constrict as $index => $param) { foreach ($constrict as $index => $param) {
$dependencies[$index] = $param; $dependencies[$index] = $param;
@@ -140,8 +141,13 @@ class Container extends BaseObject
$dependencies[count($dependencies) - 1] = $config; $dependencies[count($dependencies) - 1] = $config;
return $reflect->newInstanceArgs($dependencies); return $reflect->newInstanceArgs($dependencies);
} }
$this->_param[$class] = $config; $this->_param[$class] = $config;
if ($reflect->getConstructor() !== null) {
$object = $reflect->newInstanceArgs($dependencies ?? []); $object = $reflect->newInstanceArgs($dependencies ?? []);
} else {
$object = $reflect->newInstance();
}
foreach ($config as $key => $val) { foreach ($config as $key => $val) {
$object->{$key} = $val; $object->{$key} = $val;
} }