Renamed files and classes to follow ruleset pattern

Canx · Mar 10, 2017 · f5f0aa5 · f5f0aa5
1 parent 76c8ba4
commit f5f0aa5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git a/classes/course_filter.php → classes/filter_course.php b/classes/course_filter.php → classes/filter_course.php
@@ -2,7 +2,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-class block_xp_course_filter extends block_xp_filter {
+class block_xp_filter_course extends block_xp_filter {
 
  public function __construct($courseid) {
  $this->courseid = $courseid;

diff --git a/classes/default_filter.php → classes/filter_default.php b/classes/default_filter.php → classes/filter_default.php
@@ -2,7 +2,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-class block_xp_default_filter extends block_xp_filter {
+class block_xp_filter_default extends block_xp_filter {
 
  public function load($filter_object) {
 

diff --git a/classes/filter_manager.php b/classes/filter_manager.php
@@ -130,8 +130,8 @@ public function get_user_filters() {
  * @return void
  */
  public static function save_default_filters() {
- $static_filters = new block_xp_static_filterset();
- $default_filters = new block_xp_default_filterset();
+ $static_filters = new block_xp_filterset_static();
+ $default_filters = new block_xp_filterset_default();
 
  $default_filters->import($static_filters);
  }
@@ -141,8 +141,8 @@ public static function save_default_filters() {
  *
  * @return void */
  public function copy_default_filters_to_course() {
- $default_filters = new block_xp_default_filterset();
- $course_filters = new block_xp_course_filterset($this->get_courseid());
+ $default_filters = new block_xp_filterset_default();
+ $course_filters = new block_xp_filterset_course($this->get_courseid());
 
  if ($course_filters->empty()) {
  $course_filters->import($default_filters);

diff --git a/classes/filterset.php b/classes/filterset.php
@@ -20,11 +20,7 @@ public function save() {
  }
 
  // Should import delete previous filters? Dont' think so...
- public function import($filters_object) {
-
- if (!method_exists($this, 'create_filter')) {
- throw new coding_exception(get_class($this) , " can't import filters");
- }
+ public function import(block_xp_filterset $filters_object) {
 
  foreach($filters_object->get() as $filter) {
  $cloned_filter = $this->create_filter();

diff --git a/classes/course_filterset.php → classes/filterset_course.php b/classes/course_filterset.php → classes/filterset_course.php
@@ -1,6 +1,6 @@
 <?php
 
-class block_xp_course_filterset extends block_xp_filterset {
+class block_xp_filterset_course extends block_xp_filterset {
 
  protected $courseid;
 
@@ -26,7 +26,7 @@ public function load() {
  }
 
  public function create_filter() {
- return new block_xp_course_filter($this->courseid);
+ return new block_xp_filter_course($this->courseid);
  }
 }
 

diff --git a/classes/default_filterset.php → classes/filterset_default.php b/classes/default_filterset.php → classes/filterset_default.php
@@ -1,6 +1,6 @@
 <?php
 
-class block_xp_default_filterset extends block_xp_filterset {
+class block_xp_filterset_default extends block_xp_filterset {
 
  public function load() {
  global $DB;
@@ -18,7 +18,7 @@ public function load() {
  }
 
  public function create_filter() {
- return new block_xp_default_filter();
+ return new block_xp_filter_default();
  }
 }
 

diff --git a/classes/static_filterset.php → classes/filterset_static.php b/classes/static_filterset.php → classes/filterset_static.php
@@ -1,6 +1,6 @@
 <?php
 
-class block_xp_static_filterset extends block_xp_filterset {
+class block_xp_filterset_static extends block_xp_filterset {
 
  public function create_filter() {
  throw new coding_exception('Static filters cannot be modified.');