MDL-58087 core_calendar: Remove redundant event vault factory

Part of MDL-55611 epic.
moodle · Apr 4, 2017 · b6d9b70 · b6d9b70
1 parent 59a601e
commit b6d9b70
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 91 deletions.
diff --git a/calendar/classes/local/event/core_container.php b/calendar/classes/local/event/core_container.php
@@ -31,9 +31,9 @@
 defined('MOODLE_INTERNAL') || die();
 
 use core_calendar\action_factory;
+use core_calendar\local\event\data_access\event_vault;
 use core_calendar\local\event\factories\action_event_factory;
 use core_calendar\local\event\factories\event_factory;
-use core_calendar\local\event\factories\event_vault_factory;
 use core_calendar\local\event\mappers\event_mapper;
 use core_calendar\local\interfaces\action_event_interface;
 use core_calendar\local\interfaces\event_interface;
@@ -147,8 +147,7 @@ function ($dbrow) {
         }
 
         if (empty(self::$eventvault)) {
-            $vaultfactory = new event_vault_factory();
-            self::$eventvault = $vaultfactory->create_instance(self::$eventfactory);
+            self::$eventvault = new event_vault(self::$eventfactory, self::$eventretrievalstrategy);
         }
     }
 

diff --git a/calendar/classes/local/event/factories/event_vault_factory.php b/calendar/classes/local/event/factories/event_vault_factory.php
diff --git a/calendar/classes/local/interfaces/event_vault_factory_interface.php b/calendar/classes/local/interfaces/event_vault_factory_interface.php