mirror of
https://github.com/mrclay/minify.git
synced 2025-08-06 14:16:28 +02:00
+ E_STRICT compliance
This commit is contained in:
3
HISTORY
3
HISTORY
@@ -1,5 +1,8 @@
|
||||
Minify Release History
|
||||
|
||||
Version 2.0.1 (2008-05-31)
|
||||
* E_STRICT compliance (Cache_Lite_File).
|
||||
|
||||
Version 2.0.0 (2008-05-22)
|
||||
* Complete code overhaul. Minify is now a PEAR-style class and toolkit
|
||||
for building customized minifying file servers.
|
||||
|
@@ -902,14 +902,16 @@ class Cache_Lite_File extends Cache_Lite
|
||||
}
|
||||
|
||||
/**
|
||||
* Test if a cache is available and (if yes) return it
|
||||
* Test if a cache is available and (if yes) return it
|
||||
*
|
||||
* The third param is just to suppress PHP5's E_STRICT warning
|
||||
*
|
||||
* @param string $id cache id
|
||||
* @param string $group name of the cache group
|
||||
* @return string data of the cache (or false if no cache available)
|
||||
* @access public
|
||||
*/
|
||||
function get($id, $group = 'default')
|
||||
function get($id, $group = 'default', $thisValueIgnored = false)
|
||||
{
|
||||
if ($data = parent::get($id, $group, true)) {
|
||||
if ($filemtime = $this->lastModified()) {
|
||||
@@ -920,6 +922,4 @@ class Cache_Lite_File extends Cache_Lite
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
@@ -21,7 +21,6 @@
|
||||
* @author Stephen Clay <steve@mrclay.org>
|
||||
* @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/
|
||||
*/
|
||||
|
||||
|
@@ -1,10 +1,6 @@
|
||||
<?php
|
||||
|
||||
require_once '_inc.php';
|
||||
/**
|
||||
* Note: All Minify classes are E_STRICT except for Cache_Lite_File.
|
||||
*/
|
||||
error_reporting(E_ALL);
|
||||
require_once 'Minify.php';
|
||||
|
||||
function test_Minify()
|
||||
@@ -83,6 +79,9 @@ function test_Minify()
|
||||
|
||||
// Test minifying CSS and responding with Etag/Last-Modified
|
||||
|
||||
// needed to expose E_STRICT warning in Cache_Lite_File
|
||||
Minify::useServerCache();
|
||||
|
||||
// don't allow conditional headers
|
||||
unset($_SERVER['HTTP_IF_NONE_MATCH'], $_SERVER['HTTP_IF_MODIFIED_SINCE']);
|
||||
|
||||
|
Reference in New Issue
Block a user