Merge branch 'hotfix/3130' into develop

Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

src/View/HelperConfig.php

@@ -35,7 +35,7 @@ class HelperConfig implements ConfigInterface
      */
     public function configureServiceManager(ServiceManager $serviceManager)
     {
-        $serviceManager->setFactory('navigation', function(HelperPluginManager $pm) {
+        $serviceManager->setFactory('navigation', function (HelperPluginManager $pm) {
             $helper = new \Zend\View\Helper\Navigation;
             $helper->setServiceLocator($pm->getServiceLocator());
             return $helper;

test/ServiceFactoryTest.php

@@ -48,7 +48,7 @@ protected function setUp()
                 'extra_config'         => array(
                     'service_manager' => array(
                         'factories' => array(
-                            'Config' => function() {
+                            'Config' => function () {
                                 return array(
                                     'navigation' => array(
                                         'file'    => __DIR__ . '/_files/navigation.xml',
@@ -119,7 +119,7 @@ public function testMvcPagesGetInjectedWithComponents()
         $this->serviceManager->setFactory('Navigation', 'Zend\Navigation\Service\DefaultNavigationFactory');
         $container = $this->serviceManager->get('Navigation');
 
-        $recursive = function($that, $pages) use (&$recursive) {
+        $recursive = function ($that, $pages) use (&$recursive) {
             foreach ($pages as $page) {
                 if ($page instanceof MvcPage) {
                     $that->assertInstanceOf('Zend\Mvc\Router\RouteStackInterface', $page->getRouter());