mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-22 13:42:48 +02:00
Code Issues Releases Wiki Activity

do some trivial codestyle fixes

Browse Source 
unix newlines, trailing spaces
This commit is contained in:
Elan Ruusamäe
2016-01-22 00:30:38 +02:00
parent 90bf31f53b
commit 379feaba99
40 changed files with 1424 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Minify/Cache/APC.php
View File

@@ -6,11 +6,11 @@
/**
* APC-based cache class for Minify
*
*
* <code>
* Minify::setCache(new Minify_Cache_APC());
* </code>
*
*
* @package Minify
* @author Chris Edwards
**/
@@ -57,6 +57,7 @@ class Minify_Cache_APC implements Minify_CacheInterface {
if (! $this->_fetch($id)) {
return false;
}
return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
? mb_strlen($this->_data, '8bit')
: strlen($this->_data);
@@ -124,10 +125,12 @@ class Minify_Cache_APC implements Minify_CacheInterface {
$ret = apc_fetch($id);
if (false === $ret) {
$this->_id = null;
return false;
}
list($this->_lm, $this->_data) = explode('|', $ret, 2);
$this->_id = $id;
return true;
}
}

35
lib/Minify/Cache/File.php
View File

@@ -1,11 +1,11 @@
<?php
/**
* Class Minify_Cache_File
* Class Minify_Cache_File
* @package Minify
*/
class Minify_Cache_File implements Minify_CacheInterface {
public function __construct($path = '', $fileLocking = false)
{
if (! $path) {
@@ -19,9 +19,9 @@ class Minify_Cache_File implements Minify_CacheInterface {
* Write data to cache.
*
* @param string $id cache id (e.g. a filename)
*
*
* @param string $data
*
*
* @return bool success
*/
public function store($id, $data)
@@ -37,38 +37,41 @@ class Minify_Cache_File implements Minify_CacheInterface {
if ($data !== $this->fetch($id)) {
@unlink($file);
$this->_log("Minify_Cache_File: Post-write read failed for '$file'");
return false;
}
return true;
}
/**
* Get the size of a cache entry
*
* @param string $id cache id (e.g. a filename)
*
*
* @return int size in bytes
*/
public function getSize($id)
{
return filesize($this->_path . '/' . $id);
}
/**
* Does a valid cache entry exist?
*
* @param string $id cache id (e.g. a filename)
*
*
* @param int $srcMtime mtime of the original source file(s)
*
*
* @return bool exists
*/
public function isValid($id, $srcMtime)
{
$file = $this->_path . '/' . $id;
return (is_file($file) && (filemtime($file) >= $srcMtime));
}
/**
* Send the cached content to output
*
@@ -83,15 +86,15 @@ class Minify_Cache_File implements Minify_CacheInterface {
flock($fp, LOCK_UN);
fclose($fp);
} else {
readfile($this->_path . '/' . $id);
readfile($this->_path . '/' . $id);
}
}
/**
* Fetch the cached content
*
* @param string $id cache id (e.g. a filename)
*
*
* @return string
*/
public function fetch($id)
@@ -105,12 +108,13 @@ class Minify_Cache_File implements Minify_CacheInterface {
$ret = stream_get_contents($fp);
flock($fp, LOCK_UN);
fclose($fp);
return $ret;
} else {
return file_get_contents($this->_path . '/' . $id);
}
}
/**
* Fetch the cache path used
*
@@ -140,6 +144,7 @@ class Minify_Cache_File implements Minify_CacheInterface {
: self::_tmp();
$tmp = rtrim($tmp, DIRECTORY_SEPARATOR);
}
return $tmp;
}
@@ -191,7 +196,7 @@ class Minify_Cache_File implements Minify_CacheInterface {
{
Minify_Logger::log($msg);
}
private $_path = null;
private $_locking = null;
}

43
lib/Minify/Cache/Memcache.php
View File

@@ -6,7 +6,7 @@
/**
* Memcache-based cache class for Minify
*
*
* <code>
* // fall back to disk caching if memcache can't connect
* $memcache = new Memcache;
@@ -18,13 +18,13 @@
* </code>
**/
class Minify_Cache_Memcache implements Minify_CacheInterface {
/**
* Create a Minify_Cache_Memcache object, to be passed to
* Create a Minify_Cache_Memcache object, to be passed to
* Minify::setCache().
*
* @param Memcache $memcache already-connected instance
*
*
* @param int $expire seconds until expiration (default = 0
* meaning the item will not get an expiration date)
*/
@@ -33,26 +33,26 @@ class Minify_Cache_Memcache implements Minify_CacheInterface {
$this->_mc = $memcache;
$this->_exp = $expire;
}
/**
* Write data to cache.
*
* @param string $id cache id
*
*
* @param string $data
*
*
* @return bool success
*/
public function store($id, $data)
{
return $this->_mc->set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", 0, $this->_exp);
}
/**
* Get the size of a cache entry
*
* @param string $id cache id
*
*
* @return int size in bytes
*/
public function getSize($id)
@@ -60,25 +60,26 @@ class Minify_Cache_Memcache implements Minify_CacheInterface {
if (! $this->_fetch($id)) {
return false;
}
return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
? mb_strlen($this->_data, '8bit')
: strlen($this->_data);
}
/**
* Does a valid cache entry exist?
*
* @param string $id cache id
*
*
* @param int $srcMtime mtime of the original source file(s)
*
*
* @return bool exists
*/
public function isValid($id, $srcMtime)
{
return ($this->_fetch($id) && ($this->_lm >= $srcMtime));
}
/**
* Send the cached content to output
*
@@ -90,12 +91,12 @@ class Minify_Cache_Memcache implements Minify_CacheInterface {
? $this->_data
: '';
}
/**
* Fetch the cached content
*
* @param string $id cache id
*
*
* @return string
*/
public function fetch($id)
@@ -104,20 +105,20 @@ class Minify_Cache_Memcache implements Minify_CacheInterface {
? $this->_data
: '';
}
private $_mc = null;
private $_exp = null;
// cache of most recently fetched id
private $_lm = null;
private $_data = null;
private $_id = null;
/**
* Fetch data and timestamp from memcache, store in instance
*
*
* @param string $id
*
*
* @return bool success
*/
private function _fetch($id)
@@ -128,10 +129,12 @@ class Minify_Cache_Memcache implements Minify_CacheInterface {
$ret = $this->_mc->get($id);
if (false === $ret) {
$this->_id = null;
return false;
}
list($this->_lm, $this->_data) = explode('|', $ret, 2);
$this->_id = $id;
return true;
}
}

23
lib/Minify/Cache/WinCache.php
View File

@@ -6,11 +6,11 @@
/**
* WinCache-based cache class for Minify
*
*
* <code>
* Minify::setCache(new Minify_Cache_WinCache());
* </code>
*
*
* @package Minify
* @author Matthias Fax
**/
@@ -32,7 +32,7 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
}
$this->_exp = $expire;
}
/**
* Write data to cache.
*
@@ -46,7 +46,7 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
{
return wincache_ucache_set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", $this->_exp);
}
/**
* Get the size of a cache entry
*
@@ -59,9 +59,10 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
if (!$this->_fetch($id)) {
return false;
}
return (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) ? mb_strlen($this->_data, '8bit') : strlen($this->_data);
}
/**
* Does a valid cache entry exist?
*
@@ -75,7 +76,7 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
{
return ($this->_fetch($id) && ($this->_lm >= $srcMtime));
}
/**
* Send the cached content to output
*
@@ -85,7 +86,7 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
{
echo $this->_fetch($id) ? $this->_data : '';
}
/**
* Fetch the cached content
*
@@ -97,14 +98,14 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
{
return $this->_fetch($id) ? $this->_data : '';
}
private $_exp = NULL;
// cache of most recently fetched id
private $_lm = NULL;
private $_data = NULL;
private $_id = NULL;
/**
* Fetch data and timestamp from WinCache, store in instance
*
@@ -121,10 +122,12 @@ class Minify_Cache_WinCache implements Minify_CacheInterface
$ret = wincache_ucache_get($id, $suc);
if (!$suc) {
$this->_id = NULL;
return false;
}
list($this->_lm, $this->_data) = explode('|', $ret, 2);
$this->_id = $id;
return true;
}
}

3
lib/Minify/Cache/XCache.php
View File

@@ -54,6 +54,7 @@ class Minify_Cache_XCache implements Minify_CacheInterface {
if (! $this->_fetch($id)) {
return false;
}
return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
? mb_strlen($this->_data, '8bit')
: strlen($this->_data);
@@ -117,10 +118,12 @@ class Minify_Cache_XCache implements Minify_CacheInterface {
$ret = xcache_get($id);
if (false === $ret) {
$this->_id = null;
return false;
}
list($this->_lm, $this->_data) = explode('|', $ret, 2);
$this->_id = $id;
return true;
}
}

10
lib/Minify/Cache/ZendPlatform.php
View File

@@ -4,12 +4,11 @@
* @package Minify
*/
/**
* ZendPlatform-based cache class for Minify
*
* Based on Minify_Cache_APC, uses output_cache_get/put (currently deprecated)
*
*
* <code>
* Minify::setCache(new Minify_Cache_ZendPlatform());
* </code>
@@ -19,7 +18,6 @@
*/
class Minify_Cache_ZendPlatform implements Minify_CacheInterface {
/**
* Create a Minify_Cache_ZendPlatform object, to be passed to
* Minify::setCache().
@@ -33,7 +31,6 @@ class Minify_Cache_ZendPlatform implements Minify_CacheInterface {
$this->_exp = $expire;
}
/**
* Write data to cache.
*
@@ -48,7 +45,6 @@ class Minify_Cache_ZendPlatform implements Minify_CacheInterface {
return output_cache_put($id, "{$_SERVER['REQUEST_TIME']}|{$data}");
}
/**
* Get the size of a cache entry
*
@@ -75,6 +71,7 @@ class Minify_Cache_ZendPlatform implements Minify_CacheInterface {
public function isValid($id, $srcMtime)
{
$ret = ($this->_fetch($id) && ($this->_lm >= $srcMtime));
return $ret;
}
@@ -90,7 +87,6 @@ class Minify_Cache_ZendPlatform implements Minify_CacheInterface {
: '';
}
/**
* Fetch the cached content
*
@@ -127,10 +123,12 @@ class Minify_Cache_ZendPlatform implements Minify_CacheInterface {
$ret = output_cache_get($id, $this->_exp);
if (false === $ret) {
$this->_id = null;
return false;
}
list($this->_lm, $this->_data) = explode('|', $ret, 2);
$this->_id = $id;
return true;
}
}