From d7c2c98a0253be02357688ee374322ea901c2b70 Mon Sep 17 00:00:00 2001 From: Miguel Dantas Date: Tue, 13 Aug 2019 03:02:05 +0100 Subject: [PATCH] [PLUGINS] Removed direct call of EndCache events on all plugins, as it is now handled by the library --- plugins/DiskCache/DiskCachePlugin.php | 5 ----- plugins/InProcessCache/InProcessCachePlugin.php | 1 - plugins/Memcache/MemcachePlugin.php | 5 ----- plugins/Memcached/MemcachedPlugin.php | 5 ----- 4 files changed, 16 deletions(-) diff --git a/plugins/DiskCache/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php index 3e224253dd..39c2c59889 100644 --- a/plugins/DiskCache/DiskCachePlugin.php +++ b/plugins/DiskCache/DiskCachePlugin.php @@ -76,7 +76,6 @@ class DiskCachePlugin extends Plugin } } - Event::handle('EndCacheGet', array($key, &$value)); return false; } @@ -137,9 +136,6 @@ class DiskCachePlugin extends Plugin return false; } - Event::handle('EndCacheSet', array($key, $value, $flag, - $expiry)); - return false; } @@ -159,7 +155,6 @@ class DiskCachePlugin extends Plugin unlink($filename); } - Event::handle('EndCacheDelete', array($key)); return false; } diff --git a/plugins/InProcessCache/InProcessCachePlugin.php b/plugins/InProcessCache/InProcessCachePlugin.php index d3e56f4123..f108c1dbe9 100644 --- a/plugins/InProcessCache/InProcessCachePlugin.php +++ b/plugins/InProcessCache/InProcessCachePlugin.php @@ -98,7 +98,6 @@ class InProcessCachePlugin extends Plugin } else { $this->_hits[$key] = 1; } - Event::handle('EndCacheGet', array($key, &$value)); return false; } return true; diff --git a/plugins/Memcache/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php index 1d85386a2d..f50fa2d176 100644 --- a/plugins/Memcache/MemcachePlugin.php +++ b/plugins/Memcache/MemcachePlugin.php @@ -105,7 +105,6 @@ class MemcachePlugin extends Plugin { $this->_ensureConn(); $value = $this->_conn->get($key); - Event::handle('EndCacheGet', array($key, &$value)); return false; } @@ -127,8 +126,6 @@ class MemcachePlugin extends Plugin $expiry = $this->defaultExpiry; } $success = $this->_conn->set($key, $value, $this->flag(intval($flag)), $expiry); - Event::handle('EndCacheSet', array($key, $value, $flag, - $expiry)); return false; } @@ -146,7 +143,6 @@ class MemcachePlugin extends Plugin { $this->_ensureConn(); $value = $this->_conn->increment($key, $step); - Event::handle('EndCacheIncrement', array($key, $step, $value)); return false; } @@ -162,7 +158,6 @@ class MemcachePlugin extends Plugin { $this->_ensureConn(); $success = $this->_conn->delete($key); - Event::handle('EndCacheDelete', array($key)); return false; } diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php index 061e43469e..25ca4ca77b 100644 --- a/plugins/Memcached/MemcachedPlugin.php +++ b/plugins/Memcached/MemcachedPlugin.php @@ -91,7 +91,6 @@ class MemcachedPlugin extends Plugin { $this->_ensureConn(); $value = $this->_conn->get($key); - Event::handle('EndCacheGet', array($key, &$value)); return false; } @@ -113,8 +112,6 @@ class MemcachedPlugin extends Plugin $expiry = $this->defaultExpiry; } $success = $this->_conn->set($key, $value, $expiry); - Event::handle('EndCacheSet', array($key, $value, $flag, - $expiry)); return false; } @@ -132,7 +129,6 @@ class MemcachedPlugin extends Plugin { $this->_ensureConn(); $value = $this->_conn->increment($key, $step); - Event::handle('EndCacheIncrement', array($key, $step, $value)); return false; } @@ -148,7 +144,6 @@ class MemcachedPlugin extends Plugin { $this->_ensureConn(); $success = $this->_conn->delete($key); - Event::handle('EndCacheDelete', array($key)); return false; }