Merge "Enable "PhanTypeInvalidRightOperand" phan checks"

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index aab8811..5066f28 100644 (file)
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -17,6 +17,9 @@ abstract class HTMLFormField {
        protected $mVFormClass = '';
        protected $mHelpClass = false;
        protected $mDefault;
+       /**
+        * @var array|bool|null
+        */
        protected $mOptions = false;
        protected $mOptionsLabelsNotFromMessage = false;
        protected $mHideIf = null;

diff --git a/includes/libs/ReplacementArray.php b/includes/libs/ReplacementArray.php
index 4512a4b..46f9358 100644 (file)
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -22,14 +22,14 @@
  * Wrapper around strtr() that holds replacements
  */
 class ReplacementArray {
-       private $data = false;
+       private $data = [];
 
        /**
         * Create an object with the specified replacement array
         * The array should have the same form as the replacement array for strtr()
         * @param array $data
         */
-       public function __construct( $data = [] ) {
+       public function __construct( array $data = [] ) {
                $this->data = $data;
        }
 
@@ -44,12 +44,12 @@ class ReplacementArray {
         * Set the whole replacement array at once
         * @param array $data
         */
-       public function setArray( $data ) {
+       public function setArray( array $data ) {
                $this->data = $data;
        }
 
        /**
-        * @return array|bool
+        * @return array
         */
        public function getArray() {
                return $this->data;

diff --git a/tests/phan/config.php b/tests/phan/config.php
index bebdd3d..d9ce429 100644 (file)
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -329,8 +329,6 @@ return [
                "PhanTypeComparisonFromArray",
                // approximate error count: 2
                "PhanTypeComparisonToArray",
-               // approximate error count: 3
-               "PhanTypeInvalidRightOperand",
                // approximate error count: 1
                "PhanTypeMagicVoidWithReturn",
                // approximate error count: 218