Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Aug 13, 2012 · 2f43075 · 2f43075
commit 2f43075
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Service/AbstractNavigationFactory.php b/src/Service/AbstractNavigationFactory.php
@@ -113,7 +113,7 @@ protected function getPagesFromConfig($config = null)
      */
     protected function injectComponents(array $pages, RouteMatch $routeMatch = null, Router $router = null)
     {
-        foreach($pages as &$page) {
+        foreach ($pages as &$page) {
             $hasMvc = isset($page['action']) || isset($page['controller']) || isset($page['route']);
             if ($hasMvc) {
                 if (!isset($page['routeMatch']) && $routeMatch) {

diff --git a/test/Page/PageFactoryTest.php b/test/Page/PageFactoryTest.php
@@ -108,7 +108,7 @@ public function testShouldFailForInvalidType()
                 'type' => 'ZendTest\Navigation\TestAsset\InvalidPage',
                 'label' => 'My Invalid Page'
             ));
-        } catch(Navigation\Exception\InvalidArgumentException $e) {
+        } catch (Navigation\Exception\InvalidArgumentException $e) {
             return;
         }
 
@@ -124,7 +124,7 @@ public function testShouldFailForNonExistantType()
 
         try {
             $page = AbstractPage::factory($pageConfig);
-        } catch(Navigation\Exception\InvalidArgumentException $e) {
+        } catch (Navigation\Exception\InvalidArgumentException $e) {
             return;
         }
 
@@ -138,7 +138,7 @@ public function testShouldFailIfUnableToDetermineType()
             $page = AbstractPage::factory(array(
                 'label' => 'My Invalid Page'
             ));
-        } catch(Navigation\Exception\InvalidArgumentException $e) {
+        } catch (Navigation\Exception\InvalidArgumentException $e) {
             return;
         }
 

diff --git a/test/ServiceFactoryTest.php b/test/ServiceFactoryTest.php
@@ -120,7 +120,7 @@ public function testMvcPagesGetInjectedWithComponents()
         $container = $this->serviceManager->get('Navigation');
 
         $recursive = function($that, $pages) use (&$recursive) {
-            foreach($pages as $page) {
+            foreach ($pages as $page) {
                 if ($page instanceof MvcPage) {
                     $that->assertInstanceOf('Zend\Mvc\Router\RouteStackInterface', $page->getRouter());
                     $that->assertInstanceOf('Zend\Mvc\Router\RouteMatch', $page->getRouteMatch());