Merge "parser: inject the time for {{REVISIONTIMESTAMP}} on pre-save parse"

[lhc/web/wiklou.git] / includes / libs / rdbms / database / resultwrapper / MssqlResultWrapper.php

diff --git a/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php b/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php
index 768511b..ba79be1 100644 (file)
--- a/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php
+++ b/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php
@@ -1,7 +1,12 @@
 <?php
+
+namespace Wikimedia\Rdbms;
+
+use stdClass;
+
 class MssqlResultWrapper extends ResultWrapper {
-       /** @var integer|null */
-       private $mSeekTo = null;
+       /** @var int|null */
+       private $seekTo = null;
 
        /**
         * @return stdClass|bool
@@ -9,15 +14,15 @@ class MssqlResultWrapper extends ResultWrapper {
        public function fetchObject() {
                $res = $this->result;
 
-               if ( $this->mSeekTo !== null ) {
-                       $result = sqlsrv_fetch_object( $res, 'stdClass', [],
-                               SQLSRV_SCROLL_ABSOLUTE, $this->mSeekTo );
-                       $this->mSeekTo = null;
+               if ( $this->seekTo !== null ) {
+                       $result = sqlsrv_fetch_object( $res, stdClass::class, [],
+                               SQLSRV_SCROLL_ABSOLUTE, $this->seekTo );
+                       $this->seekTo = null;
                } else {
                        $result = sqlsrv_fetch_object( $res );
                }
 
-               // MediaWiki expects us to return boolean false when there are no more rows instead of null
+               // Return boolean false when there are no more rows instead of null
                if ( $result === null ) {
                        return false;
                }
@@ -31,15 +36,15 @@ class MssqlResultWrapper extends ResultWrapper {
        public function fetchRow() {
                $res = $this->result;
 
-               if ( $this->mSeekTo !== null ) {
+               if ( $this->seekTo !== null ) {
                        $result = sqlsrv_fetch_array( $res, SQLSRV_FETCH_BOTH,
-                               SQLSRV_SCROLL_ABSOLUTE, $this->mSeekTo );
-                       $this->mSeekTo = null;
+                               SQLSRV_SCROLL_ABSOLUTE, $this->seekTo );
+                       $this->seekTo = null;
                } else {
                        $result = sqlsrv_fetch_array( $res );
                }
 
-               // MediaWiki expects us to return boolean false when there are no more rows instead of null
+               // Return boolean false when there are no more rows instead of null
                if ( $result === null ) {
                        return false;
                }
@@ -65,7 +70,7 @@ class MssqlResultWrapper extends ResultWrapper {
                }
 
                // Unlike MySQL, the seek actually happens on the next access
-               $this->mSeekTo = $row;
+               $this->seekTo = $row;
                return true;
        }
 }