Merge branch 'upstream/master' into module-class-map-cache

src/AbstractContainer.php

@@ -351,18 +351,16 @@ public function __call($method, $arguments)
     {
         ErrorHandler::start(E_WARNING);
         $result = preg_match('/(find(?:One|All)?By)(.+)/', $method, $match);
-        ErrorHandler::stop();
-        if ($result) {
-            return $this->{$match[1]}($match[2], $arguments[0]);
-        }
-
-        throw new Exception\BadMethodCallException(
-            sprintf(
+        $error  = ErrorHandler::stop();
+        if (!$result) {
+            throw new Exception\BadMethodCallException(sprintf(
                 'Bad method call: Unknown method %s::%s',
                 get_called_class(),
                 $method
-            )
-        );
+            ), 0, $error);
+        }
+        return $this->{$match[1]}($match[2], $arguments[0]);
+
     }
 
     /**

src/Page/AbstractPage.php

@@ -641,7 +641,7 @@ public function getOrder()
     }
 
     /**
-     * Sets ACL resource assoicated with this page
+     * Sets ACL resource associated with this page
      *
      * @param  string|AclResource $resource [optional] resource to associate
      *                                      with page. Default is null, which

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) {

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;
         }
 

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());