- Change ZF2 submodule to use git.zendframework.com to keep up to date better
- Change bootstrapping and Di config strategy slightly to account for Ralph's
Zend\Di and Zend\Code changes
[submodule "library/ZendFramework"]
path = library/ZendFramework
[submodule "library/ZendFramework"]
path = library/ZendFramework
- url = git://github.com/zendframework/zf2.git
+ url = git://git.zendframework.com/zf.git
-Subproject commit 33edf4c5cd373fe8150b1d2b5245eca095a77825
+Subproject commit 31831f1865398750695fae11a919b396add4ae5d
),
'Zend\View\PhpRenderer' => array(
),
'Zend\View\PhpRenderer' => array(
- 'methods' => array(
- 'setResolver' => 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',
),
),
- ),
- ),
- 'parameters' => array(
'broker' => 'Zend\View\HelperBroker',
),
),
'broker' => 'Zend\View\HelperBroker',
),
),
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;
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);
-
- $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);