Fix CI

Author: tvdijen

.github/workflows/php.yml

@@ -117,7 +117,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix,\
-            session, sodium, spl, xml
+            session, sodium, spl, xml, zip
           tools: composer
           ini-values: error_reporting=E_ALL
           coverage: none

src/Auth/Process/OTP2YubiPrefix.php

@@ -63,7 +63,7 @@ class OTP2YubiPrefix extends Auth\ProcessingFilter
      * Filter out YubiKey 'otp' attribute and replace it with
      * a 'yubiPrefix' attribute that leaves out the dynamic part.
      *
-     * @param array &$state  The state we should update.
+     * @param array<mixed> &$state  The state we should update.
      */
     public function process(array &$state): void
     {

src/Auth/Source/YubiKey.php

@@ -39,18 +39,19 @@ class YubiKey extends Auth\Source
     /**
      * The string used to identify our states.
      */
-    public const STAGEID = '\SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey.state';
+    public const string STAGEID = '\SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey.state';
 
     /**
      * The number of characters of the OTP that is the secure token.
      * The rest is the user id.
      */
-    public const TOKENSIZE = 32;
+    public const int TOKENSIZE = 32;
 
     /**
      * The key of the AuthId field in the state.
      */
-    public const AUTHID = '\SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey.AuthId';
+    public const string AUTHID = '\SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey.AuthId';
+
 
     /**
      * The client id/key for use with the Auth_Yubico PHP module.
@@ -65,8 +66,8 @@ class YubiKey extends Auth\Source
     /**
      * Constructor for this authentication source.
      *
-     * @param array $info  Information about this authentication source.
-     * @param array $config  Configuration.
+     * @param array<mixed> $info  Information about this authentication source.
+     * @param array<mixed> $config  Configuration.
      */
     public function __construct(array $info, array $config)
     {
@@ -87,7 +88,7 @@ public function __construct(array $info, array $config)
      * This function saves the information about the login, and redirects to a
      * login page.
      *
-     * @param array &$state  Information about the current authentication.
+     * @param array<mixed> &$state  Information about the current authentication.
      */
     public function authenticate(array &$state): void
     {
@@ -120,9 +121,6 @@ public static function handleLogin(
     ) {
         /* Retrieve the authentication state. */
         $state = Auth\State::loadState($authStateId, self::STAGEID);
-        if (is_null($state)) {
-            throw new Error\NoState();
-        }
 
         /* Find authentication source. */
         Assert::keyExists($state, self::AUTHID);
@@ -158,8 +156,6 @@ public static function handleLogin(
 
         $state['Attributes'] = $attributes;
         Auth\Source::completeAuth($state);
-
-        assert(false);
     }
 
 
@@ -185,8 +181,7 @@ public static function getYubiKeyPrefix(#[\SensitiveParameter] string $otp): str
      *
      * Note that both the username and the password are UTF-8 encoded.
      *
-     * @param string $otp
-     * @return array Associative array with the users attributes.
+     * @return array<mixed> Associative array with the users attributes.
      */
     protected function login(#[\SensitiveParameter] string $userInputOtp): array
     {

tests/src/Controller/YubikeyTest.php

@@ -11,7 +11,6 @@
 use SimpleSAML\Module\authYubiKey\Auth\Source\YubiKey;
 use SimpleSAML\Module\authYubiKey\Controller;
 use SimpleSAML\Session;
-use SimpleSAML\XHTML\Template;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -63,7 +62,9 @@ public function testOtpNoState(): void
         $c = new Controller\Yubikey($this->config, $this->session);
 
         $this->expectException(Error\BadRequest::class);
-        $this->expectExceptionMessage("BADREQUEST('%REASON%' => 'Missing AuthState parameter.')");
+        $this->expectExceptionMessage(
+            '{"errorCode":"BADREQUEST","%REASON%":"Missing AuthState parameter."}',
+        );
 
         $c->main($request);
     }
@@ -86,7 +87,6 @@ public function testOtpNoOtp(): void
         $response = $c->main($request);
 
         $this->assertTrue($response->isSuccessful());
-        $this->assertInstanceOf(Template::class, $response);
     }
 
 
@@ -106,18 +106,19 @@ public function testWrongOtp(): void
         $c = new Controller\Yubikey($this->config, $this->session);
         $c->setYubikey(new class (['AuthId' => 'authYubiKey'], []) extends YubiKey
         {
+            /** @phpstan-ignore constructor.unusedParameter, constructor.unusedParameter */
             public function __construct(array $info, array $config)
             {
             }
 
-            public static function handleLogin(string $authStateId, string $otp): ?string
+
+            public static function handleLogin(string $authStateId, string $otp): string
             {
                 return 'WRONGUSERPASS';
             }
         });
         $response = $c->main($request);
 
         $this->assertTrue($response->isSuccessful());
-        $this->assertInstanceOf(Template::class, $response);
     }
 }