Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle

hig3 · Jul 26, 2016 · 773a115 · 773a115
2 parents be5837d + 0bd8383
commit 773a115
Show file tree

Hide file tree

Showing 38 changed files with 50 additions and 47 deletions.
diff --git a/course/classes/search/mycourse.php b/course/classes/search/mycourse.php
@@ -32,7 +32,7 @@
  * @copyright  2016 Skylar Kelty <[email protected]>
  * @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/lib/db/renamedclasses.php b/lib/db/renamedclasses.php
@@ -37,4 +37,7 @@
 // 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/mod/assign/classes/search/activity.php b/mod/assign/classes/search/activity.php
@@ -35,7 +35,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,7 +33,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,7 +33,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -35,7 +35,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -35,7 +35,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -36,7 +36,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,7 +33,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,7 +33,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -33,7 +33,7 @@
  * @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
@@ -33,7 +33,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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
@@ -35,7 +35,7 @@
  * @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
@@ -33,5 +33,5 @@
  * @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/area/base.php → search/classes/base.php b/search/classes/area/base.php → 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 → search/classes/base_activity.php b/search/classes/area/base_activity.php → 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 → search/classes/base_mod.php b/search/classes/area/base_mod.php → 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();
 

diff --git a/search/classes/engine.php b/search/classes/engine.php
@@ -138,7 +138,7 @@ public function get_user($userid) {
      * 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 @@ protected function get_search_area($areaid) {
     /**
      * 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 @@ public function index_complete($numdocs = 0, $fullindex = false) {
     /**
      * 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 @@ public function area_index_starting($searcharea, $fullindex = false) {
      *
      * 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
@@ -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;
@@ -194,7 +194,7 @@ protected static function get_area_classname($areaid) {
      * 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) {
 
@@ -218,7 +218,7 @@ public static function get_search_area($areaid) {
      * 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) {
 
@@ -681,7 +681,7 @@ public function delete_index_by_id($id) {
     /**
      * 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
@@ -1001,7 +1001,7 @@ protected function commit() {
      *
      * 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
@@ -27,7 +27,7 @@
 
 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
@@ -49,7 +49,7 @@ public function delete($areaid = null) {
         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
@@ -80,10 +80,10 @@ public function get_areas_user_accesses($limitcourseids = false) {
      * 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
@@ -70,7 +70,7 @@ public function test_search_areas() {
         $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
@@ -35,7 +35,7 @@
  * @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.