Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#5659 from lucascorbeau…
Browse files Browse the repository at this point in the history 
…x/hotfix/ZF-5658

Fix a fatal error when assert WWW-Authenticate header is sent - Hotfix/5658
  • Loading branch information
@weierophinney
weierophinney committed Mar 3, 2014
115 parents 8ef2791 + f20f848 + 220ed51 + 0aa03b8 + d13dd3d + 8d69039 + c5a2e5b + 1ff4f12 + 8283194 + 854c22d + abc22a4 + af60021 + 5154393 + a82f1c3 + 0c01d9c + 5db3cd1 + 20586e0 + 2676bb2 + 9b81e96 + a26822a + 954b79b + 3c40dd7 + c18f322 + 7427dc0 + 320a9ea + 87098a5 + 2ab5cd1 + a18ab98 + 1c268a7 + 3bd0f91 + e286a21 + 4feaafa + e924eaa + 8dd3ce8 + 4e1e408 + 89b12e3 + c670ac1 + 00d03bb + bd91a55 + 2d86845 + 1694b28 + b36e3e8 + f10ca90 + b37dc0b + a729860 + a4b177e + 5e10b10 + 0db5f75 + bcb7bb1 + f7074c9 + 7529e8f + ba3a8b2 + 76de94f + 6b68a23 + 0b35e2c + c983de4 + 96e1faf + da74c7f + c2aff03 + a05cd2c + c2d82ed + a13730b + 6259074 + 11e375c + ee842b2 + c71c199 + 93b7dbd + 0b6c63f + a97fc11 + c64933f + 547a1fc + a0774d3 + c14420a + 180495b + 4f1bc09 + b1f9102 + d5f0d56 + 196c531 + 9f62e1a + 0a6a6fe + 29d5636 + 57d6216 + ea58a7d + d3a81cf + bd7aa50 + 4611daf + 45cfa56 + 63f8588 + d7057b3 + c22bfe9 + cf6ac15 + 8482bcb + 41f8677 + 3922c9c + d6d9612 + 4205ad6 + 4b5508c + 157b3a0 + 9b75cec + f716062 + 3afdd4f + 03ff13f + b4a5752 + e60700e + 1664cc7 + ba39dc6 + 26a7c2f + 09e7fc0 + 05fcb2e + 31fde0f + fcc6ff2 + c98040f + 842aa26 + 80d946b + 3f46acc commit ed4a766
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 22 deletions.
93 changes: 72 additions & 21 deletions src/PHPUnit/Controller/AbstractHttpControllerTestCase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,30 @@ public function assertResponseHeaderContains($header, $match)
$header
));
}
if ($match != $responseHeader->getFieldValue()) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(

if (!$responseHeader instanceof \ArrayIterator) {
$responseHeader = array($responseHeader);
}

$headerMatched = false;

foreach ($responseHeader as $currentHeader) {
if ($match == $currentHeader->getFieldValue()) {
$headerMatched = true;
break;
}
}

if (!$headerMatched) {
throw new \PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" exists and contains "%s", actual content is "%s"',
$header,
$match,
$responseHeader->getFieldValue()
$currentHeader->getFieldValue()
));
}
$this->assertEquals($match, $responseHeader->getFieldValue());

$this->assertEquals($match, $currentHeader->getFieldValue());
}

/**
Expand All @@ -114,14 +129,22 @@ public function assertNotResponseHeaderContains($header, $match)
$header
));
}
if ($match == $responseHeader->getFieldValue()) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" DOES NOT CONTAIN "%s"',
$header,
$match
));

if (!$responseHeader instanceof \ArrayIterator) {
$responseHeader = array($responseHeader);
}

foreach ($responseHeader as $currentHeader) {
if ($match == $currentHeader->getFieldValue()) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" DOES NOT CONTAIN "%s"',
$header,
$match
));
}
}
$this->assertNotEquals($match, $responseHeader->getFieldValue());

$this->assertNotEquals($match, $currentHeader->getFieldValue());
}

/**
Expand All @@ -139,15 +162,31 @@ public function assertResponseHeaderRegex($header, $pattern)
$header
));
}
if (!preg_match($pattern, $responseHeader->getFieldValue())) {

if (!$responseHeader instanceof \ArrayIterator) {
$responseHeader = array($responseHeader);
}

$headerMatched = false;

foreach ($responseHeader as $currentHeader) {
$headerMatched = (bool) preg_match($pattern, $currentHeader->getFieldValue());

if ($headerMatched) {
break;
}
}

if (!$headerMatched) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" exists and matches regex "%s", actual content is "%s"',
$header,
$pattern,
$responseHeader->getFieldValue()
$currentHeader->getFieldValue()
));
}
$this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));

$this->assertTrue($headerMatched);
}

/**
Expand All @@ -165,14 +204,26 @@ public function assertNotResponseHeaderRegex($header, $pattern)
$header
));
}
if (preg_match($pattern, $responseHeader->getFieldValue())) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" DOES NOT MATCH regex "%s"',
$header,
$pattern
));

if (!$responseHeader instanceof \ArrayIterator) {
$responseHeader = array($responseHeader);
}
$this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));

$headerMatched = false;

foreach ($responseHeader as $currentHeader) {
$headerMatched = (bool) preg_match($pattern, $currentHeader->getFieldValue());

if ($headerMatched) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" DOES NOT MATCH regex "%s"',
$header,
$pattern
));
}
}

$this->assertFalse($headerMatched);
}

/**
Expand Down
24 changes: 24 additions & 0 deletions test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ public function testAssertResponseHeaderContains()
$this->assertResponseHeaderContains('Content-Type', 'text/json');
}

public function testAssertResponseHeaderContainsMultipleHeaderInterface()
{
$this->dispatch('/tests');
$this->assertResponseHeaderContains('WWW-Authenticate', 'Basic realm="ZF2"');
}

public function testAssertNotResponseHeaderContains()
{
$this->dispatch('/tests');
Expand All @@ -93,6 +99,12 @@ public function testAssertNotResponseHeaderContains()
$this->assertNotResponseHeaderContains('Content-Type', 'text/html');
}

public function testAssertNotResponseHeaderContainsMultipleHeaderInterface()
{
$this->dispatch('/tests');
$this->assertNotResponseHeaderContains('WWW-Authenticate', 'Basic realm="ZF3"');
}

public function testAssertResponseHeaderRegex()
{
$this->dispatch('/tests');
Expand All @@ -105,6 +117,12 @@ public function testAssertResponseHeaderRegex()
$this->assertResponseHeaderRegex('Content-Type', '#json#');
}

public function testAssertResponseHeaderRegexMultipleHeaderInterface()
{
$this->dispatch('/tests');
$this->assertResponseHeaderRegex('WWW-Authenticate', '#"ZF2"$#');
}

public function testAssertNotResponseHeaderRegex()
{
$this->dispatch('/tests');
Expand All @@ -114,6 +132,12 @@ public function testAssertNotResponseHeaderRegex()
$this->assertNotResponseHeaderRegex('Content-Type', '#html$#');
}

public function testAssertNotResponseHeaderRegexMultipleHeaderInterface()
{
$this->dispatch('/tests');
$this->assertNotResponseHeaderRegex('WWW-Authenticate', '#"ZF3"$#');
}

public function testAssertRedirect()
{
$this->dispatch('/redirect');
Expand Down
5 changes: 4 additions & 1 deletion test/_files/Baz/src/Baz/Controller/IndexController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ class IndexController extends AbstractActionController
{
public function unittestsAction()
{
$this->getResponse()->getHeaders()->addHeaderLine('Content-Type: text/html');
$this->getResponse()
->getHeaders()
->addHeaderLine('Content-Type: text/html')
->addHeaderLine('WWW-Authenticate: Basic realm="ZF2"');

$num_get = $this->getRequest()->getQuery()->get('num_get', 0);
$num_post = $this->getRequest()->getPost()->get('num_post', 0);
Expand Down

0 comments on commit ed4a766

Please sign in to comment.