jenkins-bot has submitted this change and it was merged.
Change subject: Declare visibility for class properties in DatabaseUtility.php
......................................................................
Declare visibility for class properties in DatabaseUtility.php
Change-Id: I8143286baec89592e2de894be1755e0e8766ea6f
---
M includes/db/DatabaseUtility.php
1 file changed, 24 insertions(+), 6 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php
index de5be08..5451e98 100644
--- a/includes/db/DatabaseUtility.php
+++ b/includes/db/DatabaseUtility.php
@@ -51,6 +51,7 @@
* This allows us to distinguish a blob from a normal string and an array of
strings
*/
class Blob {
+ /** @var string */
private $mData;
function __construct( $data ) {
@@ -97,13 +98,23 @@
* @ingroup Database
*/
class ResultWrapper implements Iterator {
- var $db, $result, $pos = 0, $currentRow = null;
+ /** @var resource */
+ public $result;
+
+ /** @var DatabaseBase */
+ protected $db;
+
+ /** @var int */
+ protected $pos = 0;
+
+ /** @var */
+ protected $currentRow = null;
/**
* Create a new result object from a result resource and a Database
object
*
* @param DatabaseBase $database
- * @param resource $result
+ * @param resource|ResultWrapper $result
*/
function __construct( $database, $result ) {
$this->db = $database;
@@ -221,10 +232,17 @@
* doesn't go anywhere near an actual database.
*/
class FakeResultWrapper extends ResultWrapper {
- var $result = array();
- var $db = null; // And it's going to stay that way :D
- var $pos = 0;
- var $currentRow = null;
+ /** @var array */
+ public $result = array();
+
+ /** @var null And it's going to stay that way :D */
+ protected $db = null;
+
+ /** @var int */
+ protected $pos = 0;
+
+ /** @var array|stdClass|bool */
+ protected $currentRow = null;
function __construct( $array ) {
$this->result = $array;
--
To view, visit https://gerrit.wikimedia.org/r/103873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8143286baec89592e2de894be1755e0e8766ea6f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
