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 --combined .eslintignore
@@@ -13,7 -13,6 +13,6 @@@ lib/editor/tinymce/plugins/pdw/tinymce
  lib/editor/tinymce/plugins/spellchecker/rpc.php
  lib/editor/tinymce/tiny_mce/
  lib/adodb/
- lib/alfresco/
  lib/bennu/
  lib/evalmath/
  lib/lessphp/
@@@ -49,7 -48,6 +48,7 @@@ lib/mustache
  lib/amd/src/mustache.js
  lib/graphlib.php
  lib/spout/
 +lib/amd/src/chartjs-lazy.js
  mod/assign/feedback/editpdf/fpdi/
  repository/s3/S3.php
  theme/bootstrapbase/less/bootstrap/
diff --combined lib/thirdpartylibs.xml
@@@ -7,13 -7,6 +7,6 @@@
      <version>5.20.3</version>
      <licenseversion>2.1+</licenseversion>
    </library>
-   <library>
-     <location>alfresco</location>
-     <name>Alfresco</name>
-     <license>GPL</license>
-     <version></version>
-     <licenseversion>2.0+</licenseversion>
-   </library>
    <library>
      <location>bennu</location>
      <name>Bennu</name>
      <license>GPL</license>
      <version>2.3.0</version>
    </library>
 +  <library>
 +    <location>amd/src/chartjs-lazy.js</location>
 +    <name>Chart.js</name>
 +    <license>MIT</license>
 +    <version>2.1.6</version>
 +  </library>
  </libraries>
diff --combined 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 ===
  
@@@ -45,7 -45,7 +45,7 @@@ class core_repository_generator_testcas
          $this->resetAfterTest(true);
  
          // All the repository types.
-         $all = array('alfresco', 'boxnet', 'coursefiles', 'dropbox', 'equella', 'filesystem', 'flickr',
+         $all = array('boxnet', 'coursefiles', 'dropbox', 'equella', 'filesystem', 'flickr',
              'flickr_public', 'googledocs', 'local', 'merlot', 'picasa', 'recent', 's3', 'upload', 'url',
              'user', 'webdav', 'wikimedia', 'youtube');
  
          $this->assertEquals($record->contextid, $instance->contextid);
  
          // Invalid context.
 -        $this->setExpectedException('coding_exception');
 +        $this->expectException('coding_exception');
          $record->contextid = context_block::instance($block->id)->id;
          $instance = $this->getDataGenerator()->create_repository('webdav', $record);
      }