projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More verbose import alias
[zf2.biz/galerie.git]
/
modules
/
Application
/
src
/
Application
/
Bootstrap.php
diff --git
a/modules/Application/src/Application/Bootstrap.php
b/modules/Application/src/Application/Bootstrap.php
index
3880ade
..
a08d0c2
100644
(file)
--- a/
modules/Application/src/Application/Bootstrap.php
+++ b/
modules/Application/src/Application/Bootstrap.php
@@
-2,7
+2,7
@@
namespace Application;
use Zend\Config\Config,
namespace Application;
use Zend\Config\Config,
- Zend\Di\Configuration,
+ Zend\Di\Configuration as DiConfiguration,
Zend\Di\Definition,
Zend\Di\DefinitionList,
Zend\Di\Di,
Zend\Di\Definition,
Zend\Di\DefinitionList,
Zend\Di\Di,
@@
-33,7
+33,7
@@
class Bootstrap
$di = new Di;
$di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
$di = new Di;
$di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
- $config = new Configuration($this->config->di);
+ $config = new DiConfiguration($this->config->di);
$config->configure($di);
$app->setLocator($di);
$config->configure($di);
$app->setLocator($di);