From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 7 Apr 2019 09:13:15 +0000 (+0000)
Subject: Merge "Fix phan errors by improving documentation (#10)"
X-Git-Tag: 1.34.0-rc.0~2113
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=682fb5758c79ce485b301d11db46c22344deef49;hp=be221363ecb0901f5b4580b3ee41dd167ff8089e;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix phan errors by improving documentation (#10)"
---

diff --git a/.phan/config.php b/.phan/config.php
index c250bcd7ee..c754480e87 100644
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -99,8 +99,6 @@ $cfg['suppress_issue_types'] = array_merge( $cfg['suppress_issue_types'], [
 	"PhanTypeComparisonFromArray",
 	// approximate error count: 2
 	"PhanTypeComparisonToArray",
-	// approximate error count: 7
-	"PhanTypeExpectedObjectPropAccess",
 	// approximate error count: 63
 	"PhanTypeInvalidDimOffset",
 	// approximate error count: 6
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index c5ef758ea6..ba97887f71 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -104,7 +104,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 	/** @var callable Deprecation logging callback */
 	protected $deprecationLogger;
 
-	/** @var resource|null Database connection */
+	/** @var object|resource|null Database connection */
 	protected $conn = null;
 	/** @var bool */
 	protected $opened = false;
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 3bcd012f4f..4ed6b791fe 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -858,6 +858,9 @@ class PPDStack {
 		return $this->accum;
 	}
 
+	/**
+	 * @return bool|PPDPart
+	 */
 	public function getCurrentPart() {
 		if ( $this->top === false ) {
 			return false;
@@ -970,6 +973,9 @@ class PPDStackElement {
 		$this->parts[] = new $class( $s );
 	}
 
+	/**
+	 * @return PPDPart
+	 */
 	public function getCurrentPart() {
 		return $this->parts[count( $this->parts ) - 1];
 	}