Commit graph

6087 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
3a5641cb74 MDL-67673 phpunit: Remove deprecated assertEquals() params
The optional parameters of assertEquals() and assertNotEquals()
are deprecated in PHPUnit 8 (to be removed in PHPUnit 9):

- delta => use assertEqualsWithDelta()
- canonicalize => use assertEqualsCanonicalizing()
- ignoreCase => use assertEqualsIgnoringCase
- maxDepth => removed without replacement.

More info @ https://github.com/sebastianbergmann/phpunit/issues/3341

Initial search done with:

ag 'assert(Not)?Equals\(.*,.*,' --php

Then, running tests and fixing remaining cases.
2020-10-21 12:46:00 +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)
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
Jake Dallimore
127befd73b Merge branch 'MDL-69902' of https://github.com/marinaglancy/moodle 2020-10-21 10:57:15 +08:00
Jake Dallimore
3d0f28ebb8 Merge branch 'MDL-69751-master' of git://github.com/mihailges/moodle 2020-10-21 10:05:16 +08:00
Mihail Geshoski
2939efff84 MDL-69751 course: Handle missing guest user context
Makes sure the guest user context exists when fetching
the recommended modules. If the context does not exist
an exception is being thrown describing the problem.
2020-10-20 08:31:43 +08:00
Luca Bösch
531ce52940 MDL-65448 core_course: Restyle non-JS activity moving. 2020-10-16 14:50:21 +02:00
Marina Glancy
be53990301 MDL-69902 core_search: fix error in the custom fields indexing 2020-10-09 08:53:24 +02:00
Sara Arjona
f25dba2de1 Merge branch 'MDL-64657-master' of git://github.com/jleyva/moodle into master 2020-10-08 14:15:26 +02:00
Víctor Déniz
7a8950c172 Merge branch 'MDL-69625' of https://github.com/paulholden/moodle 2020-10-05 19:22:03 +01:00
Jun Pataleta
cc7c3b3e25 Merge branch 'MDL-69704-master' of git://github.com/sarjona/moodle 2020-10-05 23:13:08 +08:00
Paul Holden
d178779851 MDL-69625 course: return raw custom field value in external method.
For clients that wish to consume the original value of the custom
field (e.g. timestamps for date fields), rather than the formatted
version, add a new "valueraw" property to the returned data.
2020-10-05 10:39:31 +01:00
Sara Arjona
64fbd346ba MDL-69704 course: catch exception when calling get_course_content_items
When plugins are removed from disk, an exception is thrown when
calling component_callback_exists.
This exception should be catched here in order to load properly
the activity chooser (otherwise, the exception will be displayed
and no activity will appear).
2020-10-01 19:54:35 +02: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
Nathan Nguyen
10db3a0b0a MDL-69573 core_course: Make MAX_COURSES_IN_CATEGORY configurable 2020-09-30 16:02:39 +10:00
Sara Arjona
8223718081 Merge branch 'MDL-68935-master' of git://github.com/jleyva/moodle into master 2020-09-28 11:40:37 +02:00
Juan Leyva
d6c289c5e3 MDL-64657 course: Return hidden section names when configured 2020-09-22 11:52:18 +02:00
Dani Palou
8c84eeeeac MDL-68098 ws: Fix WebServices broken by filters HTML 2020-09-22 09:43:03 +02:00
Bas Brands
c549ca5d35 MDL-69454 core_search: consistent activity chooser search 2020-09-21 11:54:53 +02:00
Bas Brands
d5593b18c2 MDL-69454 core_search: consistent course management search 2020-09-21 10:15:11 +02:00
Bas Brands
968cd48336 MDL-69454 core_search: consistent frontpage course search 2020-09-21 10:15:11 +02:00
Juan Leyva
35101a6a2c MDL-68935 course: Return context data in get_content WS 2020-09-16 12:32:22 +02:00
Stephen Bourget
1a453e4d8d MDL-69630 format_social: Add ajax support 2020-09-10 19:04:34 -04:00
Eloy Lafuente (stronk7)
432b9a9075 MDL-69521 core: Move all comments in code from 4.3 to 4.1 2020-09-08 18:59:46 +02:00
Sara Arjona
cf4841cfdb Merge branch '67278-master-categories-selector' of https://github.com/DSI-Universite-Rennes2/moodle into master 2020-09-02 17:37:15 +02:00
Julien Boulen
93d7220587 MDL-67278 course: Use autocomplete widget for course category selector 2020-09-02 15:30:34 +02:00
Paul Holden
ad7d46ed2e MDL-63387 course: use renamed role names, update Behat tests.
Specify that we want both role names (renamed course role plus
original).
2020-09-01 12:05:20 +01:00
Eloy Lafuente (stronk7)
9a79c34eb6 MDL-69479 upgrade: Change all 4.0 occurrences to 3.10
Under parallel development, when something is worth being commented
in upgrade.txt notes, it will be applied to all the development branches
using the "earliest" one to be released. So, if something changes
in 3.10 (and also is applied to master), the upgrade.txt notes will
show 3.10 in both branches.

Of course, if something only goes to one dev branch (say master), then the
master version will be used in the notes (4.0 in this case).
2020-08-21 23:57:17 +02:00
Andrew Nicols
06f900daff Merge branch 'MDL-66900' of https://github.com/paulholden/moodle 2020-08-20 07:51:30 +08:00
Adrian Greeve
678660093e Merge branch 'MDL-69475' of https://github.com/stronk7/moodle 2020-08-19 10:37:51 +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)
089a3ac4a1 Merge branch 'MDL-68928' of https://github.com/Chocolate-lightning/moodle into master 2020-08-18 19:01:52 +02:00
Eloy Lafuente (stronk7)
b7100ae5b1 MDL-69475 backup: Proper handling of backup::RELEASE versions
1) Remove any floatval() casting. They are breaking / killing
   .10 versions (converting them to .1). Since Moodle 2.0 all the
   backup::RELEASE have been 100% numerical values.
2) Use version_compare() always to compare backup::RELEASE values.
   They are always versions and the function is aware of versions
   > .9, able to clean/ignore alpha chars... and everything else.

Note that I've also changed a couple of cases in formats (topics and
weeks) that were correct, but just added the same comment and used
the same version_compare() comparison parameters style, so all uses
in core are consistent (and safe to be copied out there).
2020-08-18 12:48:10 +02: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
Eloy Lafuente (stronk7)
45ce46f202 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 mater, 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-17 00:11:41 +02:00
Andrew Nicols
c59247e1e8 Merge branch 'MDL-60260' of https://github.com/paulholden/moodle 2020-08-13 07:54:26 +08:00
Paul Holden
b983f174d0 MDL-66900 course: don't clean category description when editing. 2020-08-12 11:48:18 +01:00
Mathew May
b4121975b1 MDL-68928 core_course: Select activity chooser footer 2020-08-11 09:25:50 +08:00
Neill Magill
e7008d4686 MDL-69296 resource: Pressing cancel should always exit settings form
Before this change if a user used navigated to a resource activity
from another activity and then edited the settings it was likely
that using the cancel button would result in file downloading,
rather than being returned to their last page.

After this change the user will be back on the page they came from.
2020-07-31 07:56:54 +01:00
Paul Holden
9dbb05ffe0 MDL-60260 course: validate external fields on create/update course.
Ensure course fullname/shortname fields are not empty.
2020-07-29 19:57:16 +01:00
Mihail Geshoski
7add3440c8 MDL-69079 course: Handle missing guest when fetching recommended modules 2020-07-24 10:33:50 +08:00
Mihail Geshoski
3295288d6e MDL-69079 course: Handle fetch module data failures in activity chooser 2020-07-24 10:33:50 +08:00
Jun Pataleta
0ea341f14b Merge branch 'MDL-68586-format_topics_code_prechecks' of https://gitlab.com/drlikm/moodle 2020-07-22 23:26:24 +08:00
Sara Arjona
23f33d12ca Merge branch 'MDL-57678-master-3' of git://github.com/junpataleta/moodle 2020-07-15 12:56:02 +02:00
Jun Pataleta
2c45ad6f18 MDL-57678 core_course: Deprecate make_categories_options()
Padding nested course categories by space to make them render in a tree
structure does not really make a lot of sense as they are already being
rendered as full paths. It's simpler to show them without the
indentation.
Given this, there's not much point keeping make_categories_options().
So it's better to deprecate this function and call
core_course_category::make_categories_list() directly instead.
2020-07-15 18:25:57 +08:00
Jake Dallimore
805214b38c Merge branch 'MDL-69206-master' of git://github.com/mihailges/moodle 2020-07-15 10:29:03 +08:00
Sara Arjona
22f4eab309 Merge branch 'MDL-68715' of https://github.com/paulholden/moodle 2020-07-14 14:31:44 +02:00