Default Changelist
This commit is contained in:
+4
-5
@@ -12,7 +12,6 @@ class Container
|
||||
/** @var Container */
|
||||
private static $_instance;
|
||||
|
||||
/** @var \common\Config */
|
||||
private $config;
|
||||
|
||||
private $container = [];
|
||||
@@ -38,8 +37,8 @@ class Container
|
||||
|
||||
if (static::$_instance->exists($class)) {
|
||||
$newInstance = static::$_instance->get($class);
|
||||
if (method_exists($newInstance, 'initConfig')) {
|
||||
$newInstance->initConfig($config);
|
||||
if (method_exists($newInstance, 'setConfig')) {
|
||||
$newInstance->setConfig($config);
|
||||
}
|
||||
return $newInstance;
|
||||
} else {
|
||||
@@ -71,8 +70,8 @@ class Container
|
||||
throw new Exception('Class Con\'t instance.');
|
||||
}
|
||||
$newInstance = $newInstance->newInstance();
|
||||
if (method_exists($newInstance, 'initConfig')) {
|
||||
$newInstance->initConfig($this->config);
|
||||
if (method_exists($newInstance, 'setConfig')) {
|
||||
$newInstance->setConfig($this->config);
|
||||
}
|
||||
|
||||
$this->container[$class] = $newInstance;
|
||||
|
||||
Reference in New Issue
Block a user