[submodule "library/ZendFramework"]
path = library/ZendFramework
- url = git://github.com/zendframework/zf2.git
+ url = git://git.zendframework.com/zf.git
),
'Zend\View\PhpRenderer' => array(
- 'methods' => array(
- 'setResolver' => array(
+ 'parameters' => array(
'resolver' => 'Zend\View\TemplatePathStack',
'options' => array(
'script_paths' => array(
'application' => __DIR__ . '/../views',
),
),
- ),
- ),
- 'parameters' => array(
'broker' => 'Zend\View\HelperBroker',
),
),
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;
protected function setupLocator(Application $app)
{
- $definition = new Definition\AggregateDefinition;
- $definition->addDefinition(new Definition\RuntimeDefinition);
-
- $di = new DependencyInjector;
- $di->setDefinition($definition);
-
- $config = new Configuration($this->config->di);
- $config->configure($di);
-
+ $definition = new Definition\RuntimeDefinition;
+ $definition->getIntrospectionStrategy()->setUseAnnotations(false);
+ $di = new Di(new DefinitionList($definition), null, new Configuration($this->config->di));
+ $di->instanceManager()->addTypePreference('Zend\Di\Locator', $di);
$app->setLocator($di);
}