Hotfix/mvc dependency cleanup #2263

Merged
merged 3 commits into from Aug 30, 2012
@@ -51,17 +51,17 @@ public function createService(ServiceLocatorInterface $serviceLocator)
foreach ($this->defaultHelperMapClasses as $configClass) {
if (is_string($configClass) && class_exists($configClass)) {
$config = new $configClass;
- }
- if (!$config instanceof ConfigInterface) {
- throw new Exception\RuntimeException(sprintf(
- 'Invalid service manager configuration class provided; received "%s", expected class implementing %s',
- $configClass,
- 'Zend\ServiceManager\ConfigInterface'
- ));
- }
+ if (!$config instanceof ConfigInterface) {
+ throw new Exception\RuntimeException(sprintf(
+ 'Invalid service manager configuration class provided; received "%s", expected class implementing %s',
+ $configClass,
+ 'Zend\ServiceManager\ConfigInterface'
+ ));
+ }
- $config->configureServiceManager($plugins);
+ $config->configureServiceManager($plugins);
+ }
}
// Configure URL view helper with router
@@ -14,6 +14,7 @@
"target-dir": "Zend/Mvc",
"require": {
"php": ">=5.3.3",
+ "zendframework/zend-console": "self.version",
"zendframework/zend-di": "self.version",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-modulemanager": "self.version",