From 42e76c3f7003a94f19244386a30554d3496ed93d Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Thu, 30 Mar 2017 15:33:13 +0800 Subject: [PATCH] MDL-58430 core_calendar: Keep interfaces with implementations All interfaces have been moved from the interfaces folder such that they now live with their default implementations. Part of MDL-55611 epic. --- calendar/classes/action_factory.php | 2 +- calendar/classes/external/event_action_exporter.php | 4 ++-- calendar/classes/external/event_exporter.php | 3 +-- calendar/classes/external/event_icon_exporter.php | 2 +- .../external/events_related_objects_cache.php | 2 +- calendar/classes/local/api.php | 12 ++++++++++-- calendar/classes/local/event/core_container.php | 13 ++++++------- .../classes/local/event/data_access/event_vault.php | 10 +++++----- .../data_access}/event_vault_interface.php | 4 +++- .../classes/local/event/entities/action_event.php | 4 +--- .../entities}/action_event_interface.php | 2 +- .../entities}/action_interface.php | 2 +- calendar/classes/local/event/entities/event.php | 8 +++----- .../entities}/event_collection_interface.php | 2 +- .../entities}/event_interface.php | 2 +- .../event/entities/repeat_event_collection.php | 4 +--- .../local/event/factories/action_event_factory.php | 5 ++--- .../factories}/action_event_factory_interface.php | 6 +++--- .../factories}/action_factory_interface.php | 4 ++-- .../event/factories/event_abstract_factory.php | 4 +--- .../classes/local/event/factories/event_factory.php | 3 +-- .../factories}/event_factory_interface.php | 4 ++-- .../classes/local/event/mappers/event_mapper.php | 8 ++++---- .../mappers}/event_mapper_interface.php | 5 ++++- .../local/event/proxies/module_std_proxy.php | 2 -- .../proxies}/proxy_interface.php | 2 +- calendar/classes/local/event/proxies/std_proxy.php | 1 - .../strategies/raw_event_retrieval_strategy.php | 2 -- .../raw_event_retrieval_strategy_interface.php | 2 +- .../classes/local/event/value_objects/action.php | 2 +- .../value_objects}/description_interface.php | 2 +- .../local/event/value_objects/event_description.php | 2 -- .../local/event/value_objects/event_times.php | 2 -- .../value_objects}/times_interface.php | 2 +- calendar/tests/action_event_factory_test.php | 4 ++-- calendar/tests/action_event_test.php | 4 ++-- calendar/tests/action_factory_test.php | 2 +- calendar/tests/core_container_test.php | 6 +++--- calendar/tests/event_factory_test.php | 2 +- calendar/tests/event_mapper_test.php | 12 +++++++----- calendar/tests/event_test.php | 2 +- calendar/tests/helpers.php | 2 +- calendar/tests/repeat_event_collection_test.php | 2 +- 43 files changed, 82 insertions(+), 88 deletions(-) rename calendar/classes/local/{interfaces => event/data_access}/event_vault_interface.php (98%) rename calendar/classes/local/{interfaces => event/entities}/action_event_interface.php (96%) rename calendar/classes/local/{interfaces => event/entities}/action_interface.php (97%) rename calendar/classes/local/{interfaces => event/entities}/event_collection_interface.php (96%) rename calendar/classes/local/{interfaces => event/entities}/event_interface.php (98%) rename calendar/classes/local/{interfaces => event/factories}/action_event_factory_interface.php (90%) rename calendar/classes/local/{interfaces => event/factories}/action_factory_interface.php (91%) rename calendar/classes/local/{interfaces => event/factories}/event_factory_interface.php (92%) rename calendar/classes/local/{interfaces => event/mappers}/event_mapper_interface.php (94%) rename calendar/classes/local/{interfaces => event/proxies}/proxy_interface.php (98%) rename calendar/classes/local/{interfaces => event/strategies}/raw_event_retrieval_strategy_interface.php (98%) rename calendar/classes/local/{interfaces => event/value_objects}/description_interface.php (96%) rename calendar/classes/local/{interfaces => event/value_objects}/times_interface.php (97%) diff --git a/calendar/classes/action_factory.php b/calendar/classes/action_factory.php index ab00bc7b6e8..118e3a22632 100644 --- a/calendar/classes/action_factory.php +++ b/calendar/classes/action_factory.php @@ -26,7 +26,7 @@ namespace core_calendar; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\action_factory_interface; +use core_calendar\local\event\factories\action_factory_interface; use core_calendar\local\event\value_objects\action; /** diff --git a/calendar/classes/external/event_action_exporter.php b/calendar/classes/external/event_action_exporter.php index d43c1840b96..be43a9f66a5 100644 --- a/calendar/classes/external/event_action_exporter.php +++ b/calendar/classes/external/event_action_exporter.php @@ -27,8 +27,8 @@ namespace core_calendar\external; 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\interfaces\action_interface; use renderer_base; /** @@ -113,7 +113,7 @@ class event_action_exporter extends exporter { protected static function define_related() { return [ 'context' => 'context', - 'event' => '\\core_calendar\\local\\interfaces\\event_interface' + 'event' => '\\core_calendar\\local\\event\\entities\\event_interface' ]; } } diff --git a/calendar/classes/external/event_exporter.php b/calendar/classes/external/event_exporter.php index d1bf3c63a5d..225c9ad8e1a 100644 --- a/calendar/classes/external/event_exporter.php +++ b/calendar/classes/external/event_exporter.php @@ -27,8 +27,7 @@ namespace core_calendar\external; defined('MOODLE_INTERNAL') || die(); use \core\external\exporter; -use \core_calendar\local\interfaces\event_interface; -use \core_calendar\local\interfaces\action_event_interface; +use \core_calendar\local\event\entities\event_interface; use \core_course\external\course_summary_exporter; use \renderer_base; diff --git a/calendar/classes/external/event_icon_exporter.php b/calendar/classes/external/event_icon_exporter.php index 2aa510d106b..2895a409b85 100644 --- a/calendar/classes/external/event_icon_exporter.php +++ b/calendar/classes/external/event_icon_exporter.php @@ -27,7 +27,7 @@ namespace core_calendar\external; defined('MOODLE_INTERNAL') || die(); use \core\external\exporter; -use \core_calendar\local\interfaces\event_interface; +use \core_calendar\local\event\entities\event_interface; /** * Class for displaying a calendar event's icon. diff --git a/calendar/classes/external/events_related_objects_cache.php b/calendar/classes/external/events_related_objects_cache.php index 063d623bde4..b19fd60cc0a 100644 --- a/calendar/classes/external/events_related_objects_cache.php +++ b/calendar/classes/external/events_related_objects_cache.php @@ -27,7 +27,7 @@ namespace core_calendar\external; defined('MOODLE_INTERNAL') || die(); use context; -use \core_calendar\local\interfaces\event_interface; +use \core_calendar\local\event\entities\event_interface; use stdClass; /** diff --git a/calendar/classes/local/api.php b/calendar/classes/local/api.php index 4aaefdb59a6..145f90469be 100644 --- a/calendar/classes/local/api.php +++ b/calendar/classes/local/api.php @@ -55,7 +55,7 @@ class api { * @param bool $withduration If true return only events starting within specified * timestart otherwise return in progress events as well. * @param bool $ignorehidden If true don't return hidden events. - * @return \core_calendar\local\interfaces\event_interface[] Array of event_interfaces. + * @return \core_calendar\local\event\entities\event_interface[] Array of event_interfaces. */ public static function get_events( $timestartfrom = null, @@ -117,7 +117,15 @@ class api { * @param boolean $ignorehidden whether to select only visible events or all events * @return array $events of selected events or an empty array if there aren't any (or there was an error) */ - public static function get_legacy_events($tstart, $tend, $users, $groups, $courses, $withduration = true, $ignorehidden = true) { + public static function get_legacy_events( + $tstart, + $tend, + $users, + $groups, + $courses, + $withduration = true, + $ignorehidden = true + ) { $fixedparams = array_map(function($param) { if ($param === true) { return null; diff --git a/calendar/classes/local/event/core_container.php b/calendar/classes/local/event/core_container.php index e9dc0f15053..c5ac5ac53cd 100644 --- a/calendar/classes/local/event/core_container.php +++ b/calendar/classes/local/event/core_container.php @@ -32,12 +32,11 @@ defined('MOODLE_INTERNAL') || die(); use core_calendar\action_factory; use core_calendar\local\event\data_access\event_vault; +use core_calendar\local\event\entities\event_interface; use core_calendar\local\event\factories\action_event_factory; use core_calendar\local\event\factories\event_factory; use core_calendar\local\event\mappers\event_mapper; use core_calendar\local\event\strategies\raw_event_retrieval_strategy; -use core_calendar\local\interfaces\action_event_interface; -use core_calendar\local\interfaces\event_interface; /** * Core container. @@ -57,7 +56,7 @@ class core_container { protected static $actioneventfactory; /** - * @var \core_calendar\local\interfaces\event_mapper_interface $eventmapper Event mapper. + * @var \core_calendar\local\event\mappers\event_mapper_interface $eventmapper Event mapper. */ protected static $eventmapper; @@ -67,12 +66,12 @@ class core_container { protected static $actionfactory; /** - * @var \core_calendar\local\event\data_access\event_vault $eventvault Event vault. + * @var event_vault $eventvault Event vault. */ protected static $eventvault; /** - * @var \core_calendar\local\event\strategies\raw_event_retrieval_strategy $eventretrievalstrategy Event retrieval strategy. + * @var raw_event_retrieval_strategy $eventretrievalstrategy Event retrieval strategy. */ protected static $eventretrievalstrategy; @@ -175,7 +174,7 @@ class core_container { /** * Gets the event mapper. * - * @return \core_calendar\local\interfaces\event_mapper_interface + * @return event_mapper */ public static function get_event_mapper() { self::init(); @@ -185,7 +184,7 @@ class core_container { /** * Return an event vault. * - * @return \core_calendar\local\event\data_access\event_vault + * @return event_vault */ public static function get_event_vault() { self::init(); diff --git a/calendar/classes/local/event/data_access/event_vault.php b/calendar/classes/local/event/data_access/event_vault.php index a3a39306dd2..8517e268f5d 100644 --- a/calendar/classes/local/event/data_access/event_vault.php +++ b/calendar/classes/local/event/data_access/event_vault.php @@ -26,12 +26,12 @@ namespace core_calendar\local\event\data_access; defined('MOODLE_INTERNAL') || die(); +use core_calendar\local\event\entities\action_event_interface; +use core_calendar\local\event\entities\event_interface; use core_calendar\local\event\exceptions\limit_invalid_parameter_exception; -use core_calendar\local\interfaces\action_event_interface; -use core_calendar\local\interfaces\event_factory_interface; -use core_calendar\local\interfaces\event_interface; -use core_calendar\local\interfaces\event_vault_interface; -use core_calendar\local\interfaces\raw_event_retrieval_strategy_interface; +use core_calendar\local\event\factories\action_factory_interface; +use core_calendar\local\event\factories\event_factory_interface; +use core_calendar\local\event\strategies\raw_event_retrieval_strategy_interface; /** * Event vault class. diff --git a/calendar/classes/local/interfaces/event_vault_interface.php b/calendar/classes/local/event/data_access/event_vault_interface.php similarity index 98% rename from calendar/classes/local/interfaces/event_vault_interface.php rename to calendar/classes/local/event/data_access/event_vault_interface.php index 8af5f1b56d2..705b8327de0 100644 --- a/calendar/classes/local/interfaces/event_vault_interface.php +++ b/calendar/classes/local/event/data_access/event_vault_interface.php @@ -22,10 +22,12 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\data_access; defined('MOODLE_INTERNAL') || die(); +use core_calendar\local\event\entities\event_interface; + /** * Interface for an event vault class * diff --git a/calendar/classes/local/event/entities/action_event.php b/calendar/classes/local/event/entities/action_event.php index 99f082af194..1c76999e97a 100644 --- a/calendar/classes/local/event/entities/action_event.php +++ b/calendar/classes/local/event/entities/action_event.php @@ -26,9 +26,7 @@ namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\action_event_interface; -use core_calendar\local\interfaces\action_interface; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\factories\action_factory_interface; /** * Class representing an actionable event. diff --git a/calendar/classes/local/interfaces/action_event_interface.php b/calendar/classes/local/event/entities/action_event_interface.php similarity index 96% rename from calendar/classes/local/interfaces/action_event_interface.php rename to calendar/classes/local/event/entities/action_event_interface.php index 27c19b208a7..41be943d656 100644 --- a/calendar/classes/local/interfaces/action_event_interface.php +++ b/calendar/classes/local/event/entities/action_event_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/interfaces/action_interface.php b/calendar/classes/local/event/entities/action_interface.php similarity index 97% rename from calendar/classes/local/interfaces/action_interface.php rename to calendar/classes/local/event/entities/action_interface.php index 190d27e6b0f..70c620227ee 100644 --- a/calendar/classes/local/interfaces/action_interface.php +++ b/calendar/classes/local/event/entities/action_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/event/entities/event.php b/calendar/classes/local/event/entities/event.php index e13772f53ba..cd5a1dff68b 100644 --- a/calendar/classes/local/event/entities/event.php +++ b/calendar/classes/local/event/entities/event.php @@ -26,11 +26,9 @@ namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\event_collection_interface; -use core_calendar\local\interfaces\event_interface; -use core_calendar\local\interfaces\proxy_interface; -use core_calendar\local\interfaces\description_interface; -use core_calendar\local\interfaces\times_interface; +use core_calendar\local\event\proxies\proxy_interface; +use core_calendar\local\event\value_objects\description_interface; +use core_calendar\local\event\value_objects\times_interface; /** * Class representing a calendar event. diff --git a/calendar/classes/local/interfaces/event_collection_interface.php b/calendar/classes/local/event/entities/event_collection_interface.php similarity index 96% rename from calendar/classes/local/interfaces/event_collection_interface.php rename to calendar/classes/local/event/entities/event_collection_interface.php index 66ee37abd0e..d1bccbcd453 100644 --- a/calendar/classes/local/interfaces/event_collection_interface.php +++ b/calendar/classes/local/event/entities/event_collection_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/interfaces/event_interface.php b/calendar/classes/local/event/entities/event_interface.php similarity index 98% rename from calendar/classes/local/interfaces/event_interface.php rename to calendar/classes/local/event/entities/event_interface.php index c787f5d1432..a277901c3db 100644 --- a/calendar/classes/local/interfaces/event_interface.php +++ b/calendar/classes/local/event/entities/event_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/event/entities/repeat_event_collection.php b/calendar/classes/local/event/entities/repeat_event_collection.php index 40c909645e7..4289cb3ddcd 100644 --- a/calendar/classes/local/event/entities/repeat_event_collection.php +++ b/calendar/classes/local/event/entities/repeat_event_collection.php @@ -26,9 +26,7 @@ namespace core_calendar\local\event\entities; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\event_collection_interface; -use core_calendar\local\interfaces\event_factory_interface; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\factories\event_factory_interface; use core_calendar\local\event\exceptions\no_repeat_parent_exception; /** diff --git a/calendar/classes/local/event/factories/action_event_factory.php b/calendar/classes/local/event/factories/action_event_factory.php index 26aa516e972..2b89ac6fefd 100644 --- a/calendar/classes/local/event/factories/action_event_factory.php +++ b/calendar/classes/local/event/factories/action_event_factory.php @@ -27,9 +27,8 @@ namespace core_calendar\local\event\factories; defined('MOODLE_INTERNAL') || die(); use core_calendar\local\event\entities\action_event; -use core_calendar\local\interfaces\action_event_factory_interface; -use core_calendar\local\interfaces\action_interface; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\entities\action_interface; +use core_calendar\local\event\entities\event_interface; /** * Action event factory class. diff --git a/calendar/classes/local/interfaces/action_event_factory_interface.php b/calendar/classes/local/event/factories/action_event_factory_interface.php similarity index 90% rename from calendar/classes/local/interfaces/action_event_factory_interface.php rename to calendar/classes/local/event/factories/action_event_factory_interface.php index bad320a3cb9..2f4c6b34b80 100644 --- a/calendar/classes/local/interfaces/action_event_factory_interface.php +++ b/calendar/classes/local/event/factories/action_event_factory_interface.php @@ -22,12 +22,12 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\factories; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\event_interface; -use core_calendar\local\interfaces\action_interface; +use core_calendar\local\event\entities\event_interface; +use core_calendar\local\event\entities\action_interface; /** * Interface for an action event factory class. diff --git a/calendar/classes/local/interfaces/action_factory_interface.php b/calendar/classes/local/event/factories/action_factory_interface.php similarity index 91% rename from calendar/classes/local/interfaces/action_factory_interface.php rename to calendar/classes/local/event/factories/action_factory_interface.php index a5e2f5b9913..89975d563c5 100644 --- a/calendar/classes/local/interfaces/action_factory_interface.php +++ b/calendar/classes/local/event/factories/action_factory_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\factories; defined('MOODLE_INTERNAL') || die(); @@ -34,7 +34,7 @@ interface action_factory_interface { * @param \moodle_url $url The action's URL. * @param int $itemcount The number of items needing action. * @param bool $actionable The action's actionability. - * @return \core_calendar\local\interfaces\action_interface The action. + * @return \core_calendar\local\event\entities\action_interface The action. */ public function create_instance($name, \moodle_url $url, $itemcount, $actionable); } diff --git a/calendar/classes/local/event/factories/event_abstract_factory.php b/calendar/classes/local/event/factories/event_abstract_factory.php index 5f55e287059..c3520f42b9b 100644 --- a/calendar/classes/local/event/factories/event_abstract_factory.php +++ b/calendar/classes/local/event/factories/event_abstract_factory.php @@ -33,9 +33,7 @@ use core_calendar\local\event\proxies\module_std_proxy; use core_calendar\local\event\proxies\std_proxy; use core_calendar\local\event\value_objects\event_description; use core_calendar\local\event\value_objects\event_times; -use core_calendar\local\interfaces\action_event_factory_interface; -use core_calendar\local\interfaces\event_factory_interface; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\entities\event_interface; /** * Abstract factory for creating calendar events. diff --git a/calendar/classes/local/event/factories/event_factory.php b/calendar/classes/local/event/factories/event_factory.php index 9cbbea5c168..9434f2a6c9c 100644 --- a/calendar/classes/local/event/factories/event_factory.php +++ b/calendar/classes/local/event/factories/event_factory.php @@ -27,8 +27,7 @@ namespace core_calendar\local\event\factories; defined('MOODLE_INTERNAL') || die(); use core_calendar\local\event\exceptions\invalid_callback_exception; -use core_calendar\local\event\factories\event_abstract_factory; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\entities\event_interface; /** * Event factory class. diff --git a/calendar/classes/local/interfaces/event_factory_interface.php b/calendar/classes/local/event/factories/event_factory_interface.php similarity index 92% rename from calendar/classes/local/interfaces/event_factory_interface.php rename to calendar/classes/local/event/factories/event_factory_interface.php index 92ea0e0af9c..74afeeaf2ee 100644 --- a/calendar/classes/local/interfaces/event_factory_interface.php +++ b/calendar/classes/local/event/factories/event_factory_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\factories; defined('MOODLE_INTERNAL') || die(); @@ -37,7 +37,7 @@ interface event_factory_interface { * Creates an instance of an event. * * @param \stdClass $dbrow The event row from the database. - * @return \core_calendar\local\interfaces\event_interface + * @return \core_calendar\local\event\entities\event_interface */ public function create_instance(\stdClass $dbrow); } diff --git a/calendar/classes/local/event/mappers/event_mapper.php b/calendar/classes/local/event/mappers/event_mapper.php index 9464d88306b..ae50e7d3615 100644 --- a/calendar/classes/local/event/mappers/event_mapper.php +++ b/calendar/classes/local/event/mappers/event_mapper.php @@ -26,10 +26,10 @@ namespace core_calendar\local\event\mappers; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\event_factory_interface; -use core_calendar\local\interfaces\event_interface; -use core_calendar\local\interfaces\action_event_interface; -use core_calendar\local\interfaces\event_mapper_interface; +use core_calendar\event; +use core_calendar\local\event\entities\action_event_interface; +use core_calendar\local\event\entities\event_interface; +use core_calendar\local\event\factories\event_factory_interface; /** * Event mapper class. diff --git a/calendar/classes/local/interfaces/event_mapper_interface.php b/calendar/classes/local/event/mappers/event_mapper_interface.php similarity index 94% rename from calendar/classes/local/interfaces/event_mapper_interface.php rename to calendar/classes/local/event/mappers/event_mapper_interface.php index 3258450873a..6cf61bfad13 100644 --- a/calendar/classes/local/interfaces/event_mapper_interface.php +++ b/calendar/classes/local/event/mappers/event_mapper_interface.php @@ -22,10 +22,13 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\mappers; defined('MOODLE_INTERNAL') || die(); +use core_calendar\event; +use core_calendar\local\event\entities\event_interface; + /** * Interface for an event mapper class * diff --git a/calendar/classes/local/event/proxies/module_std_proxy.php b/calendar/classes/local/event/proxies/module_std_proxy.php index a93de09197b..1ad48fbf174 100644 --- a/calendar/classes/local/event/proxies/module_std_proxy.php +++ b/calendar/classes/local/event/proxies/module_std_proxy.php @@ -26,8 +26,6 @@ namespace core_calendar\local\event\proxies; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\proxy_interface; - /** * Course module stdClass proxy. * diff --git a/calendar/classes/local/interfaces/proxy_interface.php b/calendar/classes/local/event/proxies/proxy_interface.php similarity index 98% rename from calendar/classes/local/interfaces/proxy_interface.php rename to calendar/classes/local/event/proxies/proxy_interface.php index b307336f95e..6869fd85966 100644 --- a/calendar/classes/local/interfaces/proxy_interface.php +++ b/calendar/classes/local/event/proxies/proxy_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\proxies; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/event/proxies/std_proxy.php b/calendar/classes/local/event/proxies/std_proxy.php index 5b0ac8d498d..e94746d65a2 100644 --- a/calendar/classes/local/event/proxies/std_proxy.php +++ b/calendar/classes/local/event/proxies/std_proxy.php @@ -26,7 +26,6 @@ namespace core_calendar\local\event\proxies; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\proxy_interface; use core_calendar\local\event\exceptions\member_does_not_exist_exception; /** diff --git a/calendar/classes/local/event/strategies/raw_event_retrieval_strategy.php b/calendar/classes/local/event/strategies/raw_event_retrieval_strategy.php index dc888f234c8..7d1836149e0 100644 --- a/calendar/classes/local/event/strategies/raw_event_retrieval_strategy.php +++ b/calendar/classes/local/event/strategies/raw_event_retrieval_strategy.php @@ -26,8 +26,6 @@ namespace core_calendar\local\event\strategies; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\raw_event_retrieval_strategy_interface; - /** * Raw event retrieval strategy. * diff --git a/calendar/classes/local/interfaces/raw_event_retrieval_strategy_interface.php b/calendar/classes/local/event/strategies/raw_event_retrieval_strategy_interface.php similarity index 98% rename from calendar/classes/local/interfaces/raw_event_retrieval_strategy_interface.php rename to calendar/classes/local/event/strategies/raw_event_retrieval_strategy_interface.php index 417318de860..cc670d3b05c 100644 --- a/calendar/classes/local/interfaces/raw_event_retrieval_strategy_interface.php +++ b/calendar/classes/local/event/strategies/raw_event_retrieval_strategy_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\strategies; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/event/value_objects/action.php b/calendar/classes/local/event/value_objects/action.php index 1b94aa89607..f7aa538b317 100644 --- a/calendar/classes/local/event/value_objects/action.php +++ b/calendar/classes/local/event/value_objects/action.php @@ -26,7 +26,7 @@ namespace core_calendar\local\event\value_objects; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\action_interface; +use core_calendar\local\event\entities\action_interface; /** * Class representing an action a user should take diff --git a/calendar/classes/local/interfaces/description_interface.php b/calendar/classes/local/event/value_objects/description_interface.php similarity index 96% rename from calendar/classes/local/interfaces/description_interface.php rename to calendar/classes/local/event/value_objects/description_interface.php index d75852d0719..483eed3aa0c 100644 --- a/calendar/classes/local/interfaces/description_interface.php +++ b/calendar/classes/local/event/value_objects/description_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\value_objects; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/classes/local/event/value_objects/event_description.php b/calendar/classes/local/event/value_objects/event_description.php index 7bf87717cb5..3d4db691a3e 100644 --- a/calendar/classes/local/event/value_objects/event_description.php +++ b/calendar/classes/local/event/value_objects/event_description.php @@ -26,8 +26,6 @@ namespace core_calendar\local\event\value_objects; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\description_interface; - /** * Class representing a description value object. * diff --git a/calendar/classes/local/event/value_objects/event_times.php b/calendar/classes/local/event/value_objects/event_times.php index 2617133ce9f..511b59c9f49 100644 --- a/calendar/classes/local/event/value_objects/event_times.php +++ b/calendar/classes/local/event/value_objects/event_times.php @@ -26,8 +26,6 @@ namespace core_calendar\local\event\value_objects; defined('MOODLE_INTERNAL') || die(); -use core_calendar\local\interfaces\times_interface; - /** * Class representing event times. * diff --git a/calendar/classes/local/interfaces/times_interface.php b/calendar/classes/local/event/value_objects/times_interface.php similarity index 97% rename from calendar/classes/local/interfaces/times_interface.php rename to calendar/classes/local/event/value_objects/times_interface.php index 4d8000c97fb..22cc8217e90 100644 --- a/calendar/classes/local/interfaces/times_interface.php +++ b/calendar/classes/local/event/value_objects/times_interface.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace core_calendar\local\interfaces; +namespace core_calendar\local\event\value_objects; defined('MOODLE_INTERNAL') || die(); diff --git a/calendar/tests/action_event_factory_test.php b/calendar/tests/action_event_factory_test.php index 4acd755ff70..28ea48448c3 100644 --- a/calendar/tests/action_event_factory_test.php +++ b/calendar/tests/action_event_factory_test.php @@ -24,9 +24,9 @@ defined('MOODLE_INTERNAL') || die(); +use core_calendar\local\event\entities\action_event_interface; +use core_calendar\local\event\entities\event_interface; use core_calendar\local\event\factories\action_event_factory; -use core_calendar\local\interfaces\action_event_interface; -use core_calendar\local\interfaces\event_interface; use core_calendar\local\event\value_objects\action; /** diff --git a/calendar/tests/action_event_test.php b/calendar/tests/action_event_test.php index d9d377fa87e..c655f84e01e 100644 --- a/calendar/tests/action_event_test.php +++ b/calendar/tests/action_event_test.php @@ -28,8 +28,8 @@ use core_calendar\local\event\entities\action_event; use core_calendar\local\event\value_objects\action; use core_calendar\local\event\value_objects\event_description; use core_calendar\local\event\value_objects\event_times; -use core_calendar\local\interfaces\event_collection_interface; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\entities\event_collection_interface; +use core_calendar\local\event\entities\event_interface; /** * Action event testcase. diff --git a/calendar/tests/action_factory_test.php b/calendar/tests/action_factory_test.php index 760a4642dc1..d58a4775b94 100644 --- a/calendar/tests/action_factory_test.php +++ b/calendar/tests/action_factory_test.php @@ -25,7 +25,7 @@ defined('MOODLE_INTERNAL') || die(); use core_calendar\action_factory; -use core_calendar\local\interfaces\action_interface; +use core_calendar\local\event\entities\action_interface; /** * Action factory testcase. diff --git a/calendar/tests/core_container_test.php b/calendar/tests/core_container_test.php index 1daca8afca1..93d91bb0b1d 100644 --- a/calendar/tests/core_container_test.php +++ b/calendar/tests/core_container_test.php @@ -26,11 +26,11 @@ defined('MOODLE_INTERNAL') || die(); use core_calendar\local\event\entities\action_event; use core_calendar\local\event\entities\event; +use core_calendar\local\event\entities\event_interface; use core_calendar\local\event\factories\event_factory; +use core_calendar\local\event\factories\event_factory_interface; use core_calendar\local\event\mappers\event_mapper; -use core_calendar\local\interfaces\event_factory_interface; -use core_calendar\local\interfaces\event_interface; -use core_calendar\local\interfaces\event_mapper_interface; +use core_calendar\local\event\mappers\event_mapper_interface; /** * Core container testcase. diff --git a/calendar/tests/event_factory_test.php b/calendar/tests/event_factory_test.php index fe369f7f843..b2f3039f764 100644 --- a/calendar/tests/event_factory_test.php +++ b/calendar/tests/event_factory_test.php @@ -28,7 +28,7 @@ global $CFG; require_once($CFG->dirroot . '/calendar/lib.php'); use core_calendar\local\event\factories\event_factory; -use core_calendar\local\interfaces\event_interface; +use core_calendar\local\event\entities\event_interface; /** * Event factory testcase. diff --git a/calendar/tests/event_mapper_test.php b/calendar/tests/event_mapper_test.php index 472924ba57b..67738f4f190 100644 --- a/calendar/tests/event_mapper_test.php +++ b/calendar/tests/event_mapper_test.php @@ -31,11 +31,12 @@ use core_calendar\local\event\mappers\event_mapper; use core_calendar\local\event\value_objects\action; use core_calendar\local\event\value_objects\event_description; use core_calendar\local\event\value_objects\event_times; -use core_calendar\local\interfaces\action_event_interface; -use core_calendar\local\interfaces\event_collection_interface; -use core_calendar\local\interfaces\event_factory_interface; -use core_calendar\local\interfaces\event_interface; -use core_calendar\local\interfaces\proxy_interface; +use core_calendar\local\event\factories\action_factory_interface; +use core_calendar\local\event\entities\event_collection_interface; +use core_calendar\local\event\factories\event_factory_interface; +use core_calendar\local\event\entities\event_interface; +use core_calendar\local\event\entities\action_event_interface; +use core_calendar\local\event\proxies\proxy_interface; /** * Event mapper testcase. @@ -123,6 +124,7 @@ class core_calendar_event_mapper_testcase extends advanced_testcase { new event_mapper_test_event_factory() ); $legacyevent = $mapper->from_event_to_legacy_event($event); + $this->assertInstanceOf(calendar_event::class, $legacyevent); $this->assertEquals($legacyevent->actionname, 'test action'); $this->assertInstanceOf(\moodle_url::class, $legacyevent->actionurl); diff --git a/calendar/tests/event_test.php b/calendar/tests/event_test.php index cbf85b5178f..c1ddaf96f27 100644 --- a/calendar/tests/event_test.php +++ b/calendar/tests/event_test.php @@ -28,7 +28,7 @@ use core_calendar\local\event\entities\event; use core_calendar\local\event\proxies\std_proxy; use core_calendar\local\event\value_objects\event_description; use core_calendar\local\event\value_objects\event_times; -use core_calendar\local\interfaces\event_collection_interface; +use core_calendar\local\event\entities\event_collection_interface; /** * Event testcase. diff --git a/calendar/tests/helpers.php b/calendar/tests/helpers.php index b3e3404b9d7..c990d4de37d 100644 --- a/calendar/tests/helpers.php +++ b/calendar/tests/helpers.php @@ -35,7 +35,7 @@ use core_calendar\local\event\proxies\std_proxy; use core_calendar\local\event\value_objects\action; use core_calendar\local\event\value_objects\event_description; use core_calendar\local\event\value_objects\event_times; -use core_calendar\local\interfaces\event_factory_interface; +use core_calendar\local\event\factories\event_factory_interface; /** * Create a calendar event with the given properties. diff --git a/calendar/tests/repeat_event_collection_test.php b/calendar/tests/repeat_event_collection_test.php index b8f46a46c39..4f3ad61b85f 100644 --- a/calendar/tests/repeat_event_collection_test.php +++ b/calendar/tests/repeat_event_collection_test.php @@ -29,7 +29,7 @@ use core_calendar\local\event\entities\repeat_event_collection; use core_calendar\local\event\proxies\std_proxy; use core_calendar\local\event\value_objects\event_description; use core_calendar\local\event\value_objects\event_times; -use core_calendar\local\interfaces\event_factory_interface; +use core_calendar\local\event\factories\event_factory_interface; /** * Repeat event collection tests.