From 8fa1810cecd72f2cbe7fda68c99b09a6b5d8c148 Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Wed, 20 Jul 2016 20:13:58 +0200
Subject: [PATCH 1/2] MDL-55278 search: Get rid of core_search\area namespace

---
 lib/db/renamedclasses.php                   | 3 +++
 search/classes/{area => }/base.php          | 2 +-
 search/classes/{area => }/base_activity.php | 2 +-
 search/classes/{area => }/base_mod.php      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename search/classes/{area => }/base.php (99%)
 rename search/classes/{area => }/base_activity.php (99%)
 rename search/classes/{area => }/base_mod.php (99%)

diff --git a/lib/db/renamedclasses.php b/lib/db/renamedclasses.php
index 537bcf8e84c..b12deba8919 100644
--- a/lib/db/renamedclasses.php
+++ b/lib/db/renamedclasses.php
@@ -37,4 +37,7 @@ defined('MOODLE_INTERNAL') || die();
 // The array must be called $renamedclasses.
 $renamedclasses = array(
     'core\progress\null' => 'core\progress\none',
+    'core_search\area\base' => 'core_search\base',
+    'core_search\area\base_mod' => 'core_search\base_mod',
+    'core_search\area\base_activity' => 'core_search\base_activity'
 );
diff --git a/search/classes/area/base.php b/search/classes/base.php
similarity index 99%
rename from search/classes/area/base.php
rename to search/classes/base.php
index 97cbc0d1d40..9b7180601c3 100644
--- a/search/classes/area/base.php
+++ b/search/classes/base.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core_search\area;
+namespace core_search;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/search/classes/area/base_activity.php b/search/classes/base_activity.php
similarity index 99%
rename from search/classes/area/base_activity.php
rename to search/classes/base_activity.php
index 0f1b3a5b5e1..b2fda829a01 100644
--- a/search/classes/area/base_activity.php
+++ b/search/classes/base_activity.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core_search\area;
+namespace core_search;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/search/classes/area/base_mod.php b/search/classes/base_mod.php
similarity index 99%
rename from search/classes/area/base_mod.php
rename to search/classes/base_mod.php
index 288cb1a728f..61eadad519f 100644
--- a/search/classes/area/base_mod.php
+++ b/search/classes/base_mod.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core_search\area;
+namespace core_search;
 
 defined('MOODLE_INTERNAL') || die();
 

From 0bd8383a8bfa833b493a2cc1897ea6f36c27f569 Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Wed, 20 Jul 2016 20:30:00 +0200
Subject: [PATCH 2/2] MDL-55278 search: Updating references to area namespace

---
 course/classes/search/mycourse.php             |  2 +-
 mod/assign/classes/search/activity.php         |  2 +-
 mod/book/classes/search/activity.php           |  2 +-
 mod/book/classes/search/chapter.php            |  2 +-
 mod/chat/classes/search/activity.php           |  2 +-
 mod/choice/classes/search/activity.php         |  2 +-
 mod/data/classes/search/activity.php           |  2 +-
 mod/feedback/classes/search/activity.php       |  2 +-
 mod/folder/classes/search/activity.php         |  2 +-
 mod/forum/classes/search/activity.php          |  2 +-
 mod/forum/classes/search/post.php              |  2 +-
 mod/glossary/classes/search/activity.php       |  2 +-
 mod/glossary/classes/search/entry.php          |  2 +-
 mod/imscp/classes/search/activity.php          |  2 +-
 mod/label/classes/search/activity.php          |  2 +-
 mod/lesson/classes/search/activity.php         |  2 +-
 mod/lti/classes/search/activity.php            |  2 +-
 mod/page/classes/search/activity.php           |  2 +-
 mod/quiz/classes/search/activity.php           |  2 +-
 mod/resource/classes/search/activity.php       |  2 +-
 mod/scorm/classes/search/activity.php          |  2 +-
 mod/survey/classes/search/activity.php         |  2 +-
 mod/url/classes/search/activity.php            |  2 +-
 mod/wiki/classes/search/activity.php           |  2 +-
 mod/wiki/classes/search/collaborative_page.php |  2 +-
 mod/workshop/classes/search/activity.php       |  2 +-
 search/classes/engine.php                      | 10 +++++-----
 search/classes/manager.php                     | 12 ++++++------
 search/engine/solr/classes/engine.php          |  2 +-
 search/tests/fixtures/mock_search_area.php     |  2 +-
 search/tests/fixtures/mock_search_engine.php   |  2 +-
 search/tests/fixtures/testable_core_search.php |  4 ++--
 search/tests/manager_test.php                  |  2 +-
 user/classes/search/user.php                   |  2 +-
 34 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/course/classes/search/mycourse.php b/course/classes/search/mycourse.php
index b75defd94c6..833f7fbc777 100644
--- a/course/classes/search/mycourse.php
+++ b/course/classes/search/mycourse.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2016 Skylar Kelty <S.Kelty@kent.ac.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mycourse extends \core_search\area\base {
+class mycourse extends \core_search\base {
 
     /**
      * The context levels the search implementation is working on.
diff --git a/mod/assign/classes/search/activity.php b/mod/assign/classes/search/activity.php
index c7adafc4f0c..ea5a69c0278 100644
--- a/mod/assign/classes/search/activity.php
+++ b/mod/assign/classes/search/activity.php
@@ -35,7 +35,7 @@ require_once($CFG->dirroot . '/mod/assign/locallib.php');
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
     /**
      * Returns true if this area uses file indexing.
      *
diff --git a/mod/book/classes/search/activity.php b/mod/book/classes/search/activity.php
index 02442ccf07c..862e42ec66f 100644
--- a/mod/book/classes/search/activity.php
+++ b/mod/book/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/book/classes/search/chapter.php b/mod/book/classes/search/chapter.php
index 120b0a61622..021b58cb607 100644
--- a/mod/book/classes/search/chapter.php
+++ b/mod/book/classes/search/chapter.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2016 Eric Merrill {@link http://www.merrilldigital.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class chapter extends \core_search\area\base_mod {
+class chapter extends \core_search\base_mod {
     /**
      * @var array Cache of book records.
      */
diff --git a/mod/chat/classes/search/activity.php b/mod/chat/classes/search/activity.php
index 6835a68b0ef..067dd6e5034 100644
--- a/mod/chat/classes/search/activity.php
+++ b/mod/chat/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/choice/classes/search/activity.php b/mod/choice/classes/search/activity.php
index b7dc32b123f..af2bd919eef 100644
--- a/mod/choice/classes/search/activity.php
+++ b/mod/choice/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/data/classes/search/activity.php b/mod/data/classes/search/activity.php
index eb776c3b026..7f1f6098bfc 100644
--- a/mod/data/classes/search/activity.php
+++ b/mod/data/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/feedback/classes/search/activity.php b/mod/feedback/classes/search/activity.php
index 8e6af133511..84755b43801 100644
--- a/mod/feedback/classes/search/activity.php
+++ b/mod/feedback/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/folder/classes/search/activity.php b/mod/folder/classes/search/activity.php
index 0cf32189192..08093372a48 100644
--- a/mod/folder/classes/search/activity.php
+++ b/mod/folder/classes/search/activity.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
     /**
      * Returns true if this area uses file indexing.
      *
diff --git a/mod/forum/classes/search/activity.php b/mod/forum/classes/search/activity.php
index e78de19e9b2..6435104897d 100644
--- a/mod/forum/classes/search/activity.php
+++ b/mod/forum/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/forum/classes/search/post.php b/mod/forum/classes/search/post.php
index b17dfcd60db..8c43e4ef3e7 100644
--- a/mod/forum/classes/search/post.php
+++ b/mod/forum/classes/search/post.php
@@ -35,7 +35,7 @@ require_once($CFG->dirroot . '/mod/forum/lib.php');
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class post extends \core_search\area\base_mod {
+class post extends \core_search\base_mod {
 
     /**
      * @var array Internal quick static cache.
diff --git a/mod/glossary/classes/search/activity.php b/mod/glossary/classes/search/activity.php
index 944fbe55bd8..82b34e2363f 100644
--- a/mod/glossary/classes/search/activity.php
+++ b/mod/glossary/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/glossary/classes/search/entry.php b/mod/glossary/classes/search/entry.php
index 72f16712159..930ec3230ac 100644
--- a/mod/glossary/classes/search/entry.php
+++ b/mod/glossary/classes/search/entry.php
@@ -35,7 +35,7 @@ require_once($CFG->dirroot . '/mod/glossary/lib.php');
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class entry extends \core_search\area\base_mod {
+class entry extends \core_search\base_mod {
 
     /**
      * @var array Internal quick static cache.
diff --git a/mod/imscp/classes/search/activity.php b/mod/imscp/classes/search/activity.php
index 49262da19c0..04aa1b8d4f0 100644
--- a/mod/imscp/classes/search/activity.php
+++ b/mod/imscp/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/label/classes/search/activity.php b/mod/label/classes/search/activity.php
index f320617c127..95821b52781 100644
--- a/mod/label/classes/search/activity.php
+++ b/mod/label/classes/search/activity.php
@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 
     /**
      * Overwritten as labels are displayed in-course.
diff --git a/mod/lesson/classes/search/activity.php b/mod/lesson/classes/search/activity.php
index 5814db81c7a..1f93104d2c0 100644
--- a/mod/lesson/classes/search/activity.php
+++ b/mod/lesson/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/lti/classes/search/activity.php b/mod/lti/classes/search/activity.php
index 6e5b9a99f20..47d8177d293 100644
--- a/mod/lti/classes/search/activity.php
+++ b/mod/lti/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/page/classes/search/activity.php b/mod/page/classes/search/activity.php
index 470c3beb200..c66c66fc58f 100644
--- a/mod/page/classes/search/activity.php
+++ b/mod/page/classes/search/activity.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 
 
     /**
diff --git a/mod/quiz/classes/search/activity.php b/mod/quiz/classes/search/activity.php
index 9f4e18ce9a4..a4bb3f6a948 100644
--- a/mod/quiz/classes/search/activity.php
+++ b/mod/quiz/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/resource/classes/search/activity.php b/mod/resource/classes/search/activity.php
index 1b40ca505d3..7490ab578ed 100644
--- a/mod/resource/classes/search/activity.php
+++ b/mod/resource/classes/search/activity.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
     /**
      * Returns true if this area uses file indexing.
      *
diff --git a/mod/scorm/classes/search/activity.php b/mod/scorm/classes/search/activity.php
index 91e9b03eb41..75ad2a1ed75 100644
--- a/mod/scorm/classes/search/activity.php
+++ b/mod/scorm/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/survey/classes/search/activity.php b/mod/survey/classes/search/activity.php
index f4033ebc54d..63751825ca9 100644
--- a/mod/survey/classes/search/activity.php
+++ b/mod/survey/classes/search/activity.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 
     /**
      * Returns recordset containing required data for indexing activities.
diff --git a/mod/url/classes/search/activity.php b/mod/url/classes/search/activity.php
index bc60f0ed9ad..97f3515719b 100644
--- a/mod/url/classes/search/activity.php
+++ b/mod/url/classes/search/activity.php
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2016 Dan Poltawski
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 
     /**
      * Returns the document associated with this activity.
diff --git a/mod/wiki/classes/search/activity.php b/mod/wiki/classes/search/activity.php
index ec7771d92e1..e3812b518d6 100644
--- a/mod/wiki/classes/search/activity.php
+++ b/mod/wiki/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/mod/wiki/classes/search/collaborative_page.php b/mod/wiki/classes/search/collaborative_page.php
index fac4ca46af7..987b1b75272 100644
--- a/mod/wiki/classes/search/collaborative_page.php
+++ b/mod/wiki/classes/search/collaborative_page.php
@@ -35,7 +35,7 @@ require_once($CFG->dirroot . '/mod/wiki/locallib.php');
  * @copyright  2016 Eric Merrill {@link http://www.merrilldigital.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class collaborative_page extends \core_search\area\base_mod {
+class collaborative_page extends \core_search\base_mod {
     /**
      * @var array Cache of wiki records.
      */
diff --git a/mod/workshop/classes/search/activity.php b/mod/workshop/classes/search/activity.php
index 1d69530aa08..28445887be4 100644
--- a/mod/workshop/classes/search/activity.php
+++ b/mod/workshop/classes/search/activity.php
@@ -33,5 +33,5 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2015 David Monllao {@link http://www.davidmonllao.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class activity extends \core_search\area\base_activity {
+class activity extends \core_search\base_activity {
 }
diff --git a/search/classes/engine.php b/search/classes/engine.php
index f197e0729c5..52c4bb371d6 100644
--- a/search/classes/engine.php
+++ b/search/classes/engine.php
@@ -138,7 +138,7 @@ abstract class engine {
      * Returns a search instance of the specified area checking internal caching.
      *
      * @param string $areaid Area id
-     * @return \core_search\area\base
+     * @return \core_search\base
      */
     protected function get_search_area($areaid) {
 
@@ -174,11 +174,11 @@ abstract class engine {
     /**
      * Returns a document instance prepared to be rendered.
      *
-     * @param \core_search\area\base $searcharea
+     * @param \core_search\base $searcharea
      * @param array $docdata
      * @return \core_search\document
      */
-    protected function to_document(\core_search\area\base $searcharea, $docdata) {
+    protected function to_document(\core_search\base $searcharea, $docdata) {
 
         list($componentname, $areaname) = \core_search\manager::extract_areaid_parts($docdata['areaid']);
         $doc = \core_search\document_factory::instance($docdata['itemid'], $componentname, $areaname, $this);
@@ -255,7 +255,7 @@ abstract class engine {
     /**
      * Do anything that may need to be done before an area is indexed.
      *
-     * @param \core_search\area\base $searcharea The search area that was complete
+     * @param \core_search\base $searcharea The search area that was complete
      * @param bool $fullindex True if a full index is being performed
      * @return void
      */
@@ -268,7 +268,7 @@ abstract class engine {
      *
      * Return false to prevent the search area completed time and stats from being updated.
      *
-     * @param \core_search\area\base $searcharea The search area that was complete
+     * @param \core_search\base $searcharea The search area that was complete
      * @param int $numdocs The number of documents that were added to the index
      * @param bool $fullindex True if a full index is being performed
      * @return bool True means that data is considered indexed
diff --git a/search/classes/manager.php b/search/classes/manager.php
index cf164b8d0d9..19ed0129837 100644
--- a/search/classes/manager.php
+++ b/search/classes/manager.php
@@ -78,12 +78,12 @@ class manager {
     const NO_OWNER_ID = 0;
 
     /**
-     * @var \core_search\area\base[] Enabled search areas.
+     * @var \core_search\base[] Enabled search areas.
      */
     protected static $enabledsearchareas = null;
 
     /**
-     * @var \core_search\area\base[] All system search areas.
+     * @var \core_search\base[] All system search areas.
      */
     protected static $allsearchareas = null;
 
@@ -100,7 +100,7 @@ class manager {
     /**
      * Constructor, use \core_search\manager::instance instead to get a class instance.
      *
-     * @param \core_search\area\base The search engine to use
+     * @param \core_search\base The search engine to use
      */
     public function __construct($engine) {
         $this->engine = $engine;
@@ -190,7 +190,7 @@ class manager {
      * Returns a new area search indexer instance.
      *
      * @param string $areaid
-     * @return \core_search\area\base|bool False if the area is not available.
+     * @return \core_search\base|bool False if the area is not available.
      */
     public static function get_search_area($areaid) {
 
@@ -214,7 +214,7 @@ class manager {
      * Return the list of available search areas.
      *
      * @param bool $enabled Return only the enabled ones.
-     * @return \core_search\area\base[]
+     * @return \core_search\base[]
      */
     public static function get_search_areas_list($enabled = false) {
 
@@ -677,7 +677,7 @@ class manager {
     /**
      * Returns search areas configuration.
      *
-     * @param \core_search\area\base[] $searchareas
+     * @param \core_search\base[] $searchareas
      * @return \stdClass[] $configsettings
      */
     public function get_areas_config($searchareas) {
diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
index ce2f722c6bd..b289d6c8dbe 100644
--- a/search/engine/solr/classes/engine.php
+++ b/search/engine/solr/classes/engine.php
@@ -1001,7 +1001,7 @@ class engine extends \core_search\engine {
      *
      * Return false to prevent the search area completed time and stats from being updated.
      *
-     * @param \core_search\area\base $searcharea The search area that was complete
+     * @param \core_search\base $searcharea The search area that was complete
      * @param int $numdocs The number of documents that were added to the index
      * @param bool $fullindex True if a full index is being performed
      * @return bool True means that data is considered indexed
diff --git a/search/tests/fixtures/mock_search_area.php b/search/tests/fixtures/mock_search_area.php
index a4dadd9a98c..bdc38670586 100644
--- a/search/tests/fixtures/mock_search_area.php
+++ b/search/tests/fixtures/mock_search_area.php
@@ -27,7 +27,7 @@ namespace core_mocksearch\search;
 
 defined('MOODLE_INTERNAL') || die;
 
-class mock_search_area extends \core_search\area\base {
+class mock_search_area extends \core_search\base {
 
     /**
      * Multiple context level so we can test get_areas_user_accesses.
diff --git a/search/tests/fixtures/mock_search_engine.php b/search/tests/fixtures/mock_search_engine.php
index 88b3472fd37..cdf99c4bca0 100644
--- a/search/tests/fixtures/mock_search_engine.php
+++ b/search/tests/fixtures/mock_search_engine.php
@@ -49,7 +49,7 @@ class engine extends \core_search\engine {
         return null;
     }
 
-    public function to_document(\core_search\area\base $searcharea, $docdata) {
+    public function to_document(\core_search\base $searcharea, $docdata) {
         return parent::to_document($searcharea, $docdata);
     }
 
diff --git a/search/tests/fixtures/testable_core_search.php b/search/tests/fixtures/testable_core_search.php
index bce1437d889..9b3b5eaed9f 100644
--- a/search/tests/fixtures/testable_core_search.php
+++ b/search/tests/fixtures/testable_core_search.php
@@ -80,10 +80,10 @@ class testable_core_search extends \core_search\manager {
      * Adds an enabled search component to the search areas list.
      *
      * @param string $areaid
-     * @param \core_search\area\base $searcharea
+     * @param \core_search\base $searcharea
      * @return void
      */
-    public function add_search_area($areaid, \core_search\area\base $searcharea) {
+    public function add_search_area($areaid, \core_search\base $searcharea) {
        self::$enabledsearchareas[$areaid] = $searcharea;
        self::$allsearchareas[$areaid] = $searcharea;
     }
diff --git a/search/tests/manager_test.php b/search/tests/manager_test.php
index b2035b28440..879d8388b97 100644
--- a/search/tests/manager_test.php
+++ b/search/tests/manager_test.php
@@ -70,7 +70,7 @@ class search_manager_testcase extends advanced_testcase {
         $fakeareaid = \core_search\manager::generate_areaid('mod_unexisting', 'chihuaquita');
 
         $searcharea = \core_search\manager::get_search_area($this->forumpostareaid);
-        $this->assertInstanceOf('\core_search\area\base', $searcharea);
+        $this->assertInstanceOf('\core_search\base', $searcharea);
 
         $this->assertFalse(\core_search\manager::get_search_area($fakeareaid));
 
diff --git a/user/classes/search/user.php b/user/classes/search/user.php
index b51ed8e6097..87bb202f55c 100644
--- a/user/classes/search/user.php
+++ b/user/classes/search/user.php
@@ -35,7 +35,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2016 Devang Gaur {@link http://www.devanggaur.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user extends \core_search\area\base {
+class user extends \core_search\base {
 
     /**
      * Returns recordset containing required data attributes for indexing.