tweet_live: comparison web/lib/Zend/Test/PHPUnit/ControllerTestCase.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Test
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: ControllerTestCase.php 24593 2012-01-05 20:35:02Z matthew $
+* @version    $Id$
 */
-/** @see PHPUnit_Runner_Version */
-require_once 'PHPUnit/Runner/Version.php';
-/**
-* Depending on version, include the proper PHPUnit support
-* @see PHPUnit_Autoload
-*/
-require_once (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '>=')) ? 'PHPUnit/Autoload.php' : 'PHPUnit/Framework.php';
 /** @see Zend_Controller_Front */
 require_once 'Zend/Controller/Front.php';
 /** @see Zend_Controller_Action_HelperBroker */
 *
 * @uses       PHPUnit_Framework_TestCase
 * @category   Zend
 * @package    Zend_Test
 * @subpackage PHPUnit
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_TestCase
 {
 /**
 /**
 * Overloading: prevent overloading to special properties
 *
 * @param  string $name
-* @param  mixed $value
+* @param  mixed  $value
-* @return void
+* @throws Zend_Exception
 */
 public function __set($name, $value)
 {
 if (in_array($name, array('request', 'response', 'frontController'))) {
 require_once 'Zend/Exception.php';
 /**
 * Overloading for common properties
 *
 * Provides overloading for request, response, and frontController objects.
 *
-* @param mixed $name
+* @param  mixed $name
-* @return void
+* @return null|Zend_Controller_Front|Zend_Controller_Request_HttpTestCase|Zend_Controller_Response_HttpTestCase
 */
 public function __get($name)
 {
 switch ($name) {
 case 'request':
 /**
 * Set up MVC app
 *
 * Calls {@link bootstrap()} by default
-*
-* @return void
 */
 protected function setUp()
 {
 $this->bootstrap();
 }
 * Resets the front controller, and then bootstraps it.
 *
 * If {@link $bootstrap} is a callback, executes it; if it is a file, it include's
 * it. When done, sets the test case request and response objects into the
 * front controller.
-*
-* @return void
 */
 final public function bootstrap()
 {
 $this->reset();
 if (null !== $this->bootstrap) {
 * If a URL is provided, sets it as the request URI in the request object.
 * Then sets test case request and response objects in front controller,
 * disables throwing exceptions, and disables returning the response.
 * Finally, dispatches the front controller.
 *
-* @param  string|null $url
+* @param string|null $url
-* @return void
 */
 public function dispatch($url = null)
 {
 // redirector should not exit
 $redirector = Zend_Controller_Action_HelperBroker::getStaticHelper('redirector');
 *
 * Creates new request/response objects, resets the front controller
 * instance, and resets the action helper broker.
 *
 * @todo   Need to update Zend_Layout to add a resetInstance() method
-* @return void
 */
 public function reset()
 {
 $_SESSION = array();
 $_GET     = array();
 Zend_Session::$_unitTestEnabled = true;
 }
 /**
 * Rest all view placeholders
-*
-* @return void
 */
 protected function _resetPlaceholders()
 {
 $registry = Zend_Registry::getInstance();
 $remove   = array();
 }
 /**
 * Assert against DOM selection
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertQuery($path, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotQuery($path, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; node should contain content
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $match content that should be contained in matched nodes
+* @param string $match content that should be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertQueryContentContains($path, $match, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; node should NOT contain content
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $match content that should NOT be contained in matched nodes
+* @param string $match content that should NOT be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotQueryContentContains($path, $match, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; node should match content
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $pattern Pattern that should be contained in matched nodes
+* @param string $pattern Pattern that should be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertQueryContentRegex($path, $pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; node should NOT match content
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $pattern pattern that should NOT be contained in matched nodes
+* @param string $pattern pattern that should NOT be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotQueryContentRegex($path, $pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; should contain exact number of nodes
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $count Number of nodes that should match
+* @param string $count Number of nodes that should match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertQueryCount($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; should NOT contain exact number of nodes
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $count Number of nodes that should NOT match
+* @param string $count Number of nodes that should NOT match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotQueryCount($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; should contain at least this number of nodes
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $count Minimum number of nodes that should match
+* @param string $count Minimum number of nodes that should match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertQueryCountMin($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against DOM selection; should contain no more than this number of nodes
 *
-* @param  string $path CSS selector path
+* @param string $path CSS selector path
-* @param  string $count Maximum number of nodes that should match
+* @param string $count Maximum number of nodes that should match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertQueryCountMax($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Register XPath namespaces
 *
-* @param   array $xpathNamespaces
+* @param array $xpathNamespaces
-* @return  void
 */
 public function registerXpathNamespaces($xpathNamespaces)
 {
 $this->_xpathNamespaces = $xpathNamespaces;
 }
 /**
 * Assert against XPath selection
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertXpath($path, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotXpath($path, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; node should contain content
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $match content that should be contained in matched nodes
+* @param string $match content that should be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertXpathContentContains($path, $match, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; node should NOT contain content
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $match content that should NOT be contained in matched nodes
+* @param string $match content that should NOT be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotXpathContentContains($path, $match, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; node should match content
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $pattern Pattern that should be contained in matched nodes
+* @param string $pattern Pattern that should be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertXpathContentRegex($path, $pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; node should NOT match content
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $pattern pattern that should NOT be contained in matched nodes
+* @param string $pattern pattern that should NOT be contained in matched nodes
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotXpathContentRegex($path, $pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; should contain exact number of nodes
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $count Number of nodes that should match
+* @param string $count Number of nodes that should match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertXpathCount($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; should NOT contain exact number of nodes
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $count Number of nodes that should NOT match
+* @param string $count Number of nodes that should NOT match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotXpathCount($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; should contain at least this number of nodes
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $count Minimum number of nodes that should match
+* @param string $count Minimum number of nodes that should match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertXpathCountMin($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert against XPath selection; should contain no more than this number of nodes
 *
-* @param  string $path XPath path
+* @param string $path XPath path
-* @param  string $count Maximum number of nodes that should match
+* @param string $count Maximum number of nodes that should match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertXpathCountMax($path, $count, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
 }
 /**
 * Assert that response is a redirect
 *
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertRedirect($message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
 }
 /**
 * Assert that response is NOT a redirect
 *
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotRedirect($message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
 }
 /**
 * Assert that response redirects to given URL
 *
-* @param  string $url
+* @param string $url
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertRedirectTo($url, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
 }
 /**
 * Assert that response does not redirect to given URL
 *
-* @param  string $url
+* @param string $url
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotRedirectTo($url, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
 }
 /**
 * Assert that redirect location matches pattern
 *
-* @param  string $pattern
+* @param string $pattern
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertRedirectRegex($pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
 }
 /**
 * Assert that redirect location does not match pattern
 *
-* @param  string $pattern
+* @param string $pattern
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotRedirectRegex($pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
 }
 /**
 * Assert response code
 *
-* @param  int $code
+* @param int $code
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertResponseCode($code, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response code
 *
-* @param  int $code
+* @param int $code
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotResponseCode($code, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response header exists
 *
-* @param  string $header
+* @param string $header
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertHeader($header, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response header does not exist
 *
-* @param  string $header
+* @param string $header
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotHeader($header, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response header exists and contains the given string
 *
-* @param  string $header
+* @param string $header
-* @param  string $match
+* @param string $match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertHeaderContains($header, $match, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response header does not exist and/or does not contain the given string
 *
-* @param  string $header
+* @param string $header
-* @param  string $match
+* @param string $match
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotHeaderContains($header, $match, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response header exists and matches the given pattern
 *
-* @param  string $header
+* @param string $header
-* @param  string $pattern
+* @param string $pattern
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertHeaderRegex($header, $pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert response header does not exist and/or does not match the given regex
 *
-* @param  string $header
+* @param string $header
-* @param  string $pattern
+* @param string $pattern
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotHeaderRegex($header, $pattern, $message = '')
 {
 $this->_incrementAssertionCount();
 require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
 }
 /**
 * Assert that the last handled request used the given module
 *
-* @param  string $module
+* @param string $module
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertModule($module, $message = '')
 {
 $this->_incrementAssertionCount();
 if ($module != $this->request->getModuleName()) {
 }
 /**
 * Assert that the last handled request did NOT use the given module
 *
-* @param  string $module
+* @param string $module
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotModule($module, $message = '')
 {
 $this->_incrementAssertionCount();
 if ($module == $this->request->getModuleName()) {
 }
 /**
 * Assert that the last handled request used the given controller
 *
-* @param  string $controller
+* @param string $controller
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertController($controller, $message = '')
 {
 $this->_incrementAssertionCount();
 if ($controller != $this->request->getControllerName()) {
 /**
 * Assert that the last handled request did NOT use the given controller
 *
 * @param  string $controller
 * @param  string $message
-* @return void
 */
 public function assertNotController($controller, $message = '')
 {
 $this->_incrementAssertionCount();
 if ($controller == $this->request->getControllerName()) {
 }
 /**
 * Assert that the last handled request used the given action
 *
-* @param  string $action
+* @param string $action
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertAction($action, $message = '')
 {
 $this->_incrementAssertionCount();
 if ($action != $this->request->getActionName()) {
 }
 /**
 * Assert that the last handled request did NOT use the given action
 *
-* @param  string $action
+* @param string $action
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotAction($action, $message = '')
 {
 $this->_incrementAssertionCount();
 if ($action == $this->request->getActionName()) {
 }
 /**
 * Assert that the specified route was used
 *
-* @param  string $route
+* @param string $route
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertRoute($route, $message = '')
 {
 $this->_incrementAssertionCount();
 $router = $this->frontController->getRouter();
 }
 /**
 * Assert that the route matched is NOT as specified
 *
-* @param  string $route
+* @param string $route
-* @param  string $message
+* @param string $message
-* @return void
 */
 public function assertNotRoute($route, $message = '')
 {
 $this->_incrementAssertionCount();
 $router = $this->frontController->getRouter();
 require_once 'Zend/Dom/Query.php';
 $this->_query = new Zend_Dom_Query;
 }
 return $this->_query;
 }
 /**
 * URL Helper
 *
-* @param array $urlOptions
+* @param  array  $urlOptions
-* @param string $name
+* @param  string $name
-* @param bool $reset
+* @param  bool   $reset
-* @param bool $encode
+* @param  bool   $encode
+* @throws Exception
+* @throws Zend_Controller_Router_Exception
+* @return string
 */
 public function url($urlOptions = array(), $name = null, $reset = false, $encode = true)
 {
 $frontController = $this->getFrontController();
 $router = $frontController->getRouter();
 if (count($router->getRoutes()) == 0) {
 $router->addDefaultRoutes();
 }
 return $router->assemble($urlOptions, $name, $reset, $encode);
 }
+/**
+* Urlize options
+*
+* @param  array $urlOptions
+* @param  bool  $actionControllerModuleOnly
+* @return mixed
+*/
 public function urlizeOptions($urlOptions, $actionControllerModuleOnly = true)
 {
 $ccToDash = new Zend_Filter_Word_CamelCaseToDash();
 foreach ($urlOptions as $n => $v) {
 if (in_array($n, array('action', 'controller', 'module'))) {
 return $urlOptions;
 }
 /**
 * Increment assertion count
-*
-* @return void
 */
 protected function _incrementAssertionCount()
 {
 $stack = debug_backtrace();
-foreach (debug_backtrace() as $step) {
+foreach ($stack as $step) {
 if (isset($step['object'])
 && $step['object'] instanceof PHPUnit_Framework_TestCase
 ) {
 if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', 'lt')) {
 break;

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd