mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-09 07:36:56 +02:00
Code Issues Releases Wiki Activity

Improved/added tests, deflate preferred over gzip, improved ConditionalGet docs

Browse Source
This commit is contained in:
Steve Clay
2008-03-04 17:04:09 +00:00
parent f771696d40
commit e2ad73f8be
35 changed files with 398 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/HTTP/ConditionalGet.php
View File

@@ -3,31 +3,46 @@
/**
* Implement conditional GET via a timestamp or hash of content
*
* E.g. Content from DB with update time:
* <code>
* // easiest usage
* list($updateTime, $content) = getDbUpdateAndContent();
* $cg = new HTTP_ConditionalGet(array(
* 'lastModifiedTime' => filemtime(__FILE__)
* 'lastModifiedTime' => $updateTime
* ));
* $cg->sendHeaders();
* if ($cg->cacheIsValid) {
* exit(); // done
* }
* // echo content
* </code>
*
*
* <code>
* // better to add content length once it's known
* $cg = new HTTP_ConditionalGet(array(
* 'lastModifiedTime' => filemtime(__FILE__)
* ));
* if ($cg->cacheIsValid) {
* $cg->sendHeaders();
* exit();
* }
* $content = get_content();
* $cg->setContentLength(strlen($content));
* echo $content;
* </code>
*
* E.g. Content from DB with no update time:
* <code>
* $content = getContentFromDB();
* $cg = new HTTP_ConditionalGet(array(
* 'contentHash' => md5($content)
* ));
* $cg->sendHeaders();
* if ($cg->cacheIsValid) {
* exit();
* }
* echo $content;
* </code>
*
* E.g. Static content with some static includes:
* <code>
* // before content
* $cg = new HTTP_ConditionalGet(array(
* 'lastUpdateTime' => max(
* filemtime(__FILE__)
* ,filemtime('/path/to/header.inc')
* ,filemtime('/path/to/footer.inc')
* )
* ));
* $cg->sendHeaders();
* if ($cg->cacheIsValid) {
* exit();
* }
* </code>
*/
class HTTP_ConditionalGet {
@@ -76,7 +91,7 @@ class HTTP_ConditionalGet {
// allow far-expires header
if (isset($spec['setExpires'])) {
if (is_numeric($spec['setExpires'])) {
$spec['setExpires'] = self::gmtdate($spec['setExpires']);
$spec['setExpires'] = self::gmtDate($spec['setExpires']);
}
$this->_headers = array(
'Cache-Control' => $scope
@@ -159,6 +174,21 @@ class HTTP_ConditionalGet {
}
}
/**
* Get a GMT formatted date for use in HTTP headers
*
* <code>
* header('Expires: ' . HTTP_ConditionalGet::gmtdate($time));
* </code>
*
* @param int $time unix timestamp
*
* @return string
*/
public static function gmtDate($time) {
return gmdate('D, d M Y H:i:s \G\M\T', $time);
}
protected $_headers = array();
protected $_lmTime = null;
protected $_etag = null;
@@ -172,7 +202,7 @@ class HTTP_ConditionalGet {
protected function _setLastModified($time) {
$this->_lmTime = (int)$time;
$this->_headers['Last-Modified'] = self::gmtdate($time);
$this->_headers['Last-Modified'] = self::gmtDate($time);
}
/**
@@ -221,10 +251,6 @@ class HTTP_ConditionalGet {
// IE has tacked on extra data to this header, strip it
$ifModifiedSince = substr($ifModifiedSince, 0, $semicolon);
}
return ($ifModifiedSince == self::gmtdate($this->_lmTime));
}
protected static function gmtdate($ts) {
return gmdate('D, d M Y H:i:s \G\M\T', $ts);
return ($ifModifiedSince == self::gmtDate($this->_lmTime));
}
}

4
lib/HTTP/ConditionalGet/test/_include.php
View File

@@ -52,9 +52,7 @@ to verify headers and content being sent.</p>
<dt>Safari</dt>
<dd>ETag validation is unsupported, but Safari supports HTTP/1.0 validation via
If-Modified-Since headers as long as the cache is explicitly marked
&quot;public&quot; or &quot;private&quot;. ConditionalGet can send one of these
values determined by cookies/session data, but it's best to explicitly
set the option 'isPublic' to true or false.</dd>
"public" or "private" ("private" is default in ConditionalGet).</dd>
</dl>
</body>
</html>

60
lib/HTTP/Encoder.php
View File

@@ -54,15 +54,12 @@ class HTTP_Encoder {
if (isset($spec['type'])) {
$this->_headers['Content-Type'] = $spec['type'];
}
if (self::$_clientEncodeMethod === null) {
self::$_clientEncodeMethod = self::getAcceptedEncoding();
}
if (isset($spec['method'])
&& in_array($spec['method'], array('gzip', 'deflate', 'compress', '')))
{
$this->_encodeMethod = array($spec['method'], $spec['method']);
} else {
$this->_encodeMethod = self::$_clientEncodeMethod;
$this->_encodeMethod = self::getAcceptedEncoding();
}
}
@@ -136,32 +133,41 @@ class HTTP_Encoder {
* this will return ('', ''), the "identity" encoding.
*
* A syntax-aware scan is done of the Accept-Encoding, so the method must
* be non 0. The methods are favored in order of gzip, deflate, then
* compress.
*
* Note: this value is cached internally for the entire PHP execution
* be non 0. The methods are favored in order of deflate, gzip, then
* compress. Yes, deflate is always smaller and faster!
*
* @return array two values, 1st is the actual encoding method, 2nd is the
* alias of that method to use in the Content-Encoding header (some browsers
* call gzip "x-gzip" etc.)
*/
public static function getAcceptedEncoding() {
if (self::$_clientEncodeMethod !== null) {
return self::$_clientEncodeMethod;
}
if (! isset($_SERVER['HTTP_ACCEPT_ENCODING'])
|| self::_isBuggyIe())
{
return array('', '');
}
// @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
// test for (x-)gzip, if q is specified, can't be "0"
if (preg_match('@(?:^|,)\s*((?:x-)?gzip)\s*(?:$|,|;\s*q=(?:0\.|1))@', $_SERVER['HTTP_ACCEPT_ENCODING'], $m)) {
return array('gzip', $m[1]);
}
if (preg_match('@(?:^|,)\s*deflate\s*(?:$|,|;\s*q=(?:0\.|1))@', $_SERVER['HTTP_ACCEPT_ENCODING'])) {
// faster test for most common "gzip, deflate"
if (preg_match('@(?:,| )deflate$@', $_SERVER['HTTP_ACCEPT_ENCODING'])
|| preg_match(
'@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
,$_SERVER['HTTP_ACCEPT_ENCODING'])
) {
return array('deflate', 'deflate');
}
if (preg_match('@(?:^|,)\s*((?:x-)?compress)\s*(?:$|,|;\s*q=(?:0\.|1))@', $_SERVER['HTTP_ACCEPT_ENCODING'], $m)) {
if (preg_match(
'@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
,$_SERVER['HTTP_ACCEPT_ENCODING']
,$m)
) {
return array('gzip', $m[1]);
}
if (preg_match(
'@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
,$_SERVER['HTTP_ACCEPT_ENCODING']
,$m)
) {
return array('compress', $m[1]);
}
return array('', '');
@@ -211,21 +217,27 @@ class HTTP_Encoder {
return true;
}
protected static $_clientEncodeMethod = null;
protected $content = '';
protected $headers = array();
protected $encodeMethod = array('', '');
protected $_content = '';
protected $_headers = array();
protected $_encodeMethod = array('', '');
/**
* Is the browser an IE version earlier than 6 SP2?
*/
protected static function _isBuggyIe()
{
if (strstr($_SERVER['HTTP_USER_AGENT'], 'Opera')
|| !preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $m))
{
if (false !== strpos($_SERVER['HTTP_USER_AGENT'], 'Opera')
|| !preg_match(
'/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i'
,$_SERVER['HTTP_USER_AGENT']
,$m
)
) {
return false;
}
$version = floatval($m[1]);
if ($version < 6) return true;
if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'SV1')) {
if ($version == 6 && false === strpos($_SERVER['HTTP_USER_AGENT'], 'SV1')) {
return true;
}
return false;

3
lib/HTTP/Encoder/test/index.php
View File

@@ -46,8 +46,7 @@ window.onload = function(){
document.getElementById("js").className = "green";
};
';
$type = 'text/javascript';
$type = 'application/x-javascript';
}
$he = new HTTP_Encoder(array(

6
lib/Minify.php
View File

@@ -16,7 +16,7 @@
* @package Minify
* @author Ryan Grove <ryan@wonko.com>
* @author Stephen Clay <steve@mrclay.org>
* @copyright 2007 Ryan Grove. All rights reserved.
* @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved.
* @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version 1.9.0
* @link http://code.google.com/p/minify/
@@ -27,8 +27,10 @@ require_once 'Minify/Source.php';
class Minify {
const TYPE_CSS = 'text/css';
const TYPE_JS = 'application/x-javascript';
const TYPE_HTML = 'text/html';
// there is some debate over the ideal JS Content-Type, but this is the
// Apache default and what Yahoo! uses..
const TYPE_JS = 'application/x-javascript';
/**
* @var bool Should the un-encoded version be cached?

0
web/test/css/caio.css → web/test/_test_files/css/caio.css
View File

0
web/test/css/caio.min.css → web/test/_test_files/css/caio.min.css vendored
View File

0
web/test/css/comments.css → web/test/_test_files/css/comments.css
View File

0
web/test/css/comments.min.css → web/test/_test_files/css/comments.min.css vendored
View File

0
web/test/css/hacks.css → web/test/_test_files/css/hacks.css
View File

0
web/test/css/hacks.min.css → web/test/_test_files/css/hacks.min.css vendored
View File

0
web/test/css/paths.css → web/test/_test_files/css/paths.css
View File

0
web/test/css/paths.min.css → web/test/_test_files/css/paths.min.css vendored
View File

0
web/test/css/readme.txt → web/test/_test_files/css/readme.txt
View File

0
web/test/css/styles.css → web/test/_test_files/css/styles.css
View File

0
web/test/css/styles.min.css → web/test/_test_files/css/styles.min.css vendored
View File

0
web/test/css/subsilver.css → web/test/_test_files/css/subsilver.css
View File

0
web/test/css/subsilver.min.css → web/test/_test_files/css/subsilver.min.css vendored
View File

0
web/test/html/before.html → web/test/_test_files/html/before.html
View File

0
web/test/html/before.min.html → web/test/_test_files/html/before.min.html
View File

0
web/test/js/before.js → web/test/_test_files/js/before.js
View File

0
web/test/js/before.min.js → web/test/_test_files/js/before.min.js vendored
View File

0
web/test/minify/QueryString.js → web/test/_test_files/minify/QueryString.js
View File

0
web/test/minify/email.js → web/test/_test_files/minify/email.js
View File

0
web/test/minify/minified.css → web/test/_test_files/minify/minified.css
View File

0
web/test/minify/minified.js → web/test/_test_files/minify/minified.js
View File

0
web/test/packer/before.js → web/test/_test_files/packer/before.js
View File

0
web/test/packer/before.min.js → web/test/_test_files/packer/before.min.js vendored
View File

40
web/test/test_CSS.php
View File

@@ -1,32 +1,42 @@
<?php
require '_inc.php';
require_once '_inc.php';
require 'Minify/CSS.php';
require_once 'Minify/CSS.php';
// build test file list
$d = dir(dirname(__FILE__) . '/css');
while (false !== ($entry = $d->read())) {
function test_CSS()
{
global $thisDir;
$cssPath = dirname(__FILE__) . '/_test_files/css';
// build test file list
$d = dir($cssPath);
while (false !== ($entry = $d->read())) {
if (preg_match('/^([\w\\-]+)\.css$/', $entry, $m)) {
$list[] = $m[1];
}
}
$d->close();
}
$d->close();
foreach ($list as $item) {
foreach ($list as $item) {
$options = ($item === 'paths')
? array('prependRelativePath' => '../')
: array();
$src = file_get_contents($thisDir . '/css/' . $item . '.css');
$minExpected = file_get_contents($thisDir . '/css/' . $item . '.min.css');
$src = file_get_contents($cssPath . "/{$item}.css");
$minExpected = file_get_contents($cssPath . "/{$item}.min.css");
$minOutput = Minify_CSS::minify($src, $options);
assertTrue($minExpected === $minOutput, 'Minify_CSS : ' . $item);
$passed = assertTrue($minExpected === $minOutput, 'Minify_CSS : ' . $item);
if ($minExpected !== $minOutput) {
echo "\n---Source\n\n{$src}";
echo "\n\n---Expected\n\n{$minExpected}";
echo "\n\n---Output\n\n{$minOutput}\n\n\n\n";
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}\n\n";
if (!$passed) {
echo "---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}\n\n";
echo "---Source: " .strlen($src). " bytes\n\n{$src}\n\n\n";
}
}
}
}
test_CSS();

33
web/test/test_HTML.php
View File

@@ -1,22 +1,29 @@
<?php
require '_inc.php';
require_once '_inc.php';
require 'Minify/HTML.php';
require 'Minify/CSS.php';
require 'Minify/Javascript.php';
require_once 'Minify/HTML.php';
require_once 'Minify/CSS.php';
require_once 'Minify/Javascript.php';
$src = file_get_contents($thisDir . '/html/before.html');
$minExpected = file_get_contents($thisDir . '/html/before.min.html');
function test_HTML()
{
global $thisDir;
$minOutput = Minify_HTML::minify($src, array(
$src = file_get_contents($thisDir . '/_test_files/html/before.html');
$minExpected = file_get_contents($thisDir . '/_test_files/html/before.min.html');
$minOutput = Minify_HTML::minify($src, array(
'cssMinifier' => array('Minify_CSS', 'minify')
,'jsMinifier' => array('Minify_Javascript', 'minify')
));
));
$passed = assertTrue($minExpected === $minOutput, 'Minify_HTML');
$passed = assertTrue($minExpected === $minOutput, 'Minify_HTML');
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}";
if (! $passed) {
echo "\n\n\n\n---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}";
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}\n\n";
echo "---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}\n\n";
echo "---Source: " .strlen($src). " bytes\n\n{$src}\n\n\n";
}
}
echo "\n\n---Source: " .strlen($src). " bytes\n\n{$src}";
test_HTML();

97
web/test/test_HTTP_Encoder.php Normal file
View File

@@ -0,0 +1,97 @@
<?php
require_once '_inc.php';
require_once 'HTTP/Encoder.php';
function test_HTTP_Encoder()
{
global $thisDir;
$methodTests = array(
array(
'ua' => 'Any browser'
,'ae' => 'compress, x-gzip'
,'exp' => array('gzip', 'x-gzip')
,'desc' => 'recognize "x-gzip" as gzip'
)
,array(
'ua' => 'Any browser'
,'ae' => 'compress, x-gzip;q=0.5'
,'exp' => array('gzip', 'x-gzip')
,'desc' => 'gzip w/ non-zero q'
)
,array(
'ua' => 'Any browser'
,'ae' => 'compress, x-gzip;q=0'
,'exp' => array('compress', 'compress')
,'desc' => 'gzip w/ zero q'
)
,array(
'ua' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)'
,'ae' => 'gzip, deflate'
,'exp' => array('', '')
,'desc' => 'IE6 w/o "enhanced security"'
)
,array(
'ua' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)'
,'ae' => 'gzip, deflate'
,'exp' => array('deflate', 'deflate')
,'desc' => 'IE6 w/ "enhanced security"'
)
,array(
'ua' => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.01)'
,'ae' => 'gzip, deflate'
,'exp' => array('', '')
,'desc' => 'IE5.5'
)
,array(
'ua' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.25'
,'ae' => 'gzip,deflate'
,'exp' => array('deflate', 'deflate')
,'desc' => 'Opera identifying as IE6'
)
);
foreach ($methodTests as $test) {
$_SERVER['HTTP_USER_AGENT'] = $test['ua'];
$_SERVER['HTTP_ACCEPT_ENCODING'] = $test['ae'];
$exp = $test['exp'];
$ret = HTTP_Encoder::getAcceptedEncoding();
$passed = assertTrue($exp == $ret, 'HTTP_Encoder : ' . $test['desc']);
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\n--- AE | UA = {$test['ae']} | {$test['ua']}\n";
echo "Expected = " . preg_replace('/\\s+/', ' ', var_export($exp, 1)) . "\n";
echo "Returned = " . preg_replace('/\\s+/', ' ', var_export($ret, 1)) . "\n\n";
}
}
$variedContent = file_get_contents($thisDir . '/_test_files/html/before.html')
. file_get_contents($thisDir . '/_test_files/css/subsilver.css')
. file_get_contents($thisDir . '/../examples/1/jquery-1.2.3.js');
$encodingTests = array(
array('method' => 'gzip', 'exp' => 32174)
,array('method' => 'deflate', 'exp' => 32156)
,array('method' => 'compress', 'exp' => 32210)
);
foreach ($encodingTests as $test) {
$e = new HTTP_Encoder(array(
'content' => $variedContent
,'method' => $test['method']
));
$e->encode(9);
$ret = strlen($e->getContent());
$passed = assertTrue($ret == $test['exp']
,"HTTP_Encoder : {$test['method']} compression");
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\n--- {$test['method']}: expected bytes: "
, "{$test['exp']}. Returned: {$ret}\n\n";
}
}
}
test_HTTP_Encoder();

27
web/test/test_Javascript.php
View File

@@ -1,16 +1,23 @@
<?php
require '_inc.php';
require_once '_inc.php';
require 'Minify/Javascript.php';
require_once 'Minify/Javascript.php';
$src = file_get_contents($thisDir . '/js/before.js');
$minExpected = file_get_contents($thisDir . '/js/before.min.js');;
$minOutput = Minify_Javascript::minify($src);
function test_Javascript()
{
global $thisDir;
$passed = assertTrue($minExpected == $minOutput, 'Minify_Javascript converts before.js to before.min.js');
$src = file_get_contents($thisDir . '/_test_files/js/before.js');
$minExpected = file_get_contents($thisDir . '/_test_files/js/before.min.js');;
$minOutput = Minify_Javascript::minify($src);
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}";
if (! $passed) {
echo "\n\n\n\n---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}";
$passed = assertTrue($minExpected == $minOutput, 'Minify_Javascript');
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}\n\n";
echo "---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}\n\n";
echo "---Source: " .strlen($src). " bytes\n\n{$src}\n\n\n";
}
}
echo "\n\n---Source: " .strlen($src). " bytes\n\n{$src}";
test_Javascript();

101
web/test/test_Minify.php
View File

@@ -1,100 +1,111 @@
<?php
require '_inc.php';
require_once '_inc.php';
/**
* Note: All Minify classes are E_STRICT except for Cache_Lite_File.
*/
error_reporting(E_ALL);
require 'Minify.php';
$tomorrow = time() + 86400;
$lastModified = time() - 86400;
require_once 'Minify.php';
function test_Minify()
{
global $thisDir;
$minifyTestPath = dirname(__FILE__) . '/_test_files/minify';
$tomorrow = time() + 86400;
$lastModified = time() - 86400;
// Test minifying JS and serving with Expires header
// Test minifying JS and serving with Expires header
$expected = array(
$expected = array(
'success' => true
,'statusCode' => 200
// Minify_Javascript always converts to \n line endings
,'content' => preg_replace('/\\r\\n?/', "\n", file_get_contents($thisDir . '/minify/minified.js'))
,'content' => preg_replace('/\\r\\n?/', "\n", file_get_contents($minifyTestPath . '/minified.js'))
,'headers' => array (
'Cache-Control' => 'public',
'Expires' => gmdate('D, d M Y H:i:s \G\M\T', $tomorrow),
'Content-Type' => 'application/x-javascript',
)
);
$output = Minify::serve('Files', array(
);
$output = Minify::serve('Files', array(
'files' => array(
$thisDir . '/minify/email.js'
,$thisDir . '/minify/QueryString.js'
$minifyTestPath . '/email.js'
,$minifyTestPath . '/QueryString.js'
)
,'quiet' => true
,'setExpires' => $tomorrow
,'encodeOutput' => false
));
$passed = assertTrue($expected === $output, 'Minify - JS and Expires');
echo "\nOutput: " .var_export($output, 1). "\n\n";
if (! $passed) {
));
$passed = assertTrue($expected === $output, 'Minify : JS and Expires');
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\nOutput: " .var_export($output, 1). "\n\n";
if (! $passed) {
echo "\n\n\n\n---Expected: " .var_export($expected, 1). "\n\n";
}
}
}
// Test minifying CSS and responding with Etag/Last-Modified
// don't allow conditional headers
unset($_SERVER['HTTP_IF_NONE_MATCH'], $_SERVER['HTTP_IF_MODIFIED_SINCE']);
// Test minifying CSS and responding with Etag/Last-Modified
// don't allow conditional headers
unset($_SERVER['HTTP_IF_NONE_MATCH'], $_SERVER['HTTP_IF_MODIFIED_SINCE']);
$expected = array(
$expected = array(
'success' => true
,'statusCode' => 200
,'content' => file_get_contents($thisDir . '/minify/minified.css')
,'content' => file_get_contents($minifyTestPath . '/minified.css')
,'headers' => array (
'Last-Modified' => gmdate('D, d M Y H:i:s \G\M\T', $lastModified),
'ETag' => "\"{$lastModified}pub\"",
'Cache-Control' => 'max-age=0, public, must-revalidate',
'Content-Type' => 'text/css',
)
);
$output = Minify::serve('Files', array(
);
$output = Minify::serve('Files', array(
'files' => array(
$thisDir . '/css/styles.css'
,$thisDir . '/css/subsilver.css'
$thisDir . '/_test_files/css/styles.css'
,$thisDir . '/_test_files/css/subsilver.css'
)
,'quiet' => true
,'lastModifiedTime' => $lastModified
,'encodeOutput' => false
));
$passed = assertTrue($expected === $output, 'Minify - CSS and Etag/Last-Modified');
echo "\nOutput: " .var_export($output, 1). "\n\n";
if (! $passed) {
));
$passed = assertTrue($expected === $output, 'Minify : CSS and Etag/Last-Modified');
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\nOutput: " .var_export($output, 1). "\n\n";
if (! $passed) {
echo "\n\n\n\n---Expected: " .var_export($expected, 1). "\n\n";
}
}
}
// Test 304 response
// Test 304 response
// simulate conditional headers
$_SERVER['HTTP_IF_NONE_MATCH'] = "\"{$lastModified}pub\"";
$_SERVER['HTTP_IF_MODIFIED_SINCE'] = gmdate('D, d M Y H:i:s \G\M\T', $lastModified);
// simulate conditional headers
$_SERVER['HTTP_IF_NONE_MATCH'] = "\"{$lastModified}pub\"";
$_SERVER['HTTP_IF_MODIFIED_SINCE'] = gmdate('D, d M Y H:i:s \G\M\T', $lastModified);
$expected = array (
$expected = array (
'success' => true
,'statusCode' => 304
,'content' => '',
'headers' => array()
);
$output = Minify::serve('Files', array(
);
$output = Minify::serve('Files', array(
'files' => array(
$thisDir . '/css/styles.css'
$thisDir . '/_test_files/css/styles.css'
)
,'quiet' => true
,'lastModifiedTime' => $lastModified
,'encodeOutput' => false
));
$passed = assertTrue($expected === $output, 'Minify - 304 response');
echo "\nOutput: " .var_export($output, 1). "\n\n";
if (! $passed) {
));
$passed = assertTrue($expected === $output, 'Minify : 304 response');
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\nOutput: " .var_export($output, 1). "\n\n";
if (! $passed) {
echo "\n\n\n\n---Expected: " .var_export($expected, 1). "\n\n";
}
}
}
test_Minify();

27
web/test/test_Packer.php
View File

@@ -1,16 +1,23 @@
<?php
require '_inc.php';
require_once '_inc.php';
require 'Minify/Packer.php';
require_once 'Minify/Packer.php';
$src = file_get_contents($thisDir . '/packer/before.js');
$minExpected = file_get_contents($thisDir . '/packer/before.min.js');
$minOutput = Minify_Packer::minify($src);
function test_Packer()
{
global $thisDir;
$passed = assertTrue($minExpected === $minOutput, 'Minify_Packer');
$src = file_get_contents($thisDir . '/_test_files/packer/before.js');
$minExpected = file_get_contents($thisDir . '/_test_files/packer/before.min.js');
$minOutput = Minify_Packer::minify($src);
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}";
if (! $passed) {
echo "\n\n\n\n---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}";
$passed = assertTrue($minExpected === $minOutput, 'Minify_Packer');
if (__FILE__ === $_SERVER['SCRIPT_FILENAME']) {
echo "\n---Output: " .strlen($minOutput). " bytes\n\n{$minOutput}\n\n";
echo "---Expected: " .strlen($minExpected). " bytes\n\n{$minExpected}\n\n";
echo "---Source: " .strlen($src). " bytes\n\n{$src}\n\n\n";
}
}
echo "\n\n---Source: " .strlen($src). " bytes\n\n{$src}";
test_Packer();

10
web/test/test_all.php Normal file
View File

@@ -0,0 +1,10 @@
<?php
require 'test_Javascript.php';
require 'test_CSS.php';
require 'test_Packer.php';
require 'test_HTML.php';
require 'test_Minify.php';
require 'test_HTTP_Encoder.php';
?>