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

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
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. * Constructor.
* *
* @param string $msg Error message. * @param string|null $msg Error message.
* @param integer $code Error code. * @param integer $code Error code.
* @param Horde_Imap_Client_Interaction_Server $server Server ob. * @param Horde_Imap_Client_Interaction_Server $server Server ob.
* @param Horde_Imap_Client_Interaction_Pipeline $pipeline Pipeline ob. * @param Horde_Imap_Client_Interaction_Pipeline $pipeline Pipeline ob.
*/ */
public function __construct( public function __construct(
$msg = null, $msg,
$code = 0, $code,
Horde_Imap_Client_Interaction_Server $server, Horde_Imap_Client_Interaction_Server $server,
Horde_Imap_Client_Interaction_Pipeline $pipeline Horde_Imap_Client_Interaction_Pipeline $pipeline
) )

5
lib/horde/readme_moodle.txt
View file

@ -36,3 +36,8 @@ do
cp -Rf $locale/* $target/locale cp -Rf $locale/* $target/locale
fi fi
done 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); declare(strict_types=1);
namespace core;
use advanced_testcase;
use phpunit_dataset;
use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStream;
/** /**
@ -32,7 +36,7 @@ use org\bovigo\vfs\vfsStream;
* *
* @coversDefaultClass phpunit_dataset * @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. // We need public properties to check the basis.
$dsref = new ReflectionClass($ds); $dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables'); $dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true); $dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns'); $dscolumns = $dsref->getProperty('columns');
@ -152,7 +156,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset(); $ds = new phpunit_dataset();
// We need public properties to check the basis. // We need public properties to check the basis.
$dsref = new ReflectionClass($ds); $dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables'); $dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true); $dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns'); $dscolumns = $dsref->getProperty('columns');
@ -245,7 +249,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset(); $ds = new phpunit_dataset();
// We need public properties to check the basis. // We need public properties to check the basis.
$dsref = new ReflectionClass($ds); $dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables'); $dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true); $dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns'); $dscolumns = $dsref->getProperty('columns');
@ -391,7 +395,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset(); $ds = new phpunit_dataset();
// We need public properties to check the basis. // We need public properties to check the basis.
$dsref = new ReflectionClass($ds); $dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables'); $dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true); $dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns'); $dscolumns = $dsref->getProperty('columns');
@ -485,7 +489,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset(); $ds = new phpunit_dataset();
// We need public properties to check the basis. // We need public properties to check the basis.
$dsref = new ReflectionClass($ds); $dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables'); $dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true); $dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns'); $dscolumns = $dsref->getProperty('columns');
@ -656,7 +660,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
$ds = new phpunit_dataset(); $ds = new phpunit_dataset();
// We need public properties to check the basis. // We need public properties to check the basis.
$dsref = new ReflectionClass($ds); $dsref = new \ReflectionClass($ds);
$dstables = $dsref->getProperty('tables'); $dstables = $dsref->getProperty('tables');
$dstables->setAccessible(true); $dstables->setAccessible(true);
$dscolumns = $dsref->getProperty('columns'); $dscolumns = $dsref->getProperty('columns');
@ -785,7 +789,7 @@ class core_phpunit_dataset_testcase extends advanced_testcase {
* @dataProvider to_database_provider * @dataProvider to_database_provider
* @covers ::to_database * @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; global $DB;
$this->resetAfterTest(); $this->resetAfterTest();