mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-02 14:15:11 +02:00
Code Issues Projects Releases Wiki Activity

MDL-63658 core_favourites: namespace the repositories and services

Browse Source
This commit is contained in:
Jake Dallimore 2018-10-02 08:25:25 +08:00
parent 771051325b
commit 4a02aae5f5
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
favourites/classes/local/crud_repository.php → favourites/classes/local/repository/crud_repository.php
View File

@ -20,7 +20,7 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_favourites\local;
namespace core_favourites\local\repository;
defined('MOODLE_INTERNAL') || die();

2
favourites/classes/local/favourites_repository.php → favourites/classes/local/repository/favourites_repository.php
View File

@ -20,7 +20,7 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_favourites\local;
namespace core_favourites\local\repository;
defined('MOODLE_INTERNAL') || die();

2
favourites/classes/local/ifavourites_repository.php → favourites/classes/local/repository/ifavourites_repository.php
View File

@ -20,7 +20,7 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_favourites\local;
namespace core_favourites\local\repository;
defined('MOODLE_INTERNAL') || die();

8
favourites/classes/local/user_favourites_service.php → favourites/classes/local/service/user_favourites_service.php
View File

@ -21,7 +21,7 @@
* @copyright 2018 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace core_favourites\local;
namespace core_favourites\local\service;
defined('MOODLE_INTERNAL') || die();
@ -38,7 +38,7 @@ defined('MOODLE_INTERNAL') || die();
*/
class user_favourites_service {
/** @var user_favourites_repository $repo the user favourites repository object. */
/** @var ifavourites_repository $repo the user favourites repository object. */
protected $repo;
/** @var int $userid the id of the user to which this favourites service is scoped. */
@ -59,9 +59,9 @@ class user_favourites_service {
* The user_favourites_service constructor.
*
* @param \context_user $usercontext The context of the user to which this service operations are scoped.
* @param ifavourites_repository $repository a user favourites repository.
* @param \core_favourites\local\repository\ifavourites_repository $repository a user favourites repository.
*/
public function __construct(\context_user $usercontext, ifavourites_repository $repository) {
public function __construct(\context_user $usercontext, \core_favourites\local\repository\ifavourites_repository $repository) {
$this->repo = $repository;
$this->userid = $usercontext->instanceid;
}

4
favourites/classes/services.php
View File

@ -42,8 +42,8 @@ class services {
* @param \context_user $context the context of the user to which the service should be scoped.
* @return user_favourites_service the service object.
*/
public static function get_service_for_user_context(\context_user $context) : local\user_favourites_service {
return new local\user_favourites_service($context, new local\favourites_repository());
public static function get_service_for_user_context(\context_user $context) : local\service\user_favourites_service {
return new local\service\user_favourites_service($context, new local\repository\favourites_repository());
}
}

2
favourites/tests/repository_test.php
View File

@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
use \core_favourites\local\favourites_repository;
use \core_favourites\local\repository\favourites_repository;
/**
* Test class covering the favourites_repository.

18
favourites/tests/service_test.php
View File

@ -58,7 +58,7 @@ class user_favourites_service_testcase extends advanced_testcase {
*/
protected function get_mock_repository(array $mockstore) {
// This mock will just store data in an array.
$mockrepo = $this->getMockBuilder(\core_favourites\local\ifavourites_repository::class)
$mockrepo = $this->getMockBuilder(\core_favourites\local\repository\ifavourites_repository::class)
->setMethods([])
->getMock();
$mockrepo->expects($this->any())
@ -140,7 +140,7 @@ class user_favourites_service_testcase extends advanced_testcase {
public function test_get_service_for_user_context() {
list($user1context, $user2context, $course1context, $course2context) = $this->setup_users_and_courses();
$userservice = \core_favourites\services::get_service_for_user_context($user1context);
$this->assertInstanceOf(\core_favourites\local\user_favourites_service::class, $userservice);
$this->assertInstanceOf(\core_favourites\local\service\user_favourites_service::class, $userservice);
}
/**
@ -151,7 +151,7 @@ class user_favourites_service_testcase extends advanced_testcase {
// Get a user_favourites_service for a user.
$repo = $this->get_mock_repository([]); // Mock repository, using the array as a mock DB.
$user1service = new \core_favourites\local\user_favourites_service($user1context, $repo);
$user1service = new \core_favourites\local\service\user_favourites_service($user1context, $repo);
// Favourite a course.
$favourite1 = $user1service->create_favourite('core_course', 'course', $course1context->instanceid, $course1context);
@ -170,7 +170,7 @@ class user_favourites_service_testcase extends advanced_testcase {
// Get a user_favourites_service for the user.
$repo = $this->get_mock_repository([]); // Mock repository, using the array as a mock DB.
$user1service = new \core_favourites\local\user_favourites_service($user1context, $repo);
$user1service = new \core_favourites\local\service\user_favourites_service($user1context, $repo);
// Try to favourite something in a non-existent component.
$this->expectException('moodle_exception');
@ -185,7 +185,7 @@ class user_favourites_service_testcase extends advanced_testcase {
// Get a user_favourites_service for the user.
$repo = $this->get_mock_repository([]); // Mock repository, using the array as a mock DB.
$service = new \core_favourites\local\user_favourites_service($user1context, $repo);
$service = new \core_favourites\local\service\user_favourites_service($user1context, $repo);
// Favourite 2 courses, in separate areas.
$fav1 = $service->create_favourite('core_course', 'course', $course1context->instanceid, $course1context);
@ -211,8 +211,8 @@ class user_favourites_service_testcase extends advanced_testcase {
// Get a user_favourites_service for 2 users.
$repo = $this->get_mock_repository([]);
$user1service = new \core_favourites\local\user_favourites_service($user1context, $repo);
$user2service = new \core_favourites\local\user_favourites_service($user2context, $repo);
$user1service = new \core_favourites\local\service\user_favourites_service($user1context, $repo);
$user2service = new \core_favourites\local\service\user_favourites_service($user2context, $repo);
// Now, as each user, favourite the same course.
$fav1 = $user1service->create_favourite('core_course', 'course', $course1context->instanceid, $course1context);
@ -238,7 +238,7 @@ class user_favourites_service_testcase extends advanced_testcase {
// Get a user_favourites_service for the user.
$repo = $this->get_mock_repository([]);
$service = new \core_favourites\local\user_favourites_service($user1context, $repo);
$service = new \core_favourites\local\service\user_favourites_service($user1context, $repo);
// Verify we get an exception if we try to search for favourites in an invalid component.
$this->expectException('moodle_exception');
@ -253,7 +253,7 @@ class user_favourites_service_testcase extends advanced_testcase {
// Get a user_favourites_service for the user.
$repo = $this->get_mock_repository([]);
$service = new \core_favourites\local\user_favourites_service($user1context, $repo);
$service = new \core_favourites\local\service\user_favourites_service($user1context, $repo);
// Favourite a course.
$fav1 = $service->create_favourite('core_course', 'course', $course1context->instanceid, $course1context);