Bring milestones/exceptions up-to-date with zf2/master

Merge branch 'zf2/master' into milestones/exceptions Conflicts: library/Zend/Amf/Parser/TypeLoader.php library/Zend/Amf/Server.php library/Zend/Application/AbstractBootstrap.php library/Zend/File/Transfer/Adapter/AbstractAdapter.php library/Zend/Filter/Inflector.php library/Zend/Filter/InputFilter.php library/Zend/Filter/StaticFilter.php library/Zend/Form/Element.php library/Zend/Form/Element/File.php library/Zend/InfoCard/XML/Security/Transform/Exception.php library/Zend/Navigation/Page/Mvc.php library/Zend/Paginator/Paginator.php library/Zend/Search/Lucene/Document/Exception.php library/Zend/Serializer/Adapter/Amf0.php library/Zend/Serializer/Adapter/Amf3.php library/Zend/Serializer/Exception.php library/Zend/Serializer/Serializer.php library/Zend/Service/Amazon/Ec2/AbstractService.php library/Zend/Tag/Cloud.php library/Zend/Tag/Cloud/Decorator/Exception.php library/Zend/Tag/Cloud/Decorator/HtmlTag.php library/Zend/Test/PHPUnit/ControllerTestCase.php library/Zend/Validator/StaticValidator.php library/Zend/Wildfire/Protocol/Exception.php library/Zend/Wildfire/Protocol/Exception/InvalidArgumentException.php tests/Zend/Application/AbstractBootstrapTest.php tests/Zend/Filter/InputTest.php tests/Zend/Filter/StaticFilterTest.php tests/Zend/Form/ElementTest.php tests/Zend/Form/FormTest.php tests/Zend/Paginator/PaginatorTest.php tests/Zend/Serializer/SerializerTest.php tests/Zend/Tag/Cloud/CloudTest.php tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php tests/Zend/Translate/Adapter/XmlTmTest.php
zendframework · Oct 30, 2010 · 8c442a3 · 8c442a3
13 parents 29be330 + eae6146 + 1cc7a46 + 1d9542f + a22d6e2 + 3496b67 + 9398e77 + 687d980 + 900dc7d + 21f6363 + 450e488 + 24626f5 + adf1f8e
commit 8c442a3
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 28 deletions.
diff --git a/src/AbstractPage.php b/src/AbstractPage.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Container.php b/src/Container.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Navigation.php b/src/Navigation.php
@@ -16,7 +16,6 @@
  * @package   Zend_Navigation
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Page/Mvc.php b/src/Page/Mvc.php
@@ -17,7 +17,6 @@
  * @subpackage Page
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,16 +25,13 @@
 namespace Zend\Navigation\Page;
 
 use Zend\Navigation\AbstractPage,
-    Zend\Navigation\Exception\InvalidArgumentException;
+    Zend\Navigation\Exception\InvalidArgumentException,
+    Zend\Controller\Front as FrontController;
 
 /**
  * Represents a page that is defined using module, controller, action, route
  * name and route params to assemble the href
  *
- * @uses       \Zend\Controller\Action\HelperBroker
- * @uses       \Zend\Controller\Front
- * @uses       \Zend\Navigation\InvalidArgumentException
- * @uses       \Zend\Navigation\Page\Page
  * @category   Zend
  * @package    Zend_Navigation
  * @subpackage Page
@@ -124,7 +120,7 @@ class Mvc extends AbstractPage
     public function isActive($recursive = false)
     {
         if (!$this->_active) {
-            $front = \Zend\Controller\Front::getInstance();
+            $front = FrontController::getInstance();
             $reqParams = $front->getRequest()->getParams();
 
             if (!array_key_exists('module', $reqParams)) {
@@ -176,8 +172,9 @@ public function getHref()
         }
 
         if (null === self::$_urlHelper) {
-            self::$_urlHelper =
-                \Zend\Controller\Action\HelperBroker::getStaticHelper('url');
+            $front  = FrontController::getInstance();
+            $broker = $front->getHelperBroker();
+            self::$_urlHelper = $broker->load('url');
         }
 
         $params = $this->getParams();

diff --git a/src/Page/Uri.php b/src/Page/Uri.php
@@ -17,7 +17,6 @@
  * @subpackage Page
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/NavigationTest.php b/test/NavigationTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
  */
 
 /**

diff --git a/test/Page/MvcTest.php b/test/Page/MvcTest.php
@@ -17,16 +17,17 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace ZendTest\Navigation\Page;
-use Zend\Controller\Request;
-use Zend\Navigation\Page;
-use Zend\Navigation;
+
+use Zend\Controller\Front as FrontController,
+    Zend\Controller\Request,
+    Zend\Navigation\Page,
+    Zend\Navigation;
 
 /**
  * Tests the class Zend_Navigation_Page_Mvc
@@ -359,7 +360,8 @@ public function testSpecifyingAnotherUrlHelperToGenerateHrefs()
         $expected = \ZendTest\Navigation\TestAsset\UrlHelper::RETURN_URL;
         $actual = $page->getHref();
 
-        $old = \Zend\Controller\Action\HelperBroker::getStaticHelper('URL');
+        $front = FrontController::getInstance();
+        $old = $front->getHelperBroker()->load('URL');
         Page\Mvc::setUrlHelper($old);
 
         $this->assertEquals($expected, $actual);

diff --git a/test/Page/UriTest.php b/test/Page/UriTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PageFactoryTest.php b/test/PageFactoryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PageTest.php b/test/PageTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/Container.php b/test/TestAsset/Container.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/InvalidPage.php b/test/TestAsset/InvalidPage.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/Page.php b/test/TestAsset/Page.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/TestAsset/UrlHelper.php b/test/TestAsset/UrlHelper.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**