Preparing for usage

This commit is contained in:
Dennis Eichhorn 2016-11-11 22:37:56 +01:00
parent 0c5e3bfad4
commit b66afdf9f0

View File

@ -61,16 +61,19 @@ final class Storage
if(is_string(self::$registered[$env])) { if(is_string(self::$registered[$env])) {
$env = self::$registered[$env]::getInstance(); $env = self::$registered[$env]::getInstance();
} elseif(self::$registered[$env] instanceof StorageAbstract) { } elseif(self::$registered[$env] instanceof StorageAbstract) {
$env = self::$registered[$env]::getInstance(); $env = self::$registered[$env];
} elseif(self::$registered[$env] instanceof ContainerInterface) { } elseif(self::$registered[$env] instanceof ContainerInterface) {
$env = self::$registered[$env]; $env = self::$registered[$env];
} else { } else {
throw new \Exception('Invalid type'); throw new \Exception('Invalid type');
} }
} else { } else {
$stg = $env;
$env = ucfirst(strtolower($env)); $env = ucfirst(strtolower($env));
$env = __NAMESPACE__ . '\\' . $env . '\\' . $env . 'Storage'; $env = __NAMESPACE__ . '\\' . $env . '\\' . $env . 'Storage';
$env = $env::getInstance(); $env = $env::getInstance();
self::$registered[$stg] = $env;
} }
return $env; return $env;