mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-71067' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Ilya Tregubov 2023-06-01 08:55:36 +08:00
commit f245db464f
No known key found for this signature in database
GPG Key ID: 0F58186F748E55C1
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/phpunit/classes/coverage_info.php
View File

@ -22,31 +22,8 @@
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
/**
* Coverage information for PHPUnit.
*
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class phpunit_coverage_info {
/**
* @var array The list of folders relative to the plugin root to whitelist in coverage generation.
* @deprecated since Moodle 3.11 MDL-70745 - please don't use this property any more.
* @todo MDL-71067 - remove in Moodle 4.3
*/
protected $whitelistfolders = [];
/**
* @var array The list of files relative to the plugin root to whitelist in coverage generation.
* @deprecated since Moodle 3.11 MDL-70745 - please don't use this property any more.
* @todo MDL-71067 - remove in Moodle 4.3
*/
protected $whitelistfiles = [];
/** @var array The list of folders relative to the plugin root to include in coverage generation. */
protected $includelistfolders = [];
@ -83,18 +60,6 @@ class phpunit_coverage_info {
if (!empty($plugindir)) {
$plugindir .= "/";
// TODO: MDL-71067 - remove this whole block once these properties deprecation period ends.
if (!empty($this->whitelistfolders) || !empty($this->whitelistfiles)) {
// Warning if the deprecated (whitelist) properties are found.
echo "Warning: \$whitelistfolders and \$whitelistfiles in " .
"coverage.php files are deprecated since Moodle 3.11. " .
"Please, replace them with \$includelistfolders and " .
"\$includelistfiles in {$plugindir}tests/coverage.php\n";
$includelistfolders = array_merge($includelistfolders, $this->whitelistfolders);
$includelistfiles = array_merge($includelistfiles, $this->whitelistfiles);
}
}
foreach (array_unique($includelistfolders) as $folder) {

3
lib/upgrade.txt
View File

@ -7,6 +7,9 @@ information provided here is intended especially for developers.
- admin_setting_requiredpasswordunmask
* The badges_get_oauth2_service_options() method has been deprecated, because it's not required anymore. It should no longer
be used.
* Support for the following phpunit coverage info properties, deprecated since 3.11, has been removed:
- `whitelistfolders`
- `whitelistfiles`
=== 4.2 ===