Updating doc block for FileEngine.

Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.

cake/libs/cache.php

@@ -234,6 +234,9 @@ function set($settings = array(), $value = null) {
 					$settings = array($settings => $value);
 				}
 				$settings = array_merge($self->__config[$self->__name], $settings);
+				if (isset($settings['duration']) && !is_numeric($settings['duration'])) {
+					$settings['duration'] = strtotime($settings['duration']) - time();
+				}
 			}
 			$self->_engines[$name]->settings = $settings;
 		}

cake/libs/cache/file.php

@@ -37,11 +37,12 @@ class FileEngine extends CacheEngine {
 	var $__File = null;
 
 /**
- * settings
- * 		path = absolute path to cache directory, default => CACHE
- * 		prefix = string prefix for filename, default => cake_
- * 		lock = enable file locking on write, default => false
- * 		serialize = serialize the data, default => true
+ * Settings
+ * 
+ * - path = absolute path to cache directory, default => CACHE
+ * - prefix = string prefix for filename, default => cake_
+ * - lock = enable file locking on write, default => false
+ * - serialize = serialize the data, default => true
  *
  * @var array
  * @see CacheEngine::__defaults

cake/tests/cases/libs/cache/xcache.test.php

@@ -132,7 +132,7 @@ function testExpiry() {
 		$result = Cache::read('other_test');
 		$this->assertFalse($result);
 
-		Cache::set(array('duration' =>  1));
+		Cache::set(array('duration' =>  "+1 second"));
 
 		$data = 'this is a test of the emergency broadcasting system';
 		$result = Cache::write('other_test', $data);