dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "WebInstaller::setVarsFromRequest() do not trim passwords"
[lhc/web/wiklou.git]
/
includes
/
UserArrayFromResult.php
diff --git
a/includes/UserArrayFromResult.php
b/includes/UserArrayFromResult.php
index
5d5859d
..
dd67acd
100644
(file)
--- a/
includes/UserArrayFromResult.php
+++ b/
includes/UserArrayFromResult.php
@@
-21,15
+21,17
@@
*/
class UserArrayFromResult extends UserArray implements Countable {
*/
class UserArrayFromResult extends UserArray implements Countable {
+ /** @var ResultWrapper */
+ public $res;
- /**
- * @var ResultWrapper
- */
- var $res;
-
var $key,
$current;
+ /**
@var int */
+ public $key;
+
+ /** @var */
+
public
$current;
/**
/**
- * @param
$res ResultWrapper
+ * @param
ResultWrapper $res
*/
function __construct( $res ) {
$this->res = $res;
*/
function __construct( $res ) {
$this->res = $res;
@@
-38,7
+40,7
@@
class UserArrayFromResult extends UserArray implements Countable {
}
/**
}
/**
- * @param $row
+ * @param
bool|stdClass
$row
* @return void
*/
protected function setCurrent( $row ) {
* @return void
*/
protected function setCurrent( $row ) {