Bump minimum PHP-version and dependencies

tvdijen · tvdijen · commit 5599da1bfc06 · 2026-01-05T21:19:47.000+01:00
diff --git a/.github/workflows/php.yml b/.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,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, ldap, mbstring, openssl, pcre, spl, xml
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, 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@v4
         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, ldap, mbstring, openssl, pcre, spl, xml, zip
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl,\
+            pcre, 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@v4
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -163,7 +164,7 @@ jobs:
           # Should be the higest supported version, so we can use the newest tools
           php-version: '8.5'
           tools: composer, composer-require-checker, composer-unused, phpcs
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, spl, xml
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, sodium, spl, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -176,7 +177,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v4
         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, spl, xml
+          php-version: '8.3'
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, sodium, spl, xml
           tools: composer
           coverage: none
 
@@ -230,7 +231,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/composer.json b/composer.json
@@ -34,28 +34,24 @@
         }
     },
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
+
         "ext-pcre": "*",
         "ext-dom": "*",
 
         "simplesamlphp/assert": "^1.9",
-        "simplesamlphp/composer-module-installer": "^1.4",
-        "simplesamlphp/simplesamlphp": "dev-simplesamlphp-2.5 as v2.5.x-dev",
-        "simplesamlphp/simplesamlphp-module-ldap": "~1.2",
-        "simplesamlphp/xml-cas-module-slate": "~1.1.0",
-        "simplesamlphp/xml-cas": "^v2.2.0",
-        "simplesamlphp/xml-common": "~2.4",
-        "symfony/http-foundation": "~7.4",
-        "symfony/http-client": "~7.4",
+        "simplesamlphp/composer-module-installer": "^1.5",
+        "simplesamlphp/simplesamlphp": "^2.5@dev",
+        "simplesamlphp/simplesamlphp-module-ldap": "^1.2",
+        "simplesamlphp/xml-cas-module-slate": "^1.2",
+        "simplesamlphp/xml-cas": "^2.3",
+        "simplesamlphp/xml-common": "^2.5",
+        "symfony/http-foundation": "^7.4",
+        "symfony/http-client": "^7.4",
         "symfony/http-client-contracts": "^3.5"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.10",
-        "phpunit/phpunit": "^11",
-        "icanhazstring/composer-unused": "^0.9.5",
-        "squizlabs/php_codesniffer": "^4.0.0",
-        "phpstan/phpstan": "^2.1.33",
-        "maglnet/composer-require-checker": "^4"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.11"
     },
     "support": {
         "issues": "https://github.com/simplesamlphp/simplesamlphp-module-cas/issues",
diff --git a/src/Auth/Source/CAS.php b/src/Auth/Source/CAS.php
@@ -43,12 +43,12 @@ class CAS extends Auth\Source
     /**
      * The string used to identify our states.
      */
-    public const STAGE_INIT = '\SimpleSAML\Module\cas\Auth\Source\CAS.state';
+    public const string STAGE_INIT = '\SimpleSAML\Module\cas\Auth\Source\CAS.state';
 
     /**
      * The key of the AuthId field in the state.
      */
-    public const AUTHID = '\SimpleSAML\Module\cas\Auth\Source\CAS.AuthId';
+    public const string AUTHID = '\SimpleSAML\Module\cas\Auth\Source\CAS.AuthId';
 
 
     /**
@@ -64,7 +64,6 @@ class CAS extends Auth\Source
     /**
      * @var string cas chosen validation method
      */
-
     private string $validationMethod;
 
     /**
