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-08-25 13:50:40 +08:00
parent bee11f3d82
commit 55630e22a3
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/Di/Container.php
+7 -8
View File
@@ -10,6 +10,7 @@ declare(strict_types=1);
namespace Kiri\Di; namespace Kiri\Di;
use Annotation\Inject; use Annotation\Inject;
use Closure;
use Exception; use Exception;
use Kiri\Abstracts\BaseObject; use Kiri\Abstracts\BaseObject;
use Kiri\Abstracts\Logger; use Kiri\Abstracts\Logger;
@@ -177,7 +178,6 @@ class Container extends BaseObject implements ContainerInterface
* @param $dependencies * @param $dependencies
* @return object * @return object
* @throws ReflectionException * @throws ReflectionException
* @throws NotFindClassException
*/ */
private function newInstance(ReflectionClass $reflect, $dependencies): object private function newInstance(ReflectionClass $reflect, $dependencies): object
{ {
@@ -262,6 +262,7 @@ class Container extends BaseObject implements ContainerInterface
/** /**
* @param $class * @param $class
* @return ReflectionClass * @return ReflectionClass
* @throws ReflectionException
*/ */
private function resolveDependencies($class): ReflectionClass private function resolveDependencies($class): ReflectionClass
{ {
@@ -313,7 +314,6 @@ class Container extends BaseObject implements ContainerInterface
* @param ReflectionClass|string $class * @param ReflectionClass|string $class
* @param string $method * @param string $method
* @return array|null * @return array|null
* @throws NotFindClassException
* @throws ReflectionException * @throws ReflectionException
*/ */
public function getMethodParameters(ReflectionClass|string $class, string $method): ?array public function getMethodParameters(ReflectionClass|string $class, string $method): ?array
@@ -339,8 +339,9 @@ class Container extends BaseObject implements ContainerInterface
* @param $class * @param $class
* @param $method * @param $method
* @param $parameters * @param $parameters
* @return mixed
*/ */
private function setParameters($class, $method, $parameters) private function setParameters($class, $method, $parameters): mixed
{ {
if (!isset($this->_parameters[$class])) { if (!isset($this->_parameters[$class])) {
$this->_parameters[$class] = []; $this->_parameters[$class] = [];
@@ -353,12 +354,11 @@ class Container extends BaseObject implements ContainerInterface
/** /**
* @param \Closure $reflectionMethod * @param Closure $reflectionMethod
* @return array * @return array
* @throws NotFindClassException
* @throws ReflectionException * @throws ReflectionException
*/ */
public function resolveFunctionParameters(\Closure $reflectionMethod): array public function resolveFunctionParameters(Closure $reflectionMethod): array
{ {
return $this->resolveMethodParameters(new ReflectionFunction($reflectionMethod)); return $this->resolveMethodParameters(new ReflectionFunction($reflectionMethod));
} }
@@ -367,7 +367,6 @@ class Container extends BaseObject implements ContainerInterface
/** /**
* @param ReflectionMethod|ReflectionFunction $reflectionMethod * @param ReflectionMethod|ReflectionFunction $reflectionMethod
* @return array * @return array
* @throws NotFindClassException
* @throws ReflectionException * @throws ReflectionException
*/ */
private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
@@ -383,7 +382,7 @@ class Container extends BaseObject implements ContainerInterface
$params[$key] = $parameter->getType(); $params[$key] = $parameter->getType();
} else { } else {
$type = $parameter->getType()->getName(); $type = $parameter->getType()->getName();
if (is_string($type) && class_exists($type)) { if (is_string($type) && class_exists($type) || isset($this->_interfaces[$type])) {
$type = Kiri::getDi()->get($type); $type = Kiri::getDi()->get($type);
} }
$params[$key] = match ($parameter->getType()) { $params[$key] = match ($parameter->getType()) {