diff --git a/Tests/AbstractWebApplicationTest.php b/Tests/AbstractWebApplicationTest.php index abca9e5c..0372f9b1 100644 --- a/Tests/AbstractWebApplicationTest.php +++ b/Tests/AbstractWebApplicationTest.php @@ -563,7 +563,7 @@ public function testRedirectLegacyBehavior() $object->expects($this->exactly(2)) ->method('checkHeadersSent') ->willReturn(false); - $object->expects($this->exactly(7)) + $object->expects($this->exactly(6)) ->method('header') ->willReturnCallback([$this, 'mockHeader']); @@ -582,8 +582,7 @@ public function testRedirectLegacyBehavior() ['Content-Type: text/html; charset=utf-8', true, null], ['Expires: Wed, 17 Aug 2005 00:00:00 GMT', true, null], ['Last-Modified: ' . $date->format('D, d M Y H:i:s e'), true, null], - ['Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null], - ['Pragma: no-cache', true, null], + ['Cache-Control: no-cache, must-revalidate', true, null], ] ); } @@ -610,7 +609,7 @@ public function testRedirect() $object->expects($this->exactly(2)) ->method('checkHeadersSent') ->willReturn(false); - $object->expects($this->exactly(7)) + $object->expects($this->exactly(6)) ->method('header') ->willReturnCallback([$this, 'mockHeader']); @@ -628,8 +627,7 @@ public function testRedirect() ['Content-Type: text/html; charset=utf-8', true, null], ['Expires: Wed, 17 Aug 2005 00:00:00 GMT', true, null], ['Last-Modified: ' . $date->format('D, d M Y H:i:s e'), true, null], - ['Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null], - ['Pragma: no-cache', true, null], + ['Cache-Control: no-cache, must-revalidate', true, null], ] ); } @@ -656,7 +654,7 @@ public function testRedirectWithExistingStatusCode() $object->expects($this->exactly(2)) ->method('checkHeadersSent') ->willReturn(false); - $object->expects($this->exactly(7)) + $object->expects($this->exactly(6)) ->method('header') ->willReturnCallback([$this, 'mockHeader']); @@ -676,8 +674,7 @@ public function testRedirectWithExistingStatusCode() ['Content-Type: text/html; charset=utf-8', true, null], ['Expires: Wed, 17 Aug 2005 00:00:00 GMT', true, null], ['Last-Modified: ' . $date->format('D, d M Y H:i:s e'), true, null], - ['Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null], - ['Pragma: no-cache', true, null], + ['Cache-Control: no-cache, must-revalidate', true, null], ] ); } @@ -704,7 +701,7 @@ public function testRedirectWithAdditionalHeaders() $object->expects($this->exactly(2)) ->method('checkHeadersSent') ->willReturn(false); - $object->expects($this->exactly(7)) + $object->expects($this->exactly(6)) ->method('header') ->willReturnCallback([$this, 'mockHeader']); @@ -723,8 +720,7 @@ public function testRedirectWithAdditionalHeaders() ['Content-Type: text/html; charset=utf-8', true, null], ['Expires: Wed, 17 Aug 2005 00:00:00 GMT', true, null], ['Last-Modified: ' . $date->format('D, d M Y H:i:s e'), true, null], - ['Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null], - ['Pragma: no-cache', true, null], + ['Cache-Control: no-cache, must-revalidate', true, null], ] ); } @@ -828,7 +824,7 @@ public function testRedirectWithMoved() $object->expects($this->exactly(2)) ->method('checkHeadersSent') ->willReturn(false); - $object->expects($this->exactly(7)) + $object->expects($this->exactly(6)) ->method('header') ->willReturnCallback([$this, 'mockHeader']); @@ -847,8 +843,7 @@ public function testRedirectWithMoved() ['Content-Type: text/html; charset=utf-8', true, null], ['Expires: Wed, 17 Aug 2005 00:00:00 GMT', true, null], ['Last-Modified: ' . $date->format('D, d M Y H:i:s e'), true, null], - ['Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true, null], - ['Pragma: no-cache', true, null], + ['Cache-Control: no-cache, must-revalidate', true, null], ] ); } @@ -880,7 +875,7 @@ public function testRedirectWithUrl(string $url, string $expected) $object->expects($this->exactly(2)) ->method('checkHeadersSent') ->willReturn(false); - $object->expects($this->exactly(7)) + $object->expects($this->exactly(6)) ->method('header') ->willReturnCallback([$this, 'mockHeader']);