From 597eb97bec51dce7f565d29efb1053a6d56b360c Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 4 Oct 2013 23:10:59 +0200 Subject: [PATCH] is_a() with 3 params only supported in 5.3.9 anyway So I removed those safety-checks, because now we can assume it works. --- classes/Memcached_DataObject.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 03c0b8a523..0df9164b40 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -32,9 +32,6 @@ class Memcached_DataObject extends Safe_DataObject */ 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)) { $v = $k; $keys = self::pkeyCols($cls); @@ -105,9 +102,6 @@ class Memcached_DataObject extends Safe_DataObject */ 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)) { foreach ($keyVals as $keyVal) { $result[implode(',', $keyVal)] = null; @@ -246,9 +240,6 @@ class Memcached_DataObject extends Safe_DataObject 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; $types = $i->keyTypes(); ksort($types); @@ -266,10 +257,6 @@ class Memcached_DataObject extends Safe_DataObject 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->whereAddIn($keyCol, $keyVals, $i->columnType($keyCol)); if (!$i->find()) { @@ -281,9 +268,6 @@ class Memcached_DataObject extends Safe_DataObject 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()); $result = array_fill_keys($keyVals, array()); @@ -366,9 +350,6 @@ class Memcached_DataObject extends Safe_DataObject */ 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); if ($i !== false) { // false == cache miss return $i;