forked from GNUsocial/gnu-social
The overloaded DB_DataObject function staticGet is now called getKV
I used this hacky sed-command (run it from your GNU Social root, or change the first grep's path to where it actually lies) to do a rough fix on all ::staticGet calls and rename them to ::getKV sed -i -s -e '/DataObject::staticGet/I!s/::staticGet/::getKV/Ig' $(grep -R ::staticGet `pwd`/* | grep -v -e '^extlib' | grep -v DataObject:: |grep -v "function staticGet"|cut -d: -f1 |sort |uniq) If you're applying this, remember to change the Managed_DataObject and Memcached_DataObject function definitions of staticGet to getKV! This might of course take some getting used to, or modification fo StatusNet plugins, but the result is that all the static calls (to staticGet) are now properly made without breaking PHP Strict Standards. Standards are there to be followed (and they caused some very bad confusion when used with get_called_class) Reasonably any plugin or code that tests for the definition of 'GNUSOCIAL' or similar will take this change into consideration.
This commit is contained in:
@@ -30,7 +30,7 @@ class Memcached_DataObject extends Safe_DataObject
|
||||
* @param mixed $v key field value, or leave out for primary key lookup
|
||||
* @return mixed Memcached_DataObject subtype or false
|
||||
*/
|
||||
static function staticGet($cls, $k, $v=null)
|
||||
static function getKV($cls, $k, $v=null)
|
||||
{
|
||||
if (is_null($v)) {
|
||||
$v = $k;
|
||||
@@ -350,7 +350,7 @@ class Memcached_DataObject extends Safe_DataObject
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo FIXME: Should this return false on lookup fail to match staticGet?
|
||||
* @todo FIXME: Should this return false on lookup fail to match getKV?
|
||||
*/
|
||||
function pkeyGet($cls, $kv)
|
||||
{
|
||||
@@ -680,7 +680,7 @@ class Memcached_DataObject extends Safe_DataObject
|
||||
'delete',
|
||||
'update',
|
||||
'find');
|
||||
$ignoreStatic = array('staticGet',
|
||||
$ignoreStatic = array('getKV',
|
||||
'pkeyGet',
|
||||
'cachedQuery');
|
||||
$here = get_class($this); // if we get confused
|
||||
|
||||
Reference in New Issue
Block a user