mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-16 11:03:59 +02:00
Code Issues Releases Wiki Activity

formatting fixes

Browse Source
This commit is contained in:
Elan Ruusamäe
2015-11-19 19:56:29 +02:00
committed by Steve Clay
parent 8816e270e6
commit 6c95daf3cf
1 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
tests/HTTPConditionalGetTest.php
View File

@@ -17,99 +17,99 @@ class HTTPConditionalGetTest extends TestCase
$tests = array( $tests = array(
array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'client has valid If-Modified-Since' 'desc' => 'client has valid If-Modified-Since',
,'inm' => null 'inm' => null,
,'ims' => $gmtTime 'ims' => $gmtTime,
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime}\"" 'ETag' => "\"pri{$lmTime}\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'_responseCode' => 'HTTP/1.0 304 Not Modified' '_responseCode' => 'HTTP/1.0 304 Not Modified',
,'isValid' => true 'isValid' => true,
) )
) ),
,array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'client has valid If-Modified-Since with trailing semicolon' 'desc' => 'client has valid If-Modified-Since with trailing semicolon',
,'inm' => null 'inm' => null,
,'ims' => $gmtTime . ';' 'ims' => $gmtTime . ';',
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime}\"" 'ETag' => "\"pri{$lmTime}\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'_responseCode' => 'HTTP/1.0 304 Not Modified' '_responseCode' => 'HTTP/1.0 304 Not Modified',
,'isValid' => true 'isValid' => true,
) ),
) ),
,array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'client has valid ETag (non-encoded version)' 'desc' => 'client has valid ETag (non-encoded version)',
,'inm' => "\"badEtagFoo\", \"pri{$lmTime}\"" 'inm' => "\"badEtagFoo\", \"pri{$lmTime}\"",
,'ims' => null 'ims' => null,
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime}\"" 'ETag' => "\"pri{$lmTime}\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'_responseCode' => 'HTTP/1.0 304 Not Modified' '_responseCode' => 'HTTP/1.0 304 Not Modified',
,'isValid' => true 'isValid' => true,
) ),
) ),
,array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'client has valid ETag (gzip version)' 'desc' => 'client has valid ETag (gzip version)',
,'inm' => "\"badEtagFoo\", \"pri{$lmTime};gz\"" 'inm' => "\"badEtagFoo\", \"pri{$lmTime};gz\"",
,'ims' => null 'ims' => null,
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime};gz\"" 'ETag' => "\"pri{$lmTime};gz\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'_responseCode' => 'HTTP/1.0 304 Not Modified' '_responseCode' => 'HTTP/1.0 304 Not Modified',
,'isValid' => true 'isValid' => true,
) ),
) ),
,array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'no conditional get' 'desc' => 'no conditional get',
,'inm' => null 'inm' => null,
,'ims' => null 'ims' => null,
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime};gz\"" 'ETag' => "\"pri{$lmTime};gz\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'isValid' => false 'isValid' => false,
) ),
) ),
,array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'client has invalid ETag' 'desc' => 'client has invalid ETag',
,'inm' => '"pri' . ($lmTime - 300) . '"' 'inm' => '"pri' . ($lmTime - 300) . '"',
,'ims' => null 'ims' => null,
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime};gz\"" 'ETag' => "\"pri{$lmTime};gz\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'isValid' => false 'isValid' => false,
) ),
) ),
,array( array(
'lm' => $lmTime, 'lm' => $lmTime,
'desc' => 'client has invalid If-Modified-Since' 'desc' => 'client has invalid If-Modified-Since',
,'inm' => null 'inm' => null,
,'ims' => gmdate('D, d M Y H:i:s \G\M\T', $lmTime - 300) 'ims' => gmdate('D, d M Y H:i:s \G\M\T', $lmTime - 300),
,'exp' => array( 'exp' => array(
'Vary' => 'Accept-Encoding' 'Vary' => 'Accept-Encoding',
,'Last-Modified' => $gmtTime 'Last-Modified' => $gmtTime,
,'ETag' => "\"pri{$lmTime};gz\"" 'ETag' => "\"pri{$lmTime};gz\"",
,'Cache-Control' => 'max-age=0, private' 'Cache-Control' => 'max-age=0, private',
,'isValid' => false 'isValid' => false,
) ),
) ),
); );
return $tests; return $tests;
} }
@@ -119,7 +119,6 @@ class HTTPConditionalGetTest extends TestCase
*/ */
public function test_HTTP_ConditionalGet($lmTime, $desc, $inm, $ims, $exp) public function test_HTTP_ConditionalGet($lmTime, $desc, $inm, $ims, $exp)
{ {
// setup env // setup env
if (null === $inm) { if (null === $inm) {
unset($_SERVER['HTTP_IF_NONE_MATCH']); unset($_SERVER['HTTP_IF_NONE_MATCH']);