Merge pull request #888 from catalyst/composer-fixes

Clean up from composer change

Author: danmarsden

classes/store.php

@@ -27,7 +27,7 @@
 /**
  * A moodle DB datastore
  *
- * This is essentially a clone of /.extlib/simplesamlphp/lib/SimpleSAML/Store/SQL.php
+ * This is essentially a clone of simplesamlphp/lib/SimpleSAML/Store/SQL.php
  * but with the SQL rewritten to use the moodle api $DB->blah() instead of PDO;
  *
  * @copyright  2016 Brendan Heywood <brendan@catalyst-au.net>

sp/metadata.php

@@ -21,7 +21,7 @@
  * way so it has been copied here and forked. The main differences are
  * the config lookup, but also using the proxy SP module urls.
  *
- * Original file is: /.extlib/simplesamlphp/modules/saml/www/sp/metadata.php
+ * Original file is: simplesamlphp/modules/saml/www/sp/metadata.php
  *
  * @package    auth_saml2
  * @copyright  Brendan Heywood <brendan@catalyst-au.net>

sp/module.php

@@ -33,4 +33,4 @@
     $_SERVER['SERVER_PORT'] = '443';
 }
 
-require($CFG->dirroot.'/auth/saml2/.extlib/simplesamlphp/public/module.php');
+require($CFG->dirroot.'/auth/saml2/vendor/simplesamlphp/simplesamlphp/public/module.php');

tests/simplesamlphp_upgrade_test.php

@@ -7,4 +7,25 @@
     <license></license>
     <licenseversion></licenseversion>
   </library>
+  <library>
+    <location>vendor</location>
+    <name>Composer</name>
+    <version></version>
+    <license></license>
+    <licenseversion></licenseversion>
+  </library>
+  <library>
+    <location>vendor/cweagans/composer-patches</location>
+    <name>Composer Patches</name>
+    <version>1.7.3</version>
+    <license>BSD</license>
+    <licenseversion>3</licenseversion>
+  </library>
+  <library>
+    <location>vendor/simplesamlphp/simplesamlphp</location>
+    <name>SimpleSamlPHP</name>
+    <version>2.4.7</version>
+    <license>LGPL</license>
+    <licenseversion>2.1</licenseversion>
+  </library>
 </libraries>