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/[email protected]
     with:
@@ -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: Install libkrb5-dev
@@ -56,7 +56,8 @@ jobs:
         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
@@ -80,7 +81,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-
 
@@ -110,15 +111,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
@@ -142,7 +144,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-
 
@@ -166,7 +168,8 @@ 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
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, opcache, openssl, pcre, spl, xml
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, opcache, openssl,\
+            pcre, sodium, spl, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -179,7 +182,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-
 
@@ -217,8 +220,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, ldap, mbstring, openssl, pcre, spl, xml
+          php-version: '8.3'
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, ldap, mbstring, openssl, pcre, sodium, spl, xml
           tools: composer
           coverage: none
 
@@ -233,7 +236,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

@@ -37,16 +37,16 @@
         "ssp-mixedcase-module-name": "negotiateext"
     },
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
 
-        "simplesamlphp/composer-module-installer": "^1.5.0",
-        "simplesamlphp/assert": "^1.9.1",
-        "simplesamlphp/simplesamlphp": "^2.4",
-        "simplesamlphp/simplesamlphp-module-ldap": "^2.3",
-        "symfony/http-foundation": "^6.4"
+        "simplesamlphp/composer-module-installer": "^1.5",
+        "simplesamlphp/assert": "^1.9",
+        "simplesamlphp/simplesamlphp": "^2.5@dev",
+        "simplesamlphp/simplesamlphp-module-ldap": "^2.5",
+        "symfony/http-foundation": "^7.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.10.3"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.11"
     },
     "support": {
         "issues": "https://github.com/tvdijen/simplesamlphp-module-negotiateext/issues",

src/Auth/Source/Negotiate.php

@@ -23,19 +23,15 @@
 class Negotiate extends \SimpleSAML\Auth\Source
 {
     // Constants used in the module
-    public const STAGEID = '\SimpleSAML\Module\negotiateext\Auth\Source\Negotiate.StageId';
+    public const string STAGEID = '\SimpleSAML\Module\negotiateext\Auth\Source\Negotiate.StageId';
 
 
-    /** @var string */
     protected string $backend;
 
-    /** @var string */
     protected string $fallback;
 
-    /** @var string */
     protected string $keytab = '';
 
-    /** @var array|null */
     protected ?array $subnet = null;
 
 

tests/src/Controller/NegotiateControllerTest.php

@@ -10,7 +10,6 @@
 use SimpleSAML\HTTP\RunnableResponse;
 use SimpleSAML\Module\negotiateext\Controller;
 use SimpleSAML\Session;
-use SimpleSAML\XHTML\Template;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -92,7 +91,6 @@ public function testErrorMissingState(): void
         $c = new Controller\NegotiateController($this->config, $this->session);
 
         $this->expectException(Error\BadRequest::class);
-        $this->expectExceptionMessage('BADREQUEST(\'%REASON%\' => \'Missing "AuthState" parameter.\')');
 
         $c->error($request);
     }
@@ -127,7 +125,6 @@ public function testEnable(): void
         $response = $c->enable();
 
         // Validate response
-        $this->assertInstanceOf(Template::class, $response);
         $this->assertTrue($response->isSuccessful());
 
         // Validate cookie
@@ -159,7 +156,6 @@ public function testDisable(): void
         $response = $c->disable();
 
         // Validate response
-        $this->assertInstanceOf(Template::class, $response);
         $this->assertTrue($response->isSuccessful());
 
         // Validate cookie
@@ -216,7 +212,6 @@ public function testRetryMissingState(): void
         $c = new Controller\NegotiateController($this->config, $this->session);
 
         $this->expectException(Error\BadRequest::class);
-        $this->expectExceptionMessage('BADREQUEST(\'%REASON%\' => \'Missing required AuthState query parameter.\')');
 
         $c->retry($request);
     }
@@ -275,7 +270,6 @@ public function testBackendMissingState(): void
         $c = new Controller\NegotiateController($this->config, $this->session);
 
         $this->expectException(Error\BadRequest::class);
-        $this->expectExceptionMessage('BADREQUEST(\'%REASON%\' => \'Missing required AuthState query parameter.\')');
 
         $c->fallback($request);
     }