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

改名

Browse Source
This commit is contained in:
Mr·x
2021-04-25 12:03:03 +08:00
parent a1bb3974cb
commit 355c02490b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
System/Di/Container.php
+6 -4
View File
@@ -215,6 +215,9 @@ class Container extends BaseObject
*/ */
private function resolveDependencies($class): ?array private function resolveDependencies($class): ?array
{ {
if (!isset($this->_constructs[$class])) {
$this->_constructs[$class] = ['class' => $class];
}
if (isset($this->_reflection[$class])) { if (isset($this->_reflection[$class])) {
return [$this->_reflection[$class], $this->_constructs[$class] ?? []]; return [$this->_reflection[$class], $this->_constructs[$class] ?? []];
} }
@@ -223,15 +226,14 @@ class Container extends BaseObject
if (!$reflection->isInstantiable()) { if (!$reflection->isInstantiable()) {
return null; return null;
} }
$this->scanProperty($reflection); $this->scanProperty($reflection);
$this->_reflection[$class] = $reflection; $this->_reflection[$class] = $reflection;
if (!is_null($construct = $reflection->getConstructor())) { if (!is_null($construct = $reflection->getConstructor())) {
$this->_constructs[$class] = $this->resolveMethodParam($construct); $this->_constructs[$class] = array_merge($this->_constructs[$class],
$this->resolveMethodParam($construct)
);
} }
return [$reflection, $this->_constructs[$class] ?? []]; return [$reflection, $this->_constructs[$class] ?? []];
} }