Merge remote-tracking branch 'weierophinney/feature/error-suppression…

…-removal'
zendframework · Jul 13, 2012 · 24f498b · 24f498b
5 parents 6c759d8 + d2dd157 + 51b0320 + aabe1c0 + 8bc9348
commit 24f498b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php
@@ -15,6 +15,7 @@
 use RecursiveIteratorIterator;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * Zend_Navigation_Container
@@ -348,7 +349,10 @@ public function findBy($property, $value, $all = false)
      */
     public function __call($method, $arguments)
     {
-        if (@preg_match('/(find(?:One|All)?By)(.+)/', $method, $match)) {
+        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]);
         }