Merge branch 'master' into acceptHandling

Conflicts:
	library/Zend/Http/Header/AbstractAccept.php
	library/Zend/Http/Header/AcceptEncoding.php
	library/Zend/Http/Header/AcceptLanguage.php
	tests/Zend/Http/Header/AcceptCharsetTest.php
	tests/Zend/Http/Header/AcceptEncodingTest.php
	tests/Zend/Http/Header/AcceptLanguageTest.php
	tests/Zend/Http/Header/AcceptTest.php

Author: Freeaqingme

src/AbstractContainer.php

@@ -15,6 +15,7 @@
 use RecursiveIteratorIterator;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * Zend_Navigation_Container
@@ -154,7 +155,7 @@ public function addPages($pages)
             );
         }
 
-        // Because adding a page to a container removes it from the original 
+        // Because adding a page to a container removes it from the original
         // (see {@link Page\AbstractPage::setParent()}), iteration of the
         // original container will break. As such, we need to iterate the
         // container into an array first.
@@ -237,7 +238,7 @@ public function removePages()
      * Checks if the container has the given page
      *
      * @param  Page\AbstractPage $page page to look for
-     * @param  bool $recursive [optional] whether to search recursively. 
+     * @param  bool $recursive [optional] whether to search recursively.
      *                         Default is false.
      * @return bool whether page is in 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]);
         }
 

src/Exception/BadMethodCallException.php

@@ -17,6 +17,6 @@
  * @package    Zend_Navigation
  * @subpackage Exception
  */
-class BadMethodCallException extends \BadMethodCallException implements 
+class BadMethodCallException extends \BadMethodCallException implements
     ExceptionInterface
 {}

src/Exception/InvalidArgumentException.php

@@ -17,6 +17,6 @@
  * @package    Zend_Navigation
  * @subpackage Exception
  */
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {}

src/Page/AbstractPage.php

@@ -643,15 +643,15 @@ public function getOrder()
     /**
      * Sets ACL resource assoicated with this page
      *
-     * @param  string|AclResource $resource [optional] resource to associate 
-     *                                      with page. Default is null, which 
+     * @param  string|AclResource $resource [optional] resource to associate
+     *                                      with page. Default is null, which
      *                                      sets no resource.
      * @return AbstractPage fluent interface, returns self
      * @throws Exception\InvalidArgumentException if $resource is invalid
      */
     public function setResource($resource = null)
     {
-        if (null === $resource 
+        if (null === $resource
             || is_string($resource)
             || $resource instanceof AclResource
         ) {
@@ -778,7 +778,7 @@ public function setVisible($visible = true)
      */
     public function isVisible($recursive = false)
     {
-        if ($recursive 
+        if ($recursive
             && isset($this->parent)
             && $this->parent instanceof self
         ) {
@@ -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);
     }

src/Service/AbstractNavigationFactory.php

@@ -94,9 +94,9 @@ protected function getPagesFromConfig($config = null)
                     $config
                 ));
             }
-        } else if ($config instanceof Config\Config) {
+        } elseif ($config instanceof Config\Config) {
             $config = $config->toArray();
-        } else if (!is_array($config)) {
+        } elseif (!is_array($config)) {
             throw new Exception\InvalidArgumentException('
                 Invalid input, expected array, filename, or Zend\Config object'
             );

test/NavigationTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Navigation;
+
 use Zend\Navigation\Page;
 
 /**

test/Page/PageTest.php

@@ -172,12 +172,12 @@ public function testSetAndGetFragmentIdentifier()
             'uri'                => '#',
             'fragment' => 'foo',
         ));
-        
+
         $this->assertEquals('foo', $page->getFragment());
-        
+
         $page->setFragment('bar');
         $this->assertEquals('bar', $page->getFragment());
-        
+
         $invalids = array(42, (object) null);
         foreach ($invalids as $invalid) {
             try {
@@ -716,7 +716,7 @@ public function testSetVisibleShouldJuggleValue()
 
         /**
          * ZF-10146
-         * 
+         *
          * @link http://framework.zend.com/issues/browse/ZF-10146
          */
         $page->setVisible('False');

test/Page/UriTest.php

@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Navigation\Page;
+
 use Zend\Navigation\Page;
 use Zend\Navigation;
 
@@ -95,15 +96,15 @@ public function testGetHref()
     public function testGetHrefWithFragmentIdentifier()
     {
         $uri = 'http://www.example.com/foo.html';
-        
+
         $page = new Page\Uri();
         $page->setUri($uri);
         $page->setFragment('bar');
-        
+
         $this->assertEquals($uri . '#bar', $page->getHref());
-        
+
         $page->setUri('#');
-        
+
         $this->assertEquals('#bar', $page->getHref());
     }
 }

test/TestAsset/FileNavigationFactory.php

@@ -10,7 +10,7 @@
 
 namespace ZendTest\Navigation\TestAsset;
 
-use \Zend\Navigation\Service\AbstractNavigationFactory;
+use Zend\Navigation\Service\AbstractNavigationFactory;
 
 class FileNavigationFactory extends AbstractNavigationFactory
 {