added type hints for class constants

Author: codemasher

src/Authenticators/AuthenticatorAbstract.php

@@ -28,7 +28,7 @@
 
 abstract class AuthenticatorAbstract implements AuthenticatorInterface{
 
-	protected const userAgent = 'chillerlanAuthenticator/5.0 +https://github.com/chillerlan/php-authenticator';
+	protected const string userAgent = 'chillerlanAuthenticator/5.0 +https://github.com/chillerlan/php-authenticator';
 
 	protected SettingsContainerInterface|AuthenticatorOptions $options;
 	protected string|null                                     $secret          = null;

src/Authenticators/AuthenticatorInterface.php

@@ -16,32 +16,30 @@
 
 interface AuthenticatorInterface{
 
-	public const TOTP        = 'totp';
-	public const HOTP        = 'hotp';
-	public const STEAM_GUARD = 'steam';
+	public const string TOTP        = 'totp';
+	public const string HOTP        = 'hotp';
+	public const string STEAM_GUARD = 'steam';
 
-	public const ALGO_SHA1   = 'SHA1';
-	public const ALGO_SHA256 = 'SHA256';
-	public const ALGO_SHA512 = 'SHA512';
+	public const string ALGO_SHA1   = 'SHA1';
+	public const string ALGO_SHA256 = 'SHA256';
+	public const string ALGO_SHA512 = 'SHA512';
 
-	public const MODES = [
+	public const array MODES = [
 		self::HOTP        => HOTP::class,
 		self::TOTP        => TOTP::class,
 		self::STEAM_GUARD => SteamGuard::class,
 	];
 
-	public const HASH_ALGOS = [
+	public const array HASH_ALGOS = [
 		self::ALGO_SHA1,
 		self::ALGO_SHA256,
 		self::ALGO_SHA512,
 	];
 
 	/**
 	 * Mode identifier. Do not call this constant from the interface, but rather from an authenticator instance.
-	 *
-	 * @var string
 	 */
-	public const MODE = '';
+	public const string MODE = '';
 
 	/**
 	 * Sets the options

src/Authenticators/HOTP.php

@@ -28,7 +28,7 @@
  */
 class HOTP extends AuthenticatorAbstract{
 
-	public const MODE = self::HOTP;
+	public const string MODE = self::HOTP;
 
 	public function getCounter(int|null $data = null):int{
 		return ($data ?? 0);

src/Authenticators/SteamGuard.php

@@ -39,10 +39,10 @@
  */
 final class SteamGuard extends TOTP{
 
-	public const MODE = self::STEAM_GUARD;
+	public const string MODE = self::STEAM_GUARD;
 
-	private const steamCodeChars = '23456789BCDFGHJKMNPQRTVWXY';
-	private const steamTimeURL   = 'https://api.steampowered.com/ITwoFactorService/QueryTime/v0001';
+	private const string steamCodeChars = '23456789BCDFGHJKMNPQRTVWXY';
+	private const string steamTimeURL   = 'https://api.steampowered.com/ITwoFactorService/QueryTime/v0001';
 
 	public function setSecret(#[SensitiveParameter] string $encodedSecret):static{
 		$this->secret = Base64::decode($this->checkEncodedSecret($encodedSecret));

src/Authenticators/TOTP.php

@@ -22,7 +22,7 @@
  */
 class TOTP extends HOTP{
 
-	public const MODE = self::TOTP;
+	public const string MODE = self::TOTP;
 
 	public function getCounter(int|null $data = null):int{
 		$data ??= time();

src/Common/Base32.php

@@ -27,7 +27,7 @@ final class Base32 implements EncoderInterface{
 	 * @see https://datatracker.ietf.org/doc/html/rfc3548#section-5
 	 * @see https://datatracker.ietf.org/doc/html/rfc4648#section-6
 	 */
-	public const CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+	public const string CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
 
 	/**
 	 * Encode a string to Base32

src/Common/Base64.php

@@ -27,7 +27,7 @@ class Base64 implements EncoderInterface{
 	 * @see https://datatracker.ietf.org/doc/html/rfc3548#section-3
 	 * @see https://datatracker.ietf.org/doc/html/rfc4648#section-4
 	 */
-	public const CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+	public const string CHARSET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
 	/**
 	 * Encode a string to Base64

src/Common/EncoderInterface.php

@@ -23,7 +23,7 @@ interface EncoderInterface{
 	 *
 	 * @var string
 	 */
-	public const CHARSET = '';
+	public const string CHARSET = '';
 
 	/**
 	 * Encode a string

src/Common/Hex.php

@@ -23,7 +23,7 @@
  */
 class Hex implements EncoderInterface{
 
-	public const CHARSET = '1234567890ABCDEFabcdef';
+	public const string CHARSET = '1234567890ABCDEFabcdef';
 
 	/**
 	 * Encode a string to hexadecimal

tests/AuthenticatorTest.php

@@ -18,9 +18,9 @@
 
 class AuthenticatorTest extends TestCase{
 
-	protected const secret = 'SECRETTEST234567';
-	protected const label  = 'some test-label';
-	protected const issuer = 'chillerlan.net';
+	protected const string secret = 'SECRETTEST234567';
+	protected const string label  = 'some test-label';
+	protected const string issuer = 'chillerlan.net';
 
 	protected Authenticator        $authenticator;
 	protected AuthenticatorOptions $options;