moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-64820 forum: fix cibot complaints

Browse source
This commit is contained in:
Ryan Wyllie 2019-03-22 10:38:41 +08:00
parent f30f46db39
commit 446ba04650
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mod/forum/classes/local/builders/exported_discussion_summaries.php
View file

@ -28,7 +28,6 @@ defined('MOODLE_INTERNAL') || die();
use mod_forum\local\entities\discussion as discussion_entity; use mod_forum\local\entities\discussion as discussion_entity;
use mod_forum\local\entities\forum as forum_entity; use mod_forum\local\entities\forum as forum_entity;
use mod_forum\local\entities\forum;
use mod_forum\local\entities\post as post_entity; use mod_forum\local\entities\post as post_entity;
use mod_forum\local\factories\legacy_data_mapper as legacy_data_mapper_factory; use mod_forum\local\factories\legacy_data_mapper as legacy_data_mapper_factory;
use mod_forum\local\factories\exporter as exporter_factory; use mod_forum\local\factories\exporter as exporter_factory;
@ -38,6 +37,8 @@ use renderer_base;
use stdClass; use stdClass;
/** /**
* Exported discussion summaries builder class.
*
* This class is an implementation of the builder pattern (loosely). It is responsible * This class is an implementation of the builder pattern (loosely). It is responsible
* for taking a set of related forums, discussions, and posts and generate the exported * for taking a set of related forums, discussions, and posts and generate the exported
* version of the discussion summaries. * version of the discussion summaries.
@ -48,6 +49,10 @@ use stdClass;
* *
* See this doc for more information on the builder pattern: * See this doc for more information on the builder pattern:
* https://designpatternsphp.readthedocs.io/en/latest/Creational/Builder/README.html * https://designpatternsphp.readthedocs.io/en/latest/Creational/Builder/README.html
*
* @package mod_forum
* @copyright 2019 Mihail Geshoski <mihail@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/ */
class exported_discussion_summaries { class exported_discussion_summaries {
/** @var renderer_base $renderer Core renderer */ /** @var renderer_base $renderer Core renderer */
@ -100,7 +105,7 @@ class exported_discussion_summaries {
*/ */
public function build( public function build(
stdClass $user, stdClass $user,
forum $forum, forum_entity $forum,
array $discussions array $discussions
) : array { ) : array {

4
mod/forum/classes/local/factories/renderer.php
View file

@ -416,7 +416,7 @@ class renderer {
$exportedpostsbuilder = $this->builderfactory->get_exported_posts_builder(); $exportedpostsbuilder = $this->builderfactory->get_exported_posts_builder();
$discussionentries = []; $discussionentries = [];
$postentries = []; $postentries = [];
foreach($discussions as $discussion) { foreach ($discussions as $discussion) {
$discussionentries[] = $discussion->get_discussion(); $discussionentries[] = $discussion->get_discussion();
$discussionentriesids[] = $discussion->get_discussion()->get_id(); $discussionentriesids[] = $discussion->get_discussion()->get_id();
$postentries[] = $discussion->get_first_post(); $postentries[] = $discussion->get_first_post();
@ -433,7 +433,7 @@ class renderer {
$discussionrepliescount = $postvault->get_reply_count_for_discussion_ids($discussionentriesids); $discussionrepliescount = $postvault->get_reply_count_for_discussion_ids($discussionentriesids);
array_walk($exportedposts['posts'], function($post) use ($discussionrepliescount) { array_walk($exportedposts['posts'], function($post) use ($discussionrepliescount) {
$post->discussionrepliescount = $discussionrepliescount[$post->discussionid] ?? 0; $post->discussionrepliescount = $discussionrepliescount[$post->discussionid] ?? 0;
// TODO: Find a better solution due to language differences when defining the singular and plural form. // TODO: Find a better solution due to language differences when defining the singular and plural form.
$post->isreplyplural = $post->discussionrepliescount != 1 ? true : false; $post->isreplyplural = $post->discussionrepliescount != 1 ? true : false;
}); });

2
mod/forum/classes/local/managers/capability.php
View file

@ -91,7 +91,7 @@ class capability {
*/ */
public function can_subscribe_to_forum(stdClass $user) : bool { public function can_subscribe_to_forum(stdClass $user) : bool {
if ($this->forum->get_type() == 'single') { if ($this->forum->get_type() == 'single') {
return false; return false;
} }
return !is_guest($this->get_context(), $user) && return !is_guest($this->get_context(), $user) &&

1
mod/forum/classes/local/renderers/discussion_list.php
View file

@ -93,6 +93,7 @@ class discussion_list {
* @param capability_manager $capabilitymanager The managed used to check capabilities on the forum * @param capability_manager $capabilitymanager The managed used to check capabilities on the forum
* @param url_factory $urlfactory The factory used to create URLs in the forum * @param url_factory $urlfactory The factory used to create URLs in the forum
* @param notification[] $notifications A list of any notifications to be displayed within the page * @param notification[] $notifications A list of any notifications to be displayed within the page
* @param callable|null $postprocessfortemplate Callback function to process discussion lists for templates
*/ */
public function __construct( public function __construct(
forum_entity $forum, forum_entity $forum,

5
mod/forum/tests/local_container_test.php
View file

@ -47,7 +47,10 @@ class mod_forum_local_container_testcase extends advanced_testcase {
* @covers ::get_legacy_data_mapper_factory * @covers ::get_legacy_data_mapper_factory
*/ */
public function test_get_legacy_data_mapper_factory() { public function test_get_legacy_data_mapper_factory() {
$this->assertInstanceOf(\mod_forum\local\factories\legacy_data_mapper::class, \mod_forum\local\container::get_legacy_data_mapper_factory()); $this->assertInstanceOf(
\mod_forum\local\factories\legacy_data_mapper::class,
\mod_forum\local\container::get_legacy_data_mapper_factory()
);
} }
/** /**