[Travis] update phan version to 3.0 and fix the phan issues (aces#7101)

Upgrade phan and fix issues so that composer 2.0 can be used with our composer.lock file.
AlexandraLivadas · Jun 29, 2021 · 901cf25 · 901cf25
1 parent a65cd54
commit 901cf25
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,9 @@
         "phan/phan": "^2.4",
         "phpmd/phpmd": "~2.8",
         "phpstan/phpstan": "0.12.17",
-        "slevomat/coding-standard": "^6.0"
+        "slevomat/coding-standard": "^6.0",
+        "php-webdriver/webdriver" : "dev-main"
+
     },
     "scripts": {
       "pre-install-cmd": "mkdir -p project/libraries"

diff --git a/composer.lock b/composer.lock
diff --git a/modules/issue_tracker/php/uploadhelper.class.inc b/modules/issue_tracker/php/uploadhelper.class.inc
@@ -51,9 +51,9 @@ class UploadHelper
     /**
      * Setup uploading configurations.
      *
-     * @param object $user   The user uploading.
-     * @param array  $files  The $_FILES array content.
-     * @param array  $values The post message array content.
+     * @param \User $user   The user uploading.
+     * @param array $files  The $_FILES array content.
+     * @param array $values The post message array content.
      *
      * @return array (success|error) with a message for the frontend.
      */

diff --git a/php/libraries/NDB_BVL_Instrument_LINST.class.inc b/php/libraries/NDB_BVL_Instrument_LINST.class.inc
@@ -191,6 +191,7 @@ class NDB_BVL_Instrument_LINST extends \NDB_BVL_Instrument
             }
             if (!empty($this->XINRules[$elname])) {
                 $registered_rules = $this->XINRules[$elname];
+                '@phan-var array $registered_rules';
                 if ($this->XINDebug) {
                     //debugging code
                     echo "<p><b>$elname</b><br> ";