- Per updates to zf2 master, no need to explicitly disable annotations in the
runtime configuration for DI
-Subproject commit 31831f1865398750695fae11a919b396add4ae5d
+Subproject commit b3fac727842db9a839fee9199c8cf61ccbc43ce8
'Zend\View\PhpRenderer' => array(
'parameters' => array(
- 'resolver' => 'Zend\View\TemplatePathStack',
- 'options' => array(
- 'script_paths' => array(
- 'application' => __DIR__ . '/../views',
- ),
+ 'resolver' => 'Zend\View\TemplatePathStack',
+ 'options' => array(
+ 'script_paths' => array(
+ 'application' => __DIR__ . '/../views',
),
+ ),
'broker' => 'Zend\View\HelperBroker',
),
),
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 Configuration($this->config->di);
+ $config->configure($di);
+
$app->setLocator($di);
}