Merge branch 'master' into version-5

Author: cicnavi

.github/workflows/test.yaml

@@ -219,17 +219,17 @@ jobs:
         run: |
           sed -i -e 's/localhost/localhost.emobix.co.uk/g' src/main/resources/application.properties
           sed -i -e 's/-B clean/-B -DskipTests=true/g' builder-compose.yml
-          docker-compose -f builder-compose.yml run builder
+          docker compose -f builder-compose.yml run builder
       - name: Run Conformance Suite
         working-directory: ./conformance-suite
         run: |
-          docker-compose -f docker-compose-dev.yml up -d
+          docker compose -f docker-compose-dev.yml up -d
           while ! curl -skfail https://localhost.emobix.co.uk:8443/api/runner/available >/dev/null; do sleep 2; done
       - name: Start SSP docker
         working-directory: ./main
         # Must run after conformance suite since they share a docker network.
         run: |
-          OIDC_VERSION=@dev docker-compose -f docker/docker-compose.yml --project-directory . up -d --build
+          OIDC_VERSION=@dev docker compose -f docker/docker-compose.yml --project-directory . up -d --build
           sleep 30
         # while ! curl -skfail https://op.local.stack-dev.cirrusidentity.com/.well-known/openid-configuration >/dev/null; do sleep 2; done
       - name: Run Basic conformance tests
@@ -247,11 +247,11 @@ jobs:
       - name: Stop SSP
         working-directory: ./main
         run: |
-          docker-compose -f docker/docker-compose.yml down
+          docker compose -f docker/docker-compose.yml down
       - name: Stop Conformance Suite
         working-directory: ./conformance-suite
         # cleaning up errors out on removing the network, so add "|| true" to prevent that from breaking the build
         run: |
-          docker-compose -f docker-compose-dev.yml down || true
+          docker compose -f docker-compose-dev.yml down || true
           sudo rm -rf mongo
 

README.md

@@ -13,7 +13,7 @@ Currently supported flows are:
 
 [![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-oidc/actions/workflows/test.yaml/badge.svg)](https://github.com/simplesamlphp/simplesamlphp-module-oidc/actions/workflows/test.yaml) 
 [![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-oidc/branch/master/graph/badge.svg)](https://app.codecov.io/gh/simplesamlphp/simplesamlphp-module-oidc)
-[![SimpleSAMLphp](https://img.shields.io/badge/simplesamlphp-1.19-brightgreen)](https://simplesamlphp.org/)
+[![SimpleSAMLphp](https://img.shields.io/badge/simplesamlphp-2.1-brightgreen)](https://simplesamlphp.org/)
 
 ![Main screen capture](docs/oidc.png)
 

docker/Dockerfile

@@ -1,5 +1,5 @@
 #FROM cirrusid/simplesamlphp:v2.0.0
-FROM cicnavi/simplesamlphp:dev-simplesamlphp-2.1
+FROM cicnavi/simplesamlphp:dev
 
 RUN apt-get update && apt-get install -y sqlite3
 # Prepopulate the DB with items needed for testing

docker/docker-compose.yml

@@ -50,5 +50,5 @@ services:
 # Connect to the conformance-suite network to make it easier to communicate between components
 networks:
   default:
-    external:
-      name: conformance-suite_default
+    name: conformance-suite_default
+    external: true

src/Services/LoggerService.php

@@ -42,7 +42,7 @@ public function notice(string|Stringable $message, array $context = []): void
         Logger::notice($message . ($context ? " " . var_export($context, true) : ""));
     }
 
-    public function info($message, array $context = []): void
+    public function info(string|Stringable $message, array $context = []): void
     {
         Logger::info($message . ($context ? " " . var_export($context, true) : ""));
     }
@@ -52,6 +52,9 @@ public function debug(string|Stringable $message, array $context = []): void
         Logger::debug($message . ($context ? " " . var_export($context, true) : ""));
     }
 
+    /**
+     * @param mixed $level
+     */
     public function log($level, string|Stringable $message, array $context = []): void
     {
         match ($level) {