Merge branch 'bump-versions' into 'main'

Bump PHP, SSP and oidc versions

See merge request !12

.github/workflows/test.yml

@@ -8,10 +8,10 @@ on:
 
 
 jobs:
-  test-74:
+  test-80:
     runs-on: ubuntu-latest
     container:
-      image: cicnavi/dap:74
+      image: cicnavi/dap:80
     steps:
       - uses: actions/checkout@v3
       - name: Validate composer.json and composer.lock
@@ -32,7 +32,7 @@ jobs:
       - name: Show PHP version
         run: php -v
 
-  test-latest:
+  test-81:
     runs-on: ubuntu-latest
     container:
       image: cicnavi/dap:81

.gitlab-ci.yml

@@ -13,18 +13,16 @@ stages:
   - test
   - deploy
 
-# PHP v7.4
-test-74:
+test-80:
   tags:
     - niif-hu-docker
   stage: test
-  image: cicnavi/dap:74
+  image: cicnavi/dap:80
   script:
     - composer install --prefer-dist --no-progress --no-suggest
     - vendor/bin/psalm --clear-cache
     - composer run-script pre-commit
 
-# PHP v8.1
 test-81:
   tags:
     - niif-hu-docker

composer.json

@@ -12,7 +12,8 @@
     "config": {
         "allow-plugins": {
             "simplesamlphp/composer-module-installer": true
-        }
+        },
+        "cache-dir": "build/composer"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +26,7 @@
         }
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-pdo": "*",
         "ext-pdo_sqlite": "*",
         "composer-runtime-api": "^2.0",
@@ -38,9 +39,9 @@
         "vimeo/psalm": "^5",
         "phpunit/phpunit": "^9",
         "squizlabs/php_codesniffer": "^3",
-        "simplesamlphp/simplesamlphp": "^2",
+        "simplesamlphp/simplesamlphp": "2.0.*",
         "simplesamlphp/simplesamlphp-test-framework": "^1",
-        "simplesamlphp/simplesamlphp-module-oidc": "^3",
+        "simplesamlphp/simplesamlphp-module-oidc": "^4",
         "fakerphp/faker": "^1.22"
     },
     "suggest": {

hooks/hook_cron.php

@@ -60,7 +60,7 @@ function accounting_hook_cron(array &$cronInfo): void
             ($retentionPolicy = $moduleConfiguration->getTrackerDataRetentionPolicy()) !== null
         ) {
             $helpersManager = new HelpersManager();
-            $message = sprintf('Handling data retention policy.');
+            $message = 'Handling data retention policy.';
             $logger->info($message);
             /** @psalm-suppress MixedArrayAssignment */
             $cronInfo['summary'][] = $message;

psalm.xml

@@ -4,10 +4,10 @@
     resolveFromConfigFile="true"
     findUnusedBaselineEntry="true"
     findUnusedCode="true"
+    cacheDirectory="./build/psalm/cache"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    cacheDirectory="./build/psalm/cache"
 >
     <projectFiles>
         <directory name="src" />

src/ModuleConfiguration.php

@@ -93,8 +93,7 @@ class ModuleConfiguration
         }
 
         if (! is_string($value)) {
-            $message = sprintf('Job runner maximum activity must be defined either as null, or DateInterval' .
-                               'duration (string).');
+            $message = 'Job runner maximum activity must be defined either as null, or DateInterval duration (string).';
             throw new InvalidConfigurationException($message);
         }