Merge branch 'hotfix/#6506-missing-zend-form-dependency-in-zend-mvc' …

…into develop Forward port #6506
zendframework · Aug 6, 2014 · 85da9a8 · 85da9a8
2 parents 0725016 + d0ea153
commit 85da9a8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/library/Zend/Mvc/composer.json b/library/Zend/Mvc/composer.json
@@ -17,14 +17,14 @@
         "php": ">=5.3.23",
         "zendframework/zend-eventmanager": "self.version",
         "zendframework/zend-servicemanager": "self.version",
+        "zendframework/zend-form": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {
         "zendframework/zend-authentication": "self.version",
         "zendframework/zend-console": "self.version",
         "zendframework/zend-di": "self.version",
         "zendframework/zend-filter": "self.version",
-        "zendframework/zend-form": "self.version",
         "zendframework/zend-http": "self.version",
         "zendframework/zend-i18n": "self.version",
         "zendframework/zend-inputfilter": "self.version",
@@ -45,7 +45,6 @@
         "zendframework/zend-console": "Zend\\Console component",
         "zendframework/zend-di": "Zend\\Di component",
         "zendframework/zend-filter": "Zend\\Filter component",
-        "zendframework/zend-form": "Zend\\Form component",
         "zendframework/zend-http": "Zend\\Http component",
         "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
         "zendframework/zend-inputfilter": "Zend\\Inputfilter component",