改名
This commit is contained in:
+1
-13
@@ -77,7 +77,6 @@ class Container extends BaseObject
|
|||||||
return $this->resolve($class, $constrict, $config);
|
return $this->resolve($class, $constrict, $config);
|
||||||
}
|
}
|
||||||
$definition = $this->_constructs[$class];
|
$definition = $this->_constructs[$class];
|
||||||
var_dump($class, $definition);
|
|
||||||
if (is_callable($definition, TRUE)) {
|
if (is_callable($definition, TRUE)) {
|
||||||
return call_user_func($definition, $this, $constrict, $config);
|
return call_user_func($definition, $this, $constrict, $config);
|
||||||
} else if (is_array($definition)) {
|
} else if (is_array($definition)) {
|
||||||
@@ -101,21 +100,10 @@ class Container extends BaseObject
|
|||||||
*/
|
*/
|
||||||
private function resolveDefinition($definition, $class, $config, $constrict): mixed
|
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);
|
$config = array_merge($definition, $config);
|
||||||
$definition = $this->mergeParam($class, $constrict);
|
$definition = $this->mergeParam($class, $constrict);
|
||||||
|
|
||||||
if ($_className === $class) {
|
return $this->resolve($class, $definition, $config);
|
||||||
$object = $this->resolve($class, $definition, $config);
|
|
||||||
} else {
|
|
||||||
$object = $this->get($class, $definition, $config);
|
|
||||||
}
|
|
||||||
return $object;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ class Snowflake
|
|||||||
*/
|
*/
|
||||||
public static function createObject($className, $construct = []): mixed
|
public static function createObject($className, $construct = []): mixed
|
||||||
{
|
{
|
||||||
var_dump($className);
|
|
||||||
if (is_object($className)) {
|
if (is_object($className)) {
|
||||||
return $className;
|
return $className;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user