Merge branch 'master' into feature/webmozart-upgrade

Author: tvdijen

.github/workflows/php.yml

@@ -19,9 +19,9 @@ 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.10.6
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.6
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
     with:
       enable_eslinter: false
       enable_jsonlinter: true
@@ -45,7 +45,7 @@ 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
@@ -107,7 +107,7 @@ 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
@@ -216,8 +216,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.2'
-          extensions: ctype, date, filter, pcre, spl
+          php-version: '8.3'
+          extensions: ctype, date, filter, pcre, sodium, spl
           tools: composer
           coverage: none
 

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-date": "*",
         "ext-filter": "*",
         "ext-pcre": "*",
@@ -25,7 +25,7 @@
     "require-dev": {
         "ext-intl": "*",
 
-        "simplesamlphp/simplesamlphp-test-framework": "~1.10"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.11"
     },
     "autoload": {
         "psr-4": {

src/Assert.php

@@ -16,13 +16,17 @@
 use function array_unshift;
 use function call_user_func_array;
 use function end;
+use function is_array;
+use function is_callable;
 use function is_object;
 use function is_resource;
 use function is_string;
 use function is_subclass_of;
 use function lcfirst;
 use function method_exists;
 use function preg_match; // Requires ext-pcre
+use function reset;
+use function sprintf;
 use function strval;
 
 /**

src/Base64Trait.php

@@ -16,7 +16,6 @@
  */
 trait Base64Trait
 {
-    /** @var string */
     private static string $base64_regex = '/^(?:[a-z0-9+\/]{4})*(?:[a-z0-9+\/]{2}==|[a-z0-9+\/]{3}=)?$/i';