From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 26 Dec 2013 23:23:15 +0000 (+0100)
Subject: Declare visibility for class properties in DatabaseUtility.php
X-Git-Tag: 1.31.0-rc.0~17469^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f6233ca64ac470e6bf4d2b8dd7464775e68b70c4;p=lhc%2Fweb%2Fwiklou.git

Declare visibility for class properties in DatabaseUtility.php

Change-Id: I8143286baec89592e2de894be1755e0e8766ea6f
---

diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php
index de5be08811..5451e987f2 100644
--- a/includes/db/DatabaseUtility.php
+++ b/includes/db/DatabaseUtility.php
@@ -51,6 +51,7 @@ class DBObject {
  * 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 @@ interface Field {
  * @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 @@ class ResultWrapper implements Iterator {
  * 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;