getTaggedSub-stuff moved to Profile class

[quix0rs-gnu-social.git] / classes / Managed_DataObject.php

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 80210dc8a32179ca3fdc98f9a346f229c086ce66..d17552212b173dbbb55b28365eebddc9e349da7a 100644 (file)
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -28,7 +28,10 @@ abstract class Managed_DataObject extends Memcached_DataObject
     /**
      * The One True Thingy that must be defined and declared.
      */
-    public static abstract function schemaDef();
+    public static function schemaDef()
+    {
+        throw new MethodNotImplementedException(__METHOD__);
+    }
 
     /**
      * Get an instance by key
@@ -108,7 +111,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
     }
 
     /**
-     * Get a multi-instance object in an array
+     * Get a multi-instance object separated into an array
      *
      * This is a utility method to get multiple instances with a given set of
      * values for a specific key column. Usually used for the primary key when
@@ -131,7 +134,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
      * @access public
      * @return array (associative)
      */
-    function table()
+    public function table()
     {
         $table = static::schemaDef();
         return array_map(array($this, 'columnBitmap'), $table['fields']);
@@ -161,7 +164,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
     function sequenceKey()
     {
-        $table = call_user_func(array(get_class($this), 'schemaDef'));
+        $table = static::schemaDef();
         foreach ($table['fields'] as $name => $column) {
             if ($column['type'] == 'serial') {
                 // We have a serial/autoincrement column.
@@ -185,7 +188,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
     function keyTypes()
     {
-        $table = call_user_func(array(get_class($this), 'schemaDef'));
+        $table = static::schemaDef();
         $keys = array();
 
         if (!empty($table['unique keys'])) {
@@ -250,7 +253,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
     {
         $links = array();
 
-        $table = call_user_func(array(get_class($this), 'schemaDef'));
+        $table = static::schemaDef();
 
         foreach ($table['foreign keys'] as $keyname => $keydef) {
             if (count($keydef) == 2 && is_string($keydef[0]) && is_array($keydef[1]) && count($keydef[1]) == 1) {
@@ -271,7 +274,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
      */
     function _allCacheKeys()
     {
-        $table = call_user_func(array(get_class($this), 'schemaDef'));
+        $table = static::schemaDef();
         $ckeys = array();
 
         if (!empty($table['unique keys'])) {