mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 20:53:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-73405' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Sara Arjona 2021-12-22 17:20:43 +01:00
commit c16e2aae0a
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/horde/framework/Horde/Imap/Client/Exception/ServerResponse.php
View File

@ -44,14 +44,14 @@ class Horde_Imap_Client_Exception_ServerResponse extends Horde_Imap_Client_Excep
/**
* Constructor.
*
* @param string $msg Error message.
* @param string|null $msg Error message.
* @param integer $code Error code.
* @param Horde_Imap_Client_Interaction_Server $server Server ob.
* @param Horde_Imap_Client_Interaction_Pipeline $pipeline Pipeline ob.
*/
public function __construct(
$msg = null,
$code = 0,
$msg,
$code,
Horde_Imap_Client_Interaction_Server $server,
Horde_Imap_Client_Interaction_Pipeline $pipeline
)

5
lib/horde/readme_moodle.txt
View File

@ -36,3 +36,8 @@ do
cp -Rf $locale/* $target/locale
fi
done
Local modifications:
- lib/Horde/Imap/Client/Exception/ServerResponse.php has been minimally modified for php80 compatibility
The fix applied is already upstream, see https://github.com/horde/Imap_Client/pull/13 and it's available
in Imap_Client 2.30.4 and up. See MDL-73405 for more details.

20
lib/phpunit/tests/phpunit_dataset.test.php → lib/phpunit/tests/phpunit_dataset_test.php
View File

@ -25,6 +25,10 @@
declare(strict_types=1);
namespace core;
use advanced_testcase;
use phpunit_dataset;
use org\bovigo\vfs\vfsStream;
/**
@ -32,7 +36,7 @@ use org\bovigo\vfs\vfsStream;
*
* @coversDefaultClass phpunit_dataset
*/
class core_phpunit_dataset_testcase extends advanced_testcase {
class phpunit_dataset_test extends advanced_testcase {
/**
@ -48,7 +52,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
];
// We need public properties to check the basis.
$dsref = new ReflectionClass($ds);
$dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns');
@ -152,7 +156,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset();
// We need public properties to check the basis.
$dsref = new ReflectionClass($ds);
$dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns');
@ -245,7 +249,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset();
// We need public properties to check the basis.
$dsref = new ReflectionClass($ds);
$dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns');
@ -391,7 +395,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset();
// We need public properties to check the basis.
$dsref = new ReflectionClass($ds);
$dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns');
@ -485,7 +489,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset();
// We need public properties to check the basis.
$dsref = new ReflectionClass($ds);
$dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns');
@ -656,7 +660,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset();
// We need public properties to check the basis.
$dsref = new ReflectionClass($ds);
$dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns');
@ -785,7 +789,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
* @dataProvider to_database_provider
* @covers ::to_database
*/
public function test_to_database(array $files, ?array $filter = [], ?string $exception, array $columns, array $rows) {
public function test_to_database(array $files, ?array $filter, ?string $exception, array $columns, array $rows) {
global $DB;
$this->resetAfterTest();