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

@@ -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;
 
 /**

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'
         ];
     }
 }

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;
 

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.

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;
 
 /**

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;

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();

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.

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
  *

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.

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();
 

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();
 

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.

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();
 

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();
 

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;
 
 /**

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.

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.

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);
 }

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.

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.

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);
 }

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.

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
  *

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.
  *

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();
 

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;
 
 /**

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.
  *

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();
 

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

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();
 

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.
  *

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.
  *

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();
 

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;
 
 /**

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.

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.

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.

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.

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);

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.

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.

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.