diff -r 2251fb41dbc7 -r 1e110b03ae96 web/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader.php --- a/web/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader.php Sun Apr 21 10:07:03 2013 +0200 +++ b/web/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader.php Sun Apr 21 21:54:24 2013 +0200 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResponseHeader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResponseHeader.php 25205 2013-01-10 11:23:25Z frosch $ */ /** @see PHPUnit_Framework_Constraint */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint @@ -65,6 +65,11 @@ * @var int Response code */ protected $_code = 200; + + /** + * @var int Actual response code + */ + protected $_actualCode = null; /** * @var string Header @@ -197,6 +202,9 @@ $failure = 'Failed asserting response code IS NOT "%s"'; } $failure = sprintf($failure, $this->_code); + if (!$this->_negate && $this->_actualCode) { + $failure .= sprintf(PHP_EOL . 'Was "%s"', $this->_actualCode); + } break; case self::ASSERT_HEADER: $failure = 'Failed asserting response header "%s" found'; @@ -250,6 +258,7 @@ protected function _code(Zend_Controller_Response_Abstract $response, $code) { $test = $this->_getCode($response); + $this->_actualCode = $test; return ($test == $code); } @@ -338,7 +347,7 @@ $contents = str_replace($header . ': ', '', $fullHeader); - return (strstr($contents, $match)); + return (strstr($contents, $match) !== false); } /** @@ -357,7 +366,7 @@ $contents = str_replace($header . ': ', '', $fullHeader); - return (!strstr($contents, $match)); + return (strstr($contents, $match) === false); } /**