Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Hotfix/mvc dependency cleanup #2263

Merged
merged 3 commits into from

3 participants

@alrik

Update Mvc dependencies.

Some Mvc services depend on Zend\Console*.
Zend\Mvc\Service\ViewHelperManagerFactory threw exceptions if Zend\Form, Zend\I18n and/or Zend\Navigation was not present.
These defaultHelperMapClasses are optional now.

alrik added some commits
@alrik alrik update mvc dependencies
zendframework/zend-console -> required
zendframework/zend-form -> optional
zendframework/zend-i18n -> optional
zendframework/zend-navigation -> optional
e31102f
@alrik alrik revert part of last commit
c76b640
@travisbot

This pull request fails (merged c76b640 into 89eaf41).

@travisbot

This pull request fails (merged ea37572 into 89eaf41).

@weierophinney weierophinney merged commit ea37572 into from
@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney [#2263] Updated README
- Noted fix in ViewHelperManagerFactory
- Noted addition to composer.json for Zend\Mvc
bf30302
@weierophinney

Merged to 2.0.0, 2.0.1, and master.

@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney [#2263] Updated README
- Noted fix in ViewHelperManagerFactory
- Noted addition to composer.json for Zend\Mvc
dd6ca87
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 29, 2012
  1. @alrik

    update mvc dependencies

    alrik authored
    zendframework/zend-console -> required
    zendframework/zend-form -> optional
    zendframework/zend-i18n -> optional
    zendframework/zend-navigation -> optional
  2. @alrik

    revert part of last commit

    alrik authored
Commits on Aug 30, 2012
  1. @alrik

    fixes cs

    alrik authored
This page is out of date. Refresh to see the latest.
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",
Something went wrong with that request. Please try again.