From 5ab3c55aaf2a76cd067ac3b3a658f5200442d2c5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 12 Aug 2023 23:13:51 +0200
Subject: [PATCH] Update test-framework

---
 .github/workflows/documentation.yml           |  1 +
 .github/workflows/php.yml                     | 18 +++++++++++++
 composer.json                                 |  2 +-
 .../module_casserver.php.dist                 |  0
 psalm-dev.xml                                 | 27 +++++++++++++++++++
 psalm.xml                                     | 17 ------------
 tools/composer-require-checker.json           |  4 +++
 7 files changed, 51 insertions(+), 18 deletions(-)
 rename config-templates/module_casserver.php => config/module_casserver.php.dist (100%)
 create mode 100644 psalm-dev.xml
 create mode 100644 tools/composer-require-checker.json

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index da4e274..422acd5 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -11,6 +11,7 @@ on:
     branches: [master, simplesamlphp-*]
     paths:
       - '**.md'
+  workflow_dispatch:
 
 jobs:
   quality:
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9bdb9ae..876bbdb 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -271,3 +271,21 @@ jobs:
 
       - name: Codecov
         uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
+
+  cleanup:
+    name: Cleanup artifacts
+    needs: [unit-tests-linux, coverage]
+    runs-on: [ubuntu-latest]
+    if: |
+      always() &&
+      needs.coverage.result == 'success' ||
+      (needs.unit-tests-linux == 'success' && needs.coverage == 'skipped')
+
+    steps:
+      - uses: geekyeggo/delete-artifact@v2
+        with:
+          name: coverage-data
diff --git a/composer.json b/composer.json
index 380cb8b..aff233f 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "php": "^8.0",
 
         "simplesamlphp/composer-module-installer": "^1.3.4",
-        "simplesamlphp/simplesamlphp": "^2.0.0",
+        "simplesamlphp/simplesamlphp": "^3@dev",
         "simplesamlphp/xml-common": "^1.12.2"
     },
     "require-dev": {
diff --git a/config-templates/module_casserver.php b/config/module_casserver.php.dist
similarity index 100%
rename from config-templates/module_casserver.php
rename to config/module_casserver.php.dist
diff --git a/psalm-dev.xml b/psalm-dev.xml
new file mode 100644
index 0000000..6116331
--- /dev/null
+++ b/psalm-dev.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<psalm
+    name="SimpleSAMLphp testsuite"
+    useDocblockTypes="true"
+    errorLevel="4"
+    reportMixedIssues="false"
+    hideExternalErrors="true"
+    allowStringToStandInForClass="true"
+>
+    <projectFiles>
+        <directory name="tests" />
+
+        <!-- Ignore certain directories -->
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <!-- Ignore UnresolvableInclude on CLI-scripts -->
+        <UnresolvableInclude>
+            <errorLevel type="suppress">
+                <file name="tests/bootstrap.php" />
+            </errorLevel>
+        </UnresolvableInclude>
+    </issueHandlers>
+</psalm>
diff --git a/psalm.xml b/psalm.xml
index bab6e1c..5887f14 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,7 +8,6 @@
     <projectFiles>
         <directory name="config-templates" />
         <directory name="src" />
-        <directory name="tests" />
         <directory name="www" />
     </projectFiles>
 
@@ -30,21 +29,5 @@
         <MissingParamType errorLevel="info" />
         <UnusedClass errorLevel="info" />
         <PossiblyUnusedMethod errorLevel="info" />
-
-        <!-- Suppress PHPunit-issue -->
-        <InternalMethod>
-            <errorLevel type="suppress">
-                <directory name="tests" />
-            </errorLevel>
-        </InternalMethod>
-
-
-        <!-- Ignore UnresolvableInclude -->
-        <UnresolvableInclude>
-            <errorLevel type="suppress">
-                <file name="tests/bootstrap.php" />
-                <file name="tests/routers/configLoader.php" />
-            </errorLevel>
-        </UnresolvableInclude>
     </issueHandlers>
 </psalm>
diff --git a/tools/composer-require-checker.json b/tools/composer-require-checker.json
new file mode 100644
index 0000000..eed71aa
--- /dev/null
+++ b/tools/composer-require-checker.json
@@ -0,0 +1,4 @@
+{
+  "symbol-whitelist": [
+  ]
+}