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

+ E_STRICT compliance

Browse Source
This commit is contained in:
Steve Clay
2008-06-01 02:52:59 +00:00
parent 457ed43590
commit 930ad768cf
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -1,5 +1,8 @@
Minify Release History Minify Release History
Version 2.0.1 (2008-05-31)
* E_STRICT compliance (Cache_Lite_File).
Version 2.0.0 (2008-05-22) Version 2.0.0 (2008-05-22)
* Complete code overhaul. Minify is now a PEAR-style class and toolkit * Complete code overhaul. Minify is now a PEAR-style class and toolkit
for building customized minifying file servers. for building customized minifying file servers.

6
lib/Cache/Lite/File.php
View File

@@ -904,12 +904,14 @@ 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 $id cache id
* @param string $group name of the cache group * @param string $group name of the cache group
* @return string data of the cache (or false if no cache available) * @return string data of the cache (or false if no cache available)
* @access public * @access public
*/ */
function get($id, $group = 'default') function get($id, $group = 'default', $thisValueIgnored = false)
{ {
if ($data = parent::get($id, $group, true)) { if ($data = parent::get($id, $group, true)) {
if ($filemtime = $this->lastModified()) { if ($filemtime = $this->lastModified()) {
@@ -920,6 +922,4 @@ class Cache_Lite_File extends Cache_Lite
} }
return false; return false;
} }
} }

1
lib/Minify.php
View File

@@ -21,7 +21,6 @@
* @author Stephen Clay <steve@mrclay.org> * @author Stephen Clay <steve@mrclay.org>
* @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved. * @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved.
* @license http://opensource.org/licenses/bsd-license.php New BSD License * @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version 1.9.0
* @link http://code.google.com/p/minify/ * @link http://code.google.com/p/minify/
*/ */

7
web/test/test_Minify.php
View File

@@ -1,10 +1,6 @@
<?php <?php
require_once '_inc.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'; require_once 'Minify.php';
function test_Minify() function test_Minify()
@@ -83,6 +79,9 @@ function test_Minify()
// Test minifying CSS and responding with Etag/Last-Modified // 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 // don't allow conditional headers
unset($_SERVER['HTTP_IF_NONE_MATCH'], $_SERVER['HTTP_IF_MODIFIED_SINCE']); unset($_SERVER['HTTP_IF_NONE_MATCH'], $_SERVER['HTTP_IF_MODIFIED_SINCE']);