Merge "Fix ChangeTags functions after split of definedTags from tagUsageStatistics"

[lhc/web/wiklou.git] / includes / db / DatabaseUtility.php

diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php
index 7ec3b4a..9a520ff 100644 (file)
--- a/includes/db/DatabaseUtility.php
+++ b/includes/db/DatabaseUtility.php
@@ -21,29 +21,6 @@
  * @ingroup Database
  */
 
-/**
- * Utility class.
- * @ingroup Database
- */
-class DBObject {
-       public $mData;
-
-       function __construct( $data ) {
-               $this->mData = $data;
-       }
-
-       /**
-        * @return bool
-        */
-       function isLOB() {
-               return false;
-       }
-
-       function data() {
-               return $this->mData;
-       }
-}
-
 /**
  * Utility class
  * @ingroup Database
@@ -192,7 +169,7 @@ class ResultWrapper implements Iterator {
        }
 
        /**
-        * @return stdClass|array|false
+        * @return stdClass|array|bool
         */
        function current() {
                if ( is_null( $this->currentRow ) ) {
@@ -281,7 +258,7 @@ class FakeResultWrapper extends ResultWrapper {
 
        /**
         * Callers want to be able to access fields with $this->fieldName
-        * @return false|stdClass
+        * @return bool|stdClass
         */
        function fetchObject() {
                $this->fetchRow();
@@ -298,7 +275,7 @@ class FakeResultWrapper extends ResultWrapper {
        }
 
        /**
-        * @return false|stdClass
+        * @return bool|stdClass
         */
        function next() {
                return $this->fetchObject();
@@ -339,4 +316,8 @@ class LikeMatch {
  * The implementation details of this opaque type are up to the database subclass.
  */
 interface DBMasterPos {
+       /**
+        * @return float UNIX timestamp
+        */
+       public function asOfTime();
 }