diff --git a/System/Di/Container.php b/System/Di/Container.php index 36619a4c..eaac5686 100644 --- a/System/Di/Container.php +++ b/System/Di/Container.php @@ -77,7 +77,6 @@ class Container extends BaseObject return $this->resolve($class, $constrict, $config); } $definition = $this->_constructs[$class]; - var_dump($class, $definition); if (is_callable($definition, TRUE)) { return call_user_func($definition, $this, $constrict, $config); } else if (is_array($definition)) { @@ -101,21 +100,10 @@ class Container extends BaseObject */ private function resolveDefinition($definition, $class, $config, $constrict): mixed { - if (!isset($definition['class'])) { - throw new NotFindClassException($class); - } - $_className = $definition['class']; - unset($definition['class']); - $config = array_merge($definition, $config); $definition = $this->mergeParam($class, $constrict); - if ($_className === $class) { - $object = $this->resolve($class, $definition, $config); - } else { - $object = $this->get($class, $definition, $config); - } - return $object; + return $this->resolve($class, $definition, $config); } /** diff --git a/System/Snowflake.php b/System/Snowflake.php index c19d6b93..db5964b2 100644 --- a/System/Snowflake.php +++ b/System/Snowflake.php @@ -90,7 +90,6 @@ class Snowflake */ public static function createObject($className, $construct = []): mixed { - var_dump($className); if (is_object($className)) { return $className; }