projects
/
zf2.biz
/
galerie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update zf2 submoudle and Di configuration
[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
fed8b36
..
3880ade
100644
(file)
--- a/
modules/Application/src/Application/Bootstrap.php
+++ b/
modules/Application/src/Application/Bootstrap.php
@@
-4,7
+4,8
@@
namespace Application;
use Zend\Config\Config,
Zend\Di\Configuration,
Zend\Di\Definition,
use Zend\Config\Config,
Zend\Di\Configuration,
Zend\Di\Definition,
- Zend\Di\DependencyInjector,
+ Zend\Di\DefinitionList,
+ Zend\Di\Di,
Zend\EventManager\StaticEventManager,
Zend\Module\Manager as ModuleManager,
Zend\Mvc\Application;
Zend\EventManager\StaticEventManager,
Zend\Module\Manager as ModuleManager,
Zend\Mvc\Application;
@@
-29,11
+30,8
@@
class Bootstrap
protected function setupLocator(Application $app)
{
protected function setupLocator(Application $app)
{
- $definition = new Definition\AggregateDefinition;
- $definition->addDefinition(new Definition\RuntimeDefinition);
-
- $di = new DependencyInjector;
- $di->setDefinition($definition);
+ $di = new Di;
+ $di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
$config = new Configuration($this->config->di);
$config->configure($di);
$config = new Configuration($this->config->di);
$config->configure($di);