[zendframework/zendframework#2210] Pass ErrorHandler::stop() result a…

…s previous exception

- Per @mark-mabe
- Any place where an exception is throw immediately following an
  ErrorHandler::stop() call should pass the result of that call as the previous
  exception.

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]);
+
     }
 
     /**