diff --git a/mod/wiki/editors/wikieditor.php b/mod/wiki/editors/wikieditor.php
index e18dd7674f3..36e41b83313 100644
--- a/mod/wiki/editors/wikieditor.php
+++ b/mod/wiki/editors/wikieditor.php
@@ -37,6 +37,9 @@ class MoodleQuickForm_wikieditor extends MoodleQuickForm_textarea {
 
     private $files;
 
+    /** @var string */
+    protected $wikiformat;
+
     /**
      * Constructor
      *
diff --git a/mod/wiki/editors/wikifiletable.php b/mod/wiki/editors/wikifiletable.php
index fffaf4b25ee..37f3f655a8d 100644
--- a/mod/wiki/editors/wikifiletable.php
+++ b/mod/wiki/editors/wikifiletable.php
@@ -37,6 +37,9 @@ class MoodleQuickForm_wikifiletable extends HTML_QuickForm_element {
     private $_fileinfo;
     private $_value = array();
 
+    /** @var string */
+    protected $_format;
+
     public function __construct($elementName = null, $elementLabel = null, $attributes = null, $fileinfo = null, $format = null) {
 
         parent::__construct($elementName, $elementLabel, $attributes);
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index 535ad17c5c7..b35b1cbf1f8 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -1464,6 +1464,9 @@ class page_wiki_map extends page_wiki {
      */
     private $view;
 
+    /** @var renderer_base */
+    protected $output;
+
     function print_header() {
         parent::print_header();
         $this->print_pagetitle();
@@ -1994,9 +1997,7 @@ class page_wiki_deletecomment extends page_wiki {
     }
 
     public function set_action($action, $commentid, $content) {
-        $this->action = $action;
         $this->commentid = $commentid;
-        $this->content = $content;
     }
 
     protected function create_navbar() {
diff --git a/mod/wiki/tests/externallib_test.php b/mod/wiki/tests/externallib_test.php
index 06d928c2fd0..e8d0775a5ad 100644
--- a/mod/wiki/tests/externallib_test.php
+++ b/mod/wiki/tests/externallib_test.php
@@ -38,6 +38,111 @@ require_once($CFG->dirroot . '/mod/wiki/lib.php');
  */
 class externallib_test extends externallib_advanced_testcase {
 
+    /** @var \stdClass course record. */
+    protected $course;
+
+    /** @var \stdClass activity record. */
+    protected $wiki;
+
+    /** @var \stdClass activity record. */
+    protected $wikisep;
+
+    /** @var \stdClass activity record. */
+    protected $wikivis;
+
+    /** @var \stdClass activity record. */
+    protected $wikisepind;
+
+    /** @var \stdClass activity record. */
+    protected $wikivisind;
+
+    /** @var \context_module context instance. */
+    protected $context;
+
+    /** @var \StdClass */
+    protected $cm;
+
+    /** @var \stdClass user record. */
+    protected $student;
+
+    /** @var \stdClass user record. */
+    protected $student2;
+
+    /** @var \stdClass user record. */
+    protected $teacher;
+
+    /** @var mixed a fieldset object, false or exception if error not found. */
+    protected $studentrole;
+
+    /** @var mixed a fieldset object, false or exception if error not found. */
+    protected $teacherrole;
+
+    /** @var \stdClass first page. */
+    protected $firstpage;
+
+    /** @var \stdClass group record */
+    protected $group1;
+
+    /** @var \stdClass group record */
+    protected $group2;
+
+    /** @var \stdClass first page. */
+    protected $fpsepg1;
+
+    /** @var \stdClass first page. */
+    protected $fpsepg2;
+
+    /** @var \stdClass first page. */
+    protected $fpsepall;
+
+    /** @var \stdClass first page. */
+    protected $fpvisg1;
+
+    /** @var \stdClass first page. */
+    protected $fpvisg2;
+
+    /** @var \stdClass first page. */
+    protected $fpvisall;
+
+    /** @var \stdClass first page. */
+    protected $fpsepg1indt;
+
+    /** @var \stdClass first page. */
+    protected $fpsepg2indt;
+
+    /** @var \stdClass first page. */
+    protected $fpsepallindt;
+
+    /** @var \stdClass first page. */
+    protected $fpvisg1indt;
+
+    /** @var \stdClass first page. */
+    protected $fpvisg2indt;
+
+    /** @var \stdClass first page. */
+    protected $fpvisallindt;
+
+    /** @var \stdClass first page. */
+    protected $fpsepg1indstu;
+
+    /** @var \stdClass first page. */
+    protected $fpvisg1indstu;
+
+    /** @var \stdClass first page. */
+    protected $fpsepg1indstu2;
+
+    /** @var \stdClass first page. */
+    protected $fpvisg1indstu2;
+
+    /** @var \stdClass user record. */
+    protected $studentnotincourse;
+
+    /** @var \stdClass course record. */
+    protected $anothercourse;
+
+    /** @var \stdClass group record. */
+    protected $groupnotincourse;
+
     /**
      * Set up for every test
      */