namespace Application;
use Zend\Config\Config,
- Zend\Di\Configuration,
- Zend\Di\Definition,
- Zend\Di\DefinitionList,
+ Zend\Di\Configuration as DiConfiguration,
Zend\Di\Di,
Zend\EventManager\StaticEventManager,
Zend\Module\Manager as ModuleManager,
protected function setupLocator(Application $app)
{
- $definition = new Definition\RuntimeDefinition;
- $definition->getIntrospectionStrategy()->setUseAnnotations(false);
- $di = new Di(new DefinitionList($definition), null, new Configuration($this->config->di));
+ $di = new Di;
$di->instanceManager()->addTypePreference('Zend\Di\Locator', $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);
}