Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update mvc dependencies

zendframework/zend-console -> required
zendframework/zend-form -> optional
zendframework/zend-i18n -> optional
zendframework/zend-navigation -> optional
  • Loading branch information...
commit e31102f78181bc74476ccc4532e422c91870c3c7 1 parent 89eaf41
@alrik authored
View
2  library/Zend/Mvc/Service/RequestFactory.php
@@ -31,7 +31,7 @@ class RequestFactory implements FactoryInterface
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
- if (Console::isConsole()) {
+ if (class_exists("Zend\Console\Console") && Console::isConsole()) {
return new ConsoleRequest();
}
View
18 library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -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
View
1  library/Zend/Mvc/composer.json
@@ -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",
Please sign in to comment.
Something went wrong with that request. Please try again.