Merge branch 'MDL-49533-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 08:40:17 +0000 (09:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 08:40:17 +0000 (09:40 +0100)
1  2 
.eslintignore
lib/thirdpartylibs.xml
lib/upgrade.txt
repository/tests/generator_test.php

diff --cc .eslintignore
Simple merge
Simple merge
diff --cc lib/upgrade.txt
@@@ -26,24 -26,8 +26,26 @@@ information provided here is intended e
    - get_records_csv() Please use csv_import_reader::load_csv_content() instead.
    - put_records_csv() Please use download_as_dataformat (lib/dataformatlib.php) instead.
  * The password_compat library was removed as it is no longer required.
 +* Phpunit has been upgraded to 5.4.x and following has been deprecated and is not used any more:
 +  - setExpectedException(), use @expectedException or $this->expectException() and $this->expectExceptionMessage()
 +  - getMock(), use createMock() or getMockBuilder()->getMock()
 +  - UnitTestCase class is removed.
 +* The following methods have been finally deprecated and should no longer be used:
 +  - course_modinfo::build_section_cache()
 +  - cm_info::get_deprecated_group_members_only()
 +  - cm_info::is_user_access_restricted_by_group()
 +* The following methods in cm_info::standardmethods have also been finally deprecated and should no longer be used:
 +  - cm_info::get_after_edit_icons()
 +  - cm_info::get_after_link()
 +  - cm_info::get_content()
 +  - cm_info::get_custom_data()
 +  - cm_info::get_extra_classes()
 +  - cm_info::get_on_click()
 +  - cm_info::get_url()
 +  - cm_info::obtain_dynamic_data()
 +  Calling them through the magic method __call() will throw a coding exception.
+ * The alfresco library has been removed from core. It was an old version of
+   the library which was not compatible with newer versions of Alfresco.
  
  === 3.1 ===
  
Simple merge