From 20c6cbf40a719435418f8b9d9ddbb1e0084c8269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Ivan=C4=8Di=C4=87?= <marko.ivancic@srce.hr>
Date: Thu, 5 Dec 2024 16:42:28 +0100
Subject: [PATCH] Start testing with SSP v2.3

---
 README.md         | 4 ++--
 UPGRADE.md        | 2 +-
 composer.json     | 7 ++++---
 docker/Dockerfile | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 797bdfea..6b3c0e94 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ PHP version requirement changes in minor releases for SimpleSAMLphp.
 
 | OIDC module | Tested SimpleSAMLphp |  PHP   | Note                        |
 |:------------|:---------------------|:------:|-----------------------------|
-| v6.\*       | v2.2.\*              | \>=8.2 | Recommended                 |
+| v6.\*       | v2.3.\*              | \>=8.2 | Recommended                 |
 | v5.\*       | v2.1.\*              | \>=8.1 |                             |
 | v4.\*       | v2.0.\*              | \>=8.0 |                             |
 | v3.\*       | v2.0.\*              | \>=7.4 | Abandoned from August 2023. |
@@ -329,7 +329,7 @@ docker run --name ssp-oidc-dev \
   --mount type=bind,source="$(pwd)/docker/ssp/oidc_module.crt",target=/var/simplesamlphp/cert/oidc_module.crt,readonly \
   --mount type=bind,source="$(pwd)/docker/ssp/oidc_module.key",target=/var/simplesamlphp/cert/oidc_module.key,readonly \
   --mount type=bind,source="$(pwd)/docker/apache-override.cf",target=/etc/apache2/sites-enabled/ssp-override.cf,readonly \
-   -p 443:443 cirrusid/simplesamlphp:v2.2.2
+   -p 443:443 cirrusid/simplesamlphp:v2.3.5
 ```
 
 Visit https://localhost/simplesaml/ and confirm you get the default page.
diff --git a/UPGRADE.md b/UPGRADE.md
index a6f42115..9a766943 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -91,7 +91,7 @@ has been refactored:
 
 - upgraded to v5 of lcobucci/jwt https://github.com/lcobucci/jwt
 - upgraded to v3 of laminas/laminas-diactoros https://github.com/laminas/laminas-diactoros
-- SimpleSAMLphp version used during development was bumped to v2.2
+- SimpleSAMLphp version used during development was bumped to v2.3
 - In Authorization Code Flow, a new validation was added which checks for 'openid' value in 'scope' parameter. Up to
 now, 'openid' value was dynamically added if not present. In Implicit Code Flow this validation was already present. 
 
diff --git a/composer.json b/composer.json
index 8c09654f..69de0580 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "friendsofphp/php-cs-fixer": "^3",
         "phpunit/phpunit": "^10",
         "rector/rector": "^0.18.3",
-        "simplesamlphp/simplesamlphp": "2.2.*",
+        "simplesamlphp/simplesamlphp": "2.3.*",
         "simplesamlphp/simplesamlphp-test-framework": "^1.5",
         "squizlabs/php_codesniffer": "^3",
         "vimeo/psalm": "^5",
@@ -56,9 +56,10 @@
         },
         "sort-packages": true,
         "allow-plugins": {
-            "simplesamlphp/composer-module-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "simplesamlphp/composer-module-installer": true,
+            "simplesamlphp/composer-xmlprovider-installer": true
         },
         "cache-dir": "build/composer"
     },
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c8a12a77..46543010 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
-#FROM cirrusid/simplesamlphp:v2.2.2
-FROM cicnavi/simplesamlphp:dev
+FROM cirrusid/simplesamlphp:v2.3.5
+#FROM cicnavi/simplesamlphp:dev
 
 RUN apt-get update && apt-get install -y sqlite3
 # Prepopulate the DB with items needed for testing