GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

is_a() with 3 params only supported in 5.3.9 anyway

Browse Source 
So I removed those safety-checks, because now we can assume it works.
This commit is contained in:
Mikael Nordfeldth 2013-10-04 23:10:59 +02:00
parent 636a8fcaf5
commit 597eb97bec
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
classes/Memcached_DataObject.php
View File

@ -32,9 +32,6 @@ class Memcached_DataObject extends Safe_DataObject
*/ */
static function getClassKV($cls, $k, $v=null) static function getClassKV($cls, $k, $v=null)
{ {
if (!is_a($cls, __CLASS__, true)) {
throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
}
if (is_null($v)) { if (is_null($v)) {
$v = $k; $v = $k;
$keys = self::pkeyCols($cls); $keys = self::pkeyCols($cls);
@ -105,9 +102,6 @@ class Memcached_DataObject extends Safe_DataObject
*/ */
static function pivotGetClass($cls, $keyCol, array $keyVals, array $otherCols = array()) static function pivotGetClass($cls, $keyCol, array $keyVals, array $otherCols = array())
{ {
if (!is_a($cls, __CLASS__, true)) {
throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
}
if (is_array($keyCol)) { if (is_array($keyCol)) {
foreach ($keyVals as $keyVal) { foreach ($keyVals as $keyVal) {
$result[implode(',', $keyVal)] = null; $result[implode(',', $keyVal)] = null;
@ -246,9 +240,6 @@ class Memcached_DataObject extends Safe_DataObject
static function pkeyCols($cls) static function pkeyCols($cls)
{ {
if (!is_a($cls, __CLASS__, true)) {
throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
}
$i = new $cls; $i = new $cls;
$types = $i->keyTypes(); $types = $i->keyTypes();
ksort($types); ksort($types);
@ -266,10 +257,6 @@ class Memcached_DataObject extends Safe_DataObject
static function listFindClass($cls, $keyCol, array $keyVals) static function listFindClass($cls, $keyCol, array $keyVals)
{ {
if (!is_a($cls, __CLASS__, true)) {
throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
}
$i = new $cls; $i = new $cls;
$i->whereAddIn($keyCol, $keyVals, $i->columnType($keyCol)); $i->whereAddIn($keyCol, $keyVals, $i->columnType($keyCol));
if (!$i->find()) { if (!$i->find()) {
@ -281,9 +268,6 @@ class Memcached_DataObject extends Safe_DataObject
static function listGetClass($cls, $keyCol, array $keyVals) static function listGetClass($cls, $keyCol, array $keyVals)
{ {
if (!is_a($cls, __CLASS__, true)) {
throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
}
$pkeyMap = array_fill_keys($keyVals, array()); $pkeyMap = array_fill_keys($keyVals, array());
$result = array_fill_keys($keyVals, array()); $result = array_fill_keys($keyVals, array());
@ -366,9 +350,6 @@ class Memcached_DataObject extends Safe_DataObject
*/ */
static function pkeyGetClass($cls, array $kv) static function pkeyGetClass($cls, array $kv)
{ {
if (!is_a($cls, __CLASS__, true)) {
throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
}
$i = Memcached_DataObject::multicache($cls, $kv); $i = Memcached_DataObject::multicache($cls, $kv);
if ($i !== false) { // false == cache miss if ($i !== false) { // false == cache miss
return $i; return $i;