1.15.4

burbuja · Mar 3, 2018 · 195386a · 195386a
1 parent 4b3741a
commit 195386a
Show file tree

Hide file tree

Showing 30 changed files with 213 additions and 114 deletions.
diff --git a/composer.json b/composer.json
@@ -1,10 +1,11 @@
 {
     "name": "simplesamlphp/simplesamlphp",
     "description": "A PHP implementation of a SAML 2.0 service provider and identity provider, also compatible with Shibboleth 1.3 and 2.0.",
+    "version": "v1.15.4",
     "type": "project",
     "keywords": [ "saml2", "shibboleth","oauth","ws-federation","sp","idp" ],
     "homepage": "http://simplesamlphp.org",
-    "license": "LGPL-2.1",
+    "license": "LGPL-2.1-or-later",
     "authors": [
         {
             "name": "Andreas Åkre Solberg",
@@ -36,7 +37,7 @@
         "ext-hash": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "simplesamlphp/saml2": "~3.0",
+        "simplesamlphp/saml2": "~3.1.4",
         "robrichards/xmlseclibs": "~3.0",
         "whitehat101/apr1-md5": "~1.0",
         "twig/twig": "~1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config-templates/config.php b/config-templates/config.php
@@ -19,7 +19,6 @@
      * baseurlpath is a *URL path* (not a filesystem path).
      * A valid format for 'baseurlpath' is:
      * [(http|https)://(hostname|fqdn)[:port]]/[path/to/simplesaml/]
-     * (note that it must end with a '/')
      *
      * The full url format is useful if your SimpleSAMLphp setup is hosted behind
      * a reverse proxy. In that case you can specify the external url here.