Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · 0ba91ba · 0ba91ba
6 parents d2dd157 + 51b0320 + 24f498b + 6c759d8 + aabe1c0 + e76b67c
commit 0ba91ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
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]);
         }
 

diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -1103,7 +1103,7 @@ public function getCustomProperties()
      *
      * @return string  a hash code value for this page
      */
-    public final function hashCode()
+    final public function hashCode()
     {
         return spl_object_hash($this);
     }