namespace Application;
use Zend\Config\Config,
- Zend\Di\Configuration,
- Zend\Di\Definition,
- Zend\Di\DependencyInjector,
+ Zend\Di\Configuration as DiConfiguration,
+ Zend\Di\Di,
Zend\EventManager\StaticEventManager,
Zend\Module\Manager as ModuleManager,
Zend\Mvc\Application;
protected function setupLocator(Application $app)
{
- $definition = new Definition\AggregateDefinition;
- $definition->addDefinition(new Definition\RuntimeDefinition);
+ $di = new Di;
+ $di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
- $di = new DependencyInjector;
- $di->setDefinition($definition);
-
- $config = new Configuration($this->config->di);
+ $config = new DiConfiguration($this->config->di);
$config->configure($di);
$app->setLocator($di);
protected function setupRoutes(Application $app)
{
$router = $app->getLocator()->get('Zend\Mvc\Router\SimpleRouteStack');
- foreach ($this->config->routes as $name => $config) {
- $class = $config->type;
- $options = $config->options;
- $route = new $class($options);
- $router->addRoute($name, $route);
- }
+ $router->addRoutes($this->config->routes->toArray());
$app->setRouter($router);
}