MDL-58442 core_calendar: Rename core_container to simply container

core_container was confusing as it looks Frankenstyleish.

Part of MDL-55611 epic.

diff --git a/calendar/classes/external/event_action_exporter.php b/calendar/classes/external/event_action_exporter.php
index be43a9f..2002cc3 100644 (file)
--- a/calendar/classes/external/event_action_exporter.php
+++ b/calendar/classes/external/event_action_exporter.php
@@ -28,7 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 
 use core\external\exporter;
 use core_calendar\local\event\entities\action_interface;
-use core_calendar\local\event\core_container;
+use core_calendar\local\event\container;
 use renderer_base;
 
 /**
@@ -93,7 +93,7 @@ class event_action_exporter extends exporter {
         $modulename = $event->get_course_module()->get('modname');
         $component = 'mod_' . $modulename;
         $showitemcountcallback = 'core_calendar_event_action_shows_item_count';
-        $mapper = core_container::get_event_mapper();
+        $mapper = container::get_event_mapper();
         $calevent = $mapper->from_event_to_legacy_event($event);
         $params = [$calevent, $this->data->itemcount];
         $showitemcount = component_callback($component, $showitemcountcallback, $params, false);

diff --git a/calendar/classes/local/api.php b/calendar/classes/local/api.php
index 145f904..18682ff 100644 (file)
--- a/calendar/classes/local/api.php
+++ b/calendar/classes/local/api.php
@@ -74,7 +74,7 @@ class api {
     ) {
         global $USER;
 
-        $vault = \core_calendar\local\event\core_container::get_event_vault();
+        $vault = \core_calendar\local\event\container::get_event_vault();
 
         $timestartafterevent = null;
         $timesortafterevent = null;
@@ -138,7 +138,7 @@ class api {
             return $param;
         }, [$users, $groups, $courses]);
 
-        $mapper = \core_calendar\local\event\core_container::get_event_mapper();
+        $mapper = \core_calendar\local\event\container::get_event_mapper();
         $events = self::get_events(
             $tstart,
             $tend,
@@ -187,7 +187,7 @@ class api {
             throw new \moodle_exception("Limit must be between 1 and 50 (inclusive)");
         }
 
-        $vault = \core_calendar\local\event\core_container::get_event_vault();
+        $vault = \core_calendar\local\event\container::get_event_vault();
 
         $afterevent = null;
         if ($aftereventid && $event = $vault->get_event_by_id($aftereventid)) {
@@ -223,7 +223,7 @@ class api {
                 "Limit must be between 1 and 50 (inclusive)");
         }
 
-        $vault = \core_calendar\local\event\core_container::get_event_vault();
+        $vault = \core_calendar\local\event\container::get_event_vault();
 
         $afterevent = null;
         if ($aftereventid && $event = $vault->get_event_by_id($aftereventid)) {

diff --git a/calendar/classes/local/event/core_container.php b/calendar/classes/local/event/container.php
similarity index 99%
rename from calendar/classes/local/event/core_container.php
rename to calendar/classes/local/event/container.php
index c5ac5ac..1c562d9 100644 (file)
--- a/calendar/classes/local/event/core_container.php
+++ b/calendar/classes/local/event/container.php
@@ -44,7 +44,7 @@ use core_calendar\local\event\strategies\raw_event_retrieval_strategy;
  * @copyright 2017 Cameron Ball <cameron@cameron1729.xyz>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_container {
+class container {
     /**
      * @var event_factory $eventfactory Event factory.
      */

diff --git a/calendar/tests/core_container_test.php b/calendar/tests/container_test.php
similarity index 94%
rename from calendar/tests/core_container_test.php
rename to calendar/tests/container_test.php
index 93d91bb..a56fecd 100644 (file)
--- a/calendar/tests/core_container_test.php
+++ b/calendar/tests/container_test.php
@@ -52,7 +52,7 @@ class core_calendar_container_testcase extends advanced_testcase {
      * Test getting the event factory.
      */
     public function test_get_event_factory() {
-        $factory = \core_calendar\local\event\core_container::get_event_factory();
+        $factory = \core_calendar\local\event\container::get_event_factory();
 
         // Test that the container is returning the right type.
         $this->assertInstanceOf(event_factory_interface::class, $factory);
@@ -60,7 +60,7 @@ class core_calendar_container_testcase extends advanced_testcase {
         $this->assertInstanceOf(event_factory::class, $factory);
 
         // Test that getting the factory a second time returns the same instance.
-        $factory2 = \core_calendar\local\event\core_container::get_event_factory();
+        $factory2 = \core_calendar\local\event\container::get_event_factory();
         $this->assertTrue($factory === $factory2);
     }
 
@@ -72,7 +72,7 @@ class core_calendar_container_testcase extends advanced_testcase {
      */
     public function test_event_factory_create_instance($dbrow) {
         $legacyevent = $this->create_event($dbrow);
-        $factory = \core_calendar\local\event\core_container::get_event_factory();
+        $factory = \core_calendar\local\event\container::get_event_factory();
         $course = $this->getDataGenerator()->create_course();
         $generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
         $moduleinstance = $generator->create_instance(['course' => $course->id]);
@@ -132,7 +132,7 @@ class core_calendar_container_testcase extends advanced_testcase {
      */
     public function test_event_factory_when_module_visibility_is_toggled_as_admin($dbrow) {
         $legacyevent = $this->create_event($dbrow);
-        $factory = \core_calendar\local\event\core_container::get_event_factory();
+        $factory = \core_calendar\local\event\container::get_event_factory();
         $course = $this->getDataGenerator()->create_course();
         $generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
         $moduleinstance = $generator->create_instance(['course' => $course->id]);
@@ -158,7 +158,7 @@ class core_calendar_container_testcase extends advanced_testcase {
      */
     public function test_event_factory_when_module_visibility_is_toggled_as_guest($dbrow) {
         $legacyevent = $this->create_event($dbrow);
-        $factory = \core_calendar\local\event\core_container::get_event_factory();
+        $factory = \core_calendar\local\event\container::get_event_factory();
         $course = $this->getDataGenerator()->create_course();
         $generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
         $moduleinstance = $generator->create_instance(['course' => $course->id]);
@@ -217,7 +217,7 @@ class core_calendar_container_testcase extends advanced_testcase {
         $event->id = $legacyevent->id;
 
         // Create the factory we are going to be testing the behaviour of.
-        $factory = \core_calendar\local\event\core_container::get_event_factory();
+        $factory = \core_calendar\local\event\container::get_event_factory();
 
         // Check that we get the correct instance.
         $this->assertInstanceOf(event_interface::class, $factory->create_instance($event));
@@ -233,12 +233,12 @@ class core_calendar_container_testcase extends advanced_testcase {
      * Test getting the event mapper.
      */
     public function test_get_event_mapper() {
-        $mapper = \core_calendar\local\event\core_container::get_event_mapper();
+        $mapper = \core_calendar\local\event\container::get_event_mapper();
 
         $this->assertInstanceOf(event_mapper_interface::class, $mapper);
         $this->assertInstanceOf(event_mapper::class, $mapper);
 
-        $mapper2 = \core_calendar\local\event\core_container::get_event_mapper();
+        $mapper2 = \core_calendar\local\event\container::get_event_mapper();
 
         $this->assertTrue($mapper === $mapper2);
     }