改名

Annotation/Inject.php

@@ -5,12 +5,10 @@ namespace Annotation;
 
 
 use Exception;
-use HttpServer\Http\Context;
 use Kiri\Core\Str;
 use Kiri\Kiri;
 use ReflectionException;
 use ReflectionProperty;
-use Server\ResponseInterface;
 
 /**
  * Class Inject
@@ -94,12 +92,10 @@ use Server\ResponseInterface;
 	 */
 	private function parseInjectValue(): mixed
 	{
-		if (class_exists($this->value)) {
+		if (!Kiri::app()->has($this->value)) {
 			return Kiri::getDi()->get($this->value, $this->args);
-		} else if (Kiri::app()->has($this->value)) {
-			return Kiri::app()->get($this->value);
 		} else {
-			return $this->value;
+			return Kiri::app()->get($this->value);
 		}
 	}
 

System/Di/Container.php

@@ -84,7 +84,7 @@ class Container extends BaseObject
 	 */
 	public function get($class, array $constrict = [], array $config = []): mixed
 	{
-		if ($this->_isInterface($class)) {
+		if ($this->isInterface($class)) {
 			$class = $this->_interfaces[$class];
 		}
 		if (!isset($this->_singletons[$class])) {
@@ -99,7 +99,7 @@ class Container extends BaseObject
 	 * @return bool
 	 * @throws ReflectionException
 	 */
-	private function _isInterface($class): bool
+	public function isInterface($class): bool
 	{
 		$reflect = $this->getReflect($class);
 		if ($reflect->isInterface()) {