Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 6 insertions, 8 deletions

diff --git a/includes/db/ORMResult.php b/includes/db/ORMResult.php
index 160033c4..327d20d9 100644
--- a/includes/db/ORMResult.php
+++ b/includes/db/ORMResult.php
@@ -30,14 +30,13 @@
  */
 
 class ORMResult implements ORMIterator {
-
 	/**
 	 * @var ResultWrapper
 	 */
 	protected $res;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $key;
 
@@ -63,7 +62,7 @@ class ORMResult implements ORMIterator {
 	}
 
 	/**
-	 * @param $row
+	 * @param bool|object $row
 	 */
 	protected function setCurrent( $row ) {
 		if ( $row === false ) {
@@ -74,14 +73,14 @@ class ORMResult implements ORMIterator {
 	}
 
 	/**
-	 * @return integer
+	 * @return int
 	 */
 	public function count() {
 		return $this->res->numRows();
 	}
 
 	/**
-	 * @return boolean
+	 * @return bool
 	 */
 	public function isEmpty() {
 		return $this->res->numRows() === 0;
@@ -95,7 +94,7 @@ class ORMResult implements ORMIterator {
 	}
 
 	/**
-	 * @return integer
+	 * @return int
 	 */
 	public function key() {
 		return $this->key;
@@ -114,10 +113,9 @@ class ORMResult implements ORMIterator {
 	}
 
 	/**
-	 * @return boolean
+	 * @return bool
 	 */
 	public function valid() {
 		return $this->current !== false;
 	}
-
 }