Bump minimum PHP version and fix composer cache

Author: tvdijen

.github/workflows/php.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.2', '8.3', '8.4', '8.5']
+        php-version: ['8.3', '8.4', '8.5']
 
     uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
     with:
@@ -45,15 +45,15 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        php-versions: ['8.3', '8.4', '8.5']
 
     steps:
       - name: Setup PHP, with composer and extensions
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, sodium, spl, xml
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: pcov
@@ -77,7 +77,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -107,15 +107,16 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [windows-latest]
-        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        php-versions: ['8.3', '8.4', '8.5']
 
     steps:
       - name: Setup PHP, with composer and extensions
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml, zip
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl,\
+            pcre, posix, sodium, spl, xml, zip
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: none
@@ -139,7 +140,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -176,7 +177,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -214,8 +215,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.2'
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          php-version: '8.3'
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, sodium, spl, xml
           tools: composer
           coverage: none
 
@@ -230,7 +231,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 

composer.json

@@ -34,13 +34,13 @@
         }
     },
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
 
-        "dapphp/radius": "~3.1.0",
-        "simplesamlphp/simplesamlphp": "^2.4.0"
+        "dapphp/radius": "^3.1",
+        "simplesamlphp/simplesamlphp": "^2.5@dev"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.10.3"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.11"
     },
     "support": {
         "issues": "https://github.com/tvdijen/simplesamlphp-module-radius/issues",

src/Auth/Source/Radius.php

@@ -26,11 +26,11 @@
  */
 class Radius extends UserPassBase
 {
-    public const RADIUS_USERNAME = 1;
+    public const int RADIUS_USERNAME = 1;
 
-    public const RADIUS_VENDOR_SPECIFIC = 26;
+    public const int RADIUS_VENDOR_SPECIFIC = 26;
 
-    public const RADIUS_NAS_IDENTIFIER = 32;
+    public const int RADIUS_NAS_IDENTIFIER = 32;
 
 
     /**
@@ -160,7 +160,7 @@ protected function login(
             $radius->setNasIpAddress($_SERVER['SERVER_ADDR'] ?: $httpUtils->getSelfHost());
 
             if ($this->nasIdentifier !== null) {
-                $radius->setAttribute(self::RADIUS_NAS_IDENTIFIER, $this->nasIdentifier);
+                $radius->setAttribute((string)self::RADIUS_NAS_IDENTIFIER, $this->nasIdentifier);
             }
 
             if ($this->realm !== null) {