MDL-56012 lib: Update of readme and xml file.

Also made edits to use the PSR-4 autoloader.
gjb2048 · Oct 4, 2016 · dd9ee3d · dd9ee3d
1 parent cd198ea
commit dd9ee3d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/dataformat/csv/classes/writer.php b/dataformat/csv/classes/writer.php
@@ -24,8 +24,6 @@
 
 namespace dataformat_csv;
 
-require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php");
-
 defined('MOODLE_INTERNAL') || die();
 
 /**

diff --git a/dataformat/excel/classes/writer.php b/dataformat/excel/classes/writer.php
@@ -24,8 +24,6 @@
 
 namespace dataformat_excel;
 
-require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php");
-
 defined('MOODLE_INTERNAL') || die();
 
 /**

diff --git a/dataformat/ods/classes/writer.php b/dataformat/ods/classes/writer.php
@@ -24,8 +24,6 @@
 
 namespace dataformat_ods;
 
-require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php");
-
 defined('MOODLE_INTERNAL') || die();
 
 /**

diff --git a/lib/classes/component.php b/lib/classes/component.php
@@ -77,7 +77,8 @@ class core_component {
         'GeoIp2' => 'lib/maxmind/GeoIp2',
         'Sabberworm\\CSS' => 'lib/php-css-parser',
         'MoodleHQ\\RTLCSS' => 'lib/rtlcss',
-        'Leafo\\ScssPhp' => 'lib/scssphp'
+        'Leafo\\ScssPhp' => 'lib/scssphp',
+        'Box\\Spout' => 'lib/spout/src/Spout'
     );
 
     /**

diff --git a/lib/spout/readme_moodle.txt b/lib/spout/readme_moodle.txt
@@ -1,13 +1,10 @@
-#!/bin/sh
-#
-# Description of import of Horde libraries
-#
-
-wget https://codeload.github.com/box/spout/zip/v2.4.3
-unzip v2.4.3
-rm v2.4.3
-rm spout-2.4.3/composer.json
-rm -rf src
-mv -f spout-2.4.3/* .
-rm -r spout-2.4.3/
+Description of Spout library import 2.6.0
+=========================================
+* Download / Clone from https://github.com/box/spout/
+* Only include the src/Spout directory.
+* Update lib/thirdpartylibs.xml with the latest version.
 
+2016/09/20
+----------
+Updated to v2.6.0 (MDL-56012)
+by Adrian Greeve <[email protected]>
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
@@ -262,8 +262,9 @@
   <library>
     <location>spout</location>
     <name>Spout</name>
-    <license>GPL</license>
-    <version>2.3.0</version>
+    <license>Apache</license>
+    <version>2.6.0</version>
+    <licenseversion>2.0</licenseversion>
   </library>
   <library>
     <location>amd/src/chartjs-lazy.js</location>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,8 +24,6 @@ @@
     namespace dataformat_csv;
-    require_once("$CFG->libdir/spout/src/Spout/Autoloader/autoload.php");
     defined('MOODLE_INTERNAL') || die();
     /**
@@ Expand Down @@