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 · 1694b28 · 1694b28
10 parents 6c32ff0 + b37dc0b + a729860 + a4b177e + 5e10b10 + 0db5f75 + bcb7bb1 + f7074c9 + 7529e8f + 76de94f
commit 1694b28
Show file tree

Hide file tree

Showing 44 changed files with 36 additions and 80 deletions.
diff --git a/src/DbAdapter.php b/src/DbAdapter.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/DbStatement.php b/src/DbStatement.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Constraint/DomQuery.php b/src/PHPUnit/Constraint/DomQuery.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Constraint/Exception.php b/src/PHPUnit/Constraint/Exception.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Constraint/Redirect.php b/src/PHPUnit/Constraint/Redirect.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Constraint/ResponseHeader.php b/src/PHPUnit/Constraint/ResponseHeader.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/ControllerTestCase.php b/src/PHPUnit/ControllerTestCase.php
@@ -16,7 +16,6 @@
  * @package    Zend_Test
  * @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$
  */
 
 /**
@@ -25,28 +24,13 @@
 namespace Zend\Test\PHPUnit;
 
 use Zend\Application,
-	Zend\Controller\Action\HelperBroker,
+    Zend\Controller\Front as FrontController,
 	Zend\Controller\Request,
 	Zend\Test\PHPUnit\Exception\InvalidArgumentException;
 
 /**
  * Functional testing scaffold for MVC applications
  *
- * @uses       PHPUnit_Framework_TestCase
- * @uses       PHPUnit_Runner_Version
- * @uses       \Zend\Controller\Action\HelperBroker
- * @uses       \Zend\Controller\Front
- * @uses       \Zend\Controller\Request\HttpTestCase
- * @uses       \Zend\Controller\Response\HttpTestCase
- * @uses       \Zend\Dom\Query
- * @uses       \Zend\Test\PHPUnit\Exception\InvalidArgumentException
- * @uses       \Zend\Layout\Layout
- * @uses       \Zend\Loader
- * @uses       \Zend\Registry
- * @uses       \Zend\Session\Manager
- * @uses       \Zend\Test\PHPUnit\Constraint\DomQuery
- * @uses       \Zend\Test\PHPUnit\Constraint\Redirect
- * @uses       \Zend\Test\PHPUnit\Constraint\ResponseHeader
  * @category   Zend
  * @package    Zend_Test
  * @subpackage PHPUnit
@@ -179,12 +163,15 @@ final public function bootstrap()
      */
     public function dispatch($url = null)
     {
+        $controller   = $this->getFrontController();
+        $helperBroker = $controller->getHelperBroker();
+
         // redirector should not exit
-        $redirector = HelperBroker::getStaticHelper('redirector');
+        $redirector = $helperBroker->load('redirector');
         $redirector->setExit(false);
 
         // json helper should not exit
-        $json = HelperBroker::getStaticHelper('json');
+        $json = $helperBroker->load('json');
         $json->suppressExit = true;
 
         $request    = $this->getRequest();
@@ -193,17 +180,15 @@ public function dispatch($url = null)
         }
         $request->setPathInfo(null);
 
-        $controller = $this->getFrontController();
-        $this->frontController
-             ->setRequest($request)
-             ->setResponse($this->getResponse())
-             ->throwExceptions(false)
-             ->returnResponse(false);
+        $controller->setRequest($request)
+                   ->setResponse($this->getResponse())
+                   ->throwExceptions(false)
+                   ->returnResponse(false);
 
         if ($this->bootstrap instanceof Application\Application) {
             $this->bootstrap->run();
         } else {
-            $this->frontController->dispatch();
+            $controller->dispatch();
         }
     }
 
@@ -225,9 +210,7 @@ public function reset()
         $this->resetRequest();
         $this->resetResponse();
         \Zend\Layout\Layout::resetMvcInstance();
-        HelperBroker::resetHelpers();
         $this->frontController->resetInstance();
-        //\Zend\Session\Manager::$_unitTestEnabled = true;
     }
 
     /**

diff --git a/src/PHPUnit/DatabaseTestCase.php b/src/PHPUnit/DatabaseTestCase.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/Connection.php b/src/PHPUnit/Db/Connection.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/DataSet/DbRowset.php b/src/PHPUnit/Db/DataSet/DbRowset.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/DataSet/DbTable.php b/src/PHPUnit/Db/DataSet/DbTable.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/DataSet/DbTableDataSet.php b/src/PHPUnit/Db/DataSet/DbTableDataSet.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/DataSet/QueryDataSet.php b/src/PHPUnit/Db/DataSet/QueryDataSet.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/DataSet/QueryTable.php b/src/PHPUnit/Db/DataSet/QueryTable.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/Exception.php b/src/PHPUnit/Db/Exception.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/Metadata/Generic.php b/src/PHPUnit/Db/Metadata/Generic.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/Operation/DeleteAll.php b/src/PHPUnit/Db/Operation/DeleteAll.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/Operation/Insert.php b/src/PHPUnit/Db/Operation/Insert.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/Operation/Truncate.php b/src/PHPUnit/Db/Operation/Truncate.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/PHPUnit/Db/SimpleTester.php b/src/PHPUnit/Db/SimpleTester.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @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/DbAdapterTest.php b/test/DbAdapterTest.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/DbStatementTest.php b/test/DbStatementTest.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/PHPUnit/Constraint/DomQueryTest.php b/test/PHPUnit/Constraint/DomQueryTest.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/PHPUnit/ControllerTestCaseTest.php b/test/PHPUnit/ControllerTestCaseTest.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$
  */
 
 /**
@@ -26,7 +25,7 @@
 namespace ZendTest\Test\PHPUnit;
 use Zend\Application,
     Zend\Controller,
-    Zend\Controller\Action\HelperBroker,
+    Zend\Controller\Front as FrontController,
     Zend\Controller\Dispatcher,
     Zend\Controller\Plugin,
     Zend\Controller\Request,
@@ -197,14 +196,19 @@ public function testResetShouldResetMvcState()
                    ->registerPlugin($plugin)
                    ->setRouter($router)
                    ->setDispatcher($dispatcher);
-        $viewRenderer = HelperBroker::getStaticHelper('ViewRenderer');
+
+        $broker       = $controller->getHelperBroker();
+        $viewRenderer = $broker->load('ViewRenderer');
+
         $this->testCase->reset();
         $test = $controller->getRouter();
         $this->assertNotSame($router, $test);
         $test = $controller->getDispatcher();
         $this->assertNotSame($dispatcher, $test);
         $this->assertFalse($controller->getPlugin('Zend\Controller\Plugin\ErrorHandler'));
-        $test = HelperBroker::getStaticHelper('ViewRenderer');
+
+        $broker = $controller->getHelperBroker();
+        $test   = $broker->load('ViewRenderer');
         $this->assertNotSame($viewRenderer, $test);
         $this->assertNull($controller->getRequest());
         $this->assertNull($controller->getResponse());
@@ -227,21 +231,23 @@ public function testBootstrapShouldIncludeBootstrapFileSpecifiedInPublicBootstra
         $this->testCase->bootstrap = __DIR__ . '/_files/bootstrap.php';
         $this->testCase->bootstrap();
         $controller = $this->testCase->getFrontController();
+        $broker     = $controller->getHelperBroker();
         $this->assertSame(Registry::get('router'), $controller->getRouter());
         $this->assertSame(Registry::get('dispatcher'), $controller->getDispatcher());
         $this->assertSame(Registry::get('plugin'), $controller->getPlugin('Zend\Controller\Plugin\ErrorHandler'));
-        $this->assertSame(Registry::get('viewRenderer'), HelperBroker::getStaticHelper('ViewRenderer'));
+        $this->assertSame(Registry::get('viewRenderer'), $broker->load('ViewRenderer'));
     }
 
     public function testBootstrapShouldInvokeCallbackSpecifiedInPublicBootstrapProperty()
     {
         $this->testCase->bootstrap = array($this, 'bootstrapCallback');
         $this->testCase->bootstrap();
         $controller = $this->testCase->getFrontController();
+        $broker     = $controller->getHelperBroker();
         $this->assertSame(Registry::get('router'), $controller->getRouter());
         $this->assertSame(Registry::get('dispatcher'), $controller->getDispatcher());
         $this->assertSame(Registry::get('plugin'), $controller->getPlugin('Zend\Controller\Plugin\ErrorHandler'));
-        $this->assertSame(Registry::get('viewRenderer'), HelperBroker::getStaticHelper('ViewRenderer'));
+        $this->assertSame(Registry::get('viewRenderer'), $broker->load('ViewRenderer'));
     }
 
     public function bootstrapCallback()
@@ -254,7 +260,10 @@ public function bootstrapCallback()
                    ->registerPlugin($plugin)
                    ->setRouter($router)
                    ->setDispatcher($dispatcher);
-        $viewRenderer = HelperBroker::getStaticHelper('ViewRenderer');
+
+        $broker       = $controller->getHelperBroker();
+        $viewRenderer = $broker->load('ViewRenderer');
+
         Registry::set('router', $router);
         Registry::set('dispatcher', $dispatcher);
         Registry::set('plugin', $plugin);
@@ -623,10 +632,15 @@ public function testResetRequestShouldClearRequestObject()
         $this->assertNotSame($request, $test);
     }
 
+    /**
+     * Disabled until view and dojo API are solidified
+     * @group disable
+     */
     public function testResetResponseShouldClearAllViewPlaceholders()
     {
-        $this->testCase->getFrontController()->setControllerDirectory(__DIR__ . '/_files/application/controllers');
-        $viewRenderer = HelperBroker::getStaticHelper('viewRenderer');
+        $controller = $this->testCase->getFrontController();
+        $controller->setControllerDirectory(__DIR__ . '/_files/application/controllers');
+        $viewRenderer = $controller->getHelperBroker()->load('viewRenderer');
         $viewRenderer->initView();
         $view = $viewRenderer->view;
         $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend\Dojo\View\Helper');

diff --git a/test/PHPUnit/Db/ConnectionTest.php b/test/PHPUnit/Db/ConnectionTest.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/PHPUnit/Db/DataSet/DataSetTestCase.php b/test/PHPUnit/Db/DataSet/DataSetTestCase.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/PHPUnit/Db/DataSet/DbRowsetTest.php b/test/PHPUnit/Db/DataSet/DbRowsetTest.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/PHPUnit/Db/DataSet/DbTableDataSetTest.php b/test/PHPUnit/Db/DataSet/DbTableDataSetTest.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/PHPUnit/Db/DataSet/DbTableTest.php b/test/PHPUnit/Db/DataSet/DbTableTest.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$
  */
 
 /**