Commit graph

4047 commits

Author SHA1 Message Date
Sara Arjona
ca2db4be71 Merge branch 'MDL-67673' of https://github.com/stronk7/moodle into master 2020-10-21 17:38:05 +02:00
Eloy Lafuente (stronk7)
40de097e65 MDL-67673 phpunit: Remove deprecated assertContains() uses on strings
Both assertContains() and assertNotContains() are deprecated in PHPUnit 8
for operations on strings. Also the optional case parameter is. All uses
must be changed to one of:

- assertStringContainsString()
- assertStringContainsStringIgnoringCase()
- assertStringNotContainsString()
- assertStringNotContainsStringIgnoringCase()

More info: https://github.com/sebastianbergmann/phpunit/issues/3422

Regexp to find all uses:

ag 'assert(Not)?Contains\('
2020-10-21 12:46:00 +02:00
Eloy Lafuente (stronk7)
d95c378771 MDL-67673 phpunit: Remove expectedException annotations
While this is not strictly required, because removal will
happen in PHPUnit 9.0, we are already getting rid of all
uses in core.

From release notes:https://phpunit.de/announcements/phpunit-8.html

The annotations `@expectedException`, `@expectedExceptionCode`,
`@expectedExceptionMessage`, and `@expectedExceptionMessageRegExp`
are now deprecated.
Using these annotations will trigger a deprecation warning
in PHPUnit 8 and in PHPUnit 9 these annotations will be removed.

Also, all uses of expectExceptionMessageRegExp() has been moved
to expectExceptionMessageMatches(). See https://github.com/sebastianbergmann/phpunit/issues/3957

TODO: Various weirdness found while doing the changes with these tests:
- vendor/bin/phpunit lib/tests/exporter_test.php (created MDL-69700)
- vendor/bin/phpunit competency/tests/external_test.php (same issue than prev one)
- vendor/bin/phpunit question/engine/tests/questionengine_test.php (created MDL-69624)
- vendor/bin/phpunit lib/tests/event_test.php (created MDL-69688)
2020-10-21 12:46:00 +02:00
Eloy Lafuente (stronk7)
598d578af7 MDL-67673 phpunit: Remove deprecated assertArraySubset()
While this is not strictly required, because removal will
happen in PHPUnit 9.0, we are already getting rid of all
uses in core.

From release notes:https://phpunit.de/announcements/phpunit-8.html

assertArraySubset() is deprecated and will be removed in PHPUnit 9.
2020-10-21 12:45:59 +02:00
Eloy Lafuente (stronk7)
f94195c320 MDL-67673 phpunit: Remove deprecated assertInternalType()
While this is not strictly required, because removal will
happen in PHPUnit 9.0, we are already getting rid of all
uses in core.

From release notes:https://phpunit.de/announcements/phpunit-8.html

assertInternalType() is deprecated and will be removed in
PHPUnit 9. Refactor your test to use assertIsArray(), assertIsBool(),
assertIsFloat(), assertIsInt(), assertIsNumeric(), assertIsObject(),
assertIsResource(), assertIsString(), assertIsScalar(),
assertIsCallable(), or assertIsIterable() instead.
2020-10-21 12:45:59 +02:00
Eloy Lafuente (stronk7)
f6711bb394 MDL-67673 phpunit: Fix the return type of template methods
All the setup/teardown/pre/post/conditions template methods
now are required to return void. This was warned with phpunit 7
and now is enforced.

At the same time, fix a few wrong function names,
provider data and param types, return statements...
2020-10-21 12:45:59 +02:00
Jun Pataleta
e58bb28610 MDL-69392 mod_forum: Colour contrast check for locked discussions 2020-10-21 14:11:39 +08:00
Víctor Déniz
e335eb092a Merge branch 'MDL-68900-master' of https://github.com/sumitnegi933/moodle 2020-10-14 12:35:26 +01:00
Paul Holden
bdfe918b13 MDL-67654 mod_forum: formchangechecker for discussion inline replies. 2020-10-12 23:32:50 +01:00
Sumit Negi
bd6449fca9 MDL-68900 mod_forum: permission check for user who is viewing timed post
Pass current user object to post builder as argument, so that the permission to view timed post
will check with current user, who is viewing the posts instead of user who made that post.
2020-10-08 12:47:31 +05:30
Andrew Nicols
b702feb38d Merge branch 'MDL-67275-master-post_noun_verb' of git://github.com/mudrd8mz/moodle 2020-10-07 12:16:39 +08:00
Sara Arjona
6bb0262ed8 Merge branch 'MDL-68098-master' of git://github.com/dpalou/moodle into master 2020-10-01 12:56:16 +02:00
Dani Palou
8c84eeeeac MDL-68098 ws: Fix WebServices broken by filters HTML 2020-09-22 09:43:03 +02:00
David Mudrák
0188cc2ed7 MDL-67275 forum: Fix language and accessibility issues with buttons
There were inconsistencies with the text shown on the submit button,
depending on the where the button was shown.

* Inline reply forum displayed general "Submit".
* Experimental nested discussion view reply form displayed "Post"
  (post/core string) which acts as a noun in other contexts and cannot
  be used as such in many non-English languages.
* Advanced reply form displayed "Post to forum".

The patch fixes this and starts to show "Post to forum" in all three
places consistently.

While working on this, two more issues were noticed and fixed:

* Inline reply textarea's title was hard-coded English "post" text.
  Changed to "Message" to provide advisory information related to the
  element.
* Buttons contained title attribute with the same value as the explicit
  button text. This goes against accessibility guidelines.
2020-09-21 22:48:33 +02:00
Bas Brands
4c71e1d0d0 MDL-69454 core_search: consistent mod searches 2020-09-21 11:54:51 +02:00
Sara Arjona
7c99f40d61 Merge branch 'MDL-69521' of https://github.com/stronk7/moodle into master 2020-09-09 08:08:06 +02:00
Eloy Lafuente (stronk7)
74ee34fd87 MDL-69521 core: Move all comments in code from 4.1 to 3.11 2020-09-08 18:59:30 +02:00
Pau Ferrer Ocaña
150913d3e1 MDL-69577 forum: Add courseid, forumid on get_discussion_posts response 2020-09-01 14:25:10 +02:00
Andrew Nicols
b0a28f3bbb MDL-66818 mod_forum: Use cap manager to check exportability 2020-08-21 11:33:30 +08:00
Andrew Nicols
5c617d81e6 Merge branch 'MDL-66818-master' of git://github.com/lameze/moodle 2020-08-20 08:16:07 +08:00
Simey Lameze
7235771927 MDL-66818 mod_forum: remove unnecessary behat steps 2020-08-20 08:03:53 +08:00
gthomas2
4224b8e541 MDL-66818 mod_forum: hide portfolio export button based on caps 2020-08-20 07:46:09 +08:00
Andrew Nicols
f24aae4cad Merge branch 'MDL-67735-master' of git://github.com/bmbrands/moodle 2020-08-19 08:28:49 +08:00
Eloy Lafuente (stronk7)
fbb0767536 MDL-69475 versions: bump all versions and requires in master
version = 2021052500 release version
requires= 2021052500 same than version

Why 20210525? (25th May 2021) ?

Because master is going to be Moodle 4.0, to be released
on November 2021. And, until then, we are going to have
a couple of "intermediate" releases:

- Moodle 3.10 to be released 9th November 2020. (2020110900)

  This version will be using versions from today to 2020110900
  (once it's released the YYYYMMDD part stops advancing).

- Moodle 3.11 to be released 10th May 2021. (2021051000)

  This version will be using versions from 3.10 release to 2021051000
  (once it's released the YYYYMMDD part stops advancing).

That means that all versions from today to 2021051000 are going
to be used by those 2 "intermediate" releases (3.10 and 3.11).

And we cannot use them in master, because it's forbidden to have
any overlapping of versions between branches (or different upgrade
paths will fail).

So, get that 2021051000, let's add it a couple of weeks to cover
the on-sync period (or a 2 weeks delay max!) and, the first version
that master can "own" in exclusive (without any overlap) is, exactly,
25th May 2021, hence our 20210525.
2020-08-18 00:47:15 +02:00
Bas Brands
4394f9e358 MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css 2020-08-17 08:16:42 +00:00
Andrew Nicols
12403bc004 Merge branch 'MDL-68618' of https://github.com/paulholden/moodle 2020-08-12 13:39:20 +08:00
Andrew Nicols
d6c8f14ed9 Merge branch 'MDL-68731' of https://github.com/jonof/moodle 2020-08-12 08:32:00 +08:00
Paul Holden
e9a5485f3e MDL-68618 mod_forum: stop reverting idnumber when updating instance. 2020-08-10 09:11:02 +01:00
Jun Pataleta
05cc2df693 Merge branch 'MDL-69111-master' of git://github.com/bmbrands/moodle 2020-08-06 11:37:12 +08:00
Adrian Greeve
71d61a7c8c Merge branch 'MDL-68647-master-forumprivacysql' of git://github.com/mudrd8mz/moodle 2020-08-05 14:18:24 +08:00
Victor Deniz Falcon
f8c999616a Merge branch 'MDL-66707-master' of git://github.com/rezaies/moodle 2020-07-29 22:36:49 +01:00
Jonathon Fowler
1ce5dbad41 MDL-68731 forum: fix digests not correctly updating post read statuses 2020-07-29 15:41:42 +10:00
Sergio Comerón
a1087ef609 MDL-66755 forum: Subscription cancel when edit a message 2020-07-24 09:05:17 +02:00
Andrew Nicols
b284293402 MDL-69138 behat: Update session->visit() to use visit step 2020-07-22 16:43:08 +08:00
Bas Brands
0489e9ceee MDL-69111 mod_forum: forum grading on small viewports
- changes to make the forum grading UI accessible in small
viewports to meet criterion 1.4.10 Reflow.
2020-07-21 17:42:02 +02:00
David Mudrák
8a6b13b71e MDL-68647 forum: Add index over posts privatereplyto field
This is to further improve the performance of searching of posts related
to the given user. Once both userid and privatereplyto are indexed, the
query planner can use the merged index to search for posts records.
2020-07-21 11:55:25 +02:00
David Mudrák
e2f1e10225 MDL-68647 forum: Improve the SQL performance in the privacy provider
The idea here is to replace the existing LEFT JOINs and
OR / IS NOT NULL conditions with INNER JOINs and ANDs. So we gather the
discussions data from all three areas in individual queries, make their
UNION. The GROUP BY was present before and maybe it is not even needed
any more (due to how UNION works) but it should not hurt to keep it.

This leads to significantly improved performance.
2020-07-21 11:53:08 +02:00
David Mudrák
474e768a26 MDL-68647 forum: Add missing advanced grading library inclusion
The method get_grading_manager() is called in the file so make sure the
library is loaded. Without it, the forum's privacy provider unit test
ended with error.

Not directly related to the issue, but noticed while working on it.
2020-07-21 11:53:08 +02:00
Shamim Rezaie
4bd0eaf732 MDL-66707 mod_forum: do not blindly mark discussion replies as read 2020-07-15 22:20:40 +10:00
Eloy Lafuente (stronk7)
b764343e5a MDL-69044 upgrade: add 3.9.0 separation line to all upgrade scripts 2020-06-14 13:08:09 +02:00
Eloy Lafuente (stronk7)
115cc0214f MDL-68973 versions: bump all versions and requires near release
version = 2020061500 release version
requires= 2020060900 current rc1 (week7roll1) version
2020-06-09 16:23:09 +02:00
Víctor Déniz Falcón
37f2c91a8c Merge branch 'MDL-68209-master-2' of git://github.com/bmbrands/moodle 2020-05-28 16:37:21 +01:00
Eloy Lafuente (stronk7)
a0e38e4371 MDL-68846 behat: Avoid asserting AM/PM strings. They are not cross-os
The exists/contains steps of behat are case-sensitive, in the other
side, depending of the OS and locales, time functions are not 100%
consistent. See https://bugs.php.net/bug.php?id=76378 for example.

So only solutions are:

1) Create a specific new step performing the checks case insensitively.
2) Avoid making AM / PM part of the checks.

Here we have opted by the 2nd approach, it's not critical part to check.
2020-05-27 17:55:32 +02:00
Bas Brands
5fe7bcdb30 MDL-68209 core_course: improve activity chooser styling 2020-05-27 16:49:23 +02:00
Andrew Nicols
7d02452504 Merge branch 'MDL-67547' of https://github.com/paulholden/moodle 2020-05-26 08:06:39 +08:00
Paul Holden
f8f5a2f6da MDL-67547 mod_forum: convert pluginfile URLs prior to export. 2020-05-26 00:54:51 +01:00
Eloy Lafuente (stronk7)
9eb1b08f07 Merge branch 'MDL-68645-master-earlyoutputinit' of git://github.com/mudrd8mz/moodle 2020-05-14 16:35:35 +02:00
Sara Arjona
ccc7a30b3e Merge branch 'MDL-68200-master-take2' of git://github.com/rezaies/moodle 2020-05-14 13:10:01 +02:00
David Mudrák
005b00dd9b MDL-68645 output: Do not apply filters when creating calendar events
Applying filters on an activity module description when using it as a
new calendar event's description is bad m'kay? We need to store the raw
text and apply the filters only when we actually display the text. That
way, filters (such as multi-language content) may actually fully work
and we do not initialise the theme and output machinery.

Additionally, we need to explicitly set the format of the description
text to HTML (because we have converted it to it already). Otherwise it
defaults to the current user's preferred editor format.

This is still a pragmatic hot-fix solution. The proper solution would be
to pass the raw text, format and embedded files.
2020-05-13 10:03:01 +02:00
Shamim Rezaie
31d401aaa0 MDL-68200 mod_forum: fix invalid format of the time tag on modern view 2020-05-12 15:13:01 +10:00