From 930ad768cffe77ba159fe1992b5789e8f159396d Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Sun, 1 Jun 2008 02:52:59 +0000
Subject: [PATCH] + E_STRICT compliance

---
 HISTORY                  | 3 +++
 lib/Cache/Lite/File.php  | 8 ++++----
 lib/Minify.php           | 1 -
 web/test/test_Minify.php | 7 +++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/HISTORY b/HISTORY
index 63717d1..257ac73 100644
--- a/HISTORY
+++ b/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.
diff --git a/lib/Cache/Lite/File.php b/lib/Cache/Lite/File.php
index 8fa6dfb..4fb89e2 100644
--- a/lib/Cache/Lite/File.php
+++ b/lib/Cache/Lite/File.php
@@ -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;
     }
-
 }
-
diff --git a/lib/Minify.php b/lib/Minify.php
index 35abacf..7092043 100644
--- a/lib/Minify.php
+++ b/lib/Minify.php
@@ -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/
  */
 
diff --git a/web/test/test_Minify.php b/web/test/test_Minify.php
index 75e8ef9..d33e9e0 100644
--- a/web/test/test_Minify.php
+++ b/web/test/test_Minify.php
@@ -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']);