Add trailing comma's

simplesamlphp · Jun 17, 2024 · 493ab64 · 493ab64
1 parent c173afc
commit 493ab64
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/src/Auth/Process/OTP.php b/src/Auth/Process/OTP.php
@@ -197,8 +197,8 @@ public static function authenticate(
  ): bool {
  // validate the state array we're given
  if (
- !array_key_exists(Auth\State::STAGE, $state) ||
- $state[Auth\State::STAGE] !== 'yubikey:otp:init'
+ !array_key_exists(Auth\State::STAGE, $state)
+ || $state[Auth\State::STAGE] !== 'yubikey:otp:init'
  ) {
  throw new InvalidArgumentException("There was an unexpected error while trying to verify your YubiKey.");
  }
@@ -209,7 +209,7 @@ public static function authenticate(
  if ($otplen < 32 || $otplen > 48) {
  throw new InvalidArgumentException(
  "The one time password generated by your YubiKey is not valid. Please make"
- . " sure to use your YubiKey. You don't have to type anything manually."
+ . " sure to use your YubiKey. You don't have to type anything manually.",
  );
  }
  $otp = strtolower($otp);
@@ -241,7 +241,7 @@ public static function authenticate(
  $session->registerLogoutHandler(
  $cfg['authID'],
  $cfg['self'],
- 'logoutHandler'
+ 'logoutHandler',
  );
  Logger::info('Successful authentication with YubiKey "' . $kid . '".');
  return true;

diff --git a/src/Controller/Yubikey.php b/src/Controller/Yubikey.php
@@ -23,12 +23,6 @@
  */
 class Yubikey
 {
- /** @var \SimpleSAML\Configuration */
- protected Configuration $config;
-
- /** @var \SimpleSAML\Session */
- protected Session $session;
-
  /**
  * @var \SimpleSAML\Auth\State|string
  * @psalm-var \SimpleSAML\Auth\State|class-string
@@ -53,11 +47,9 @@ class Yubikey
  * @throws \Exception
  */
  public function __construct(
- Configuration $config,
- Session $session
+ protected Configuration $config,
+ protected Session $session,
  ) {
- $this->config = $config;
- $this->session = $session;
  }
 
 

diff --git a/tests/src/Controller/YubikeyTest.php b/tests/src/Controller/YubikeyTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
  'module.enable' => ['yubikey' => true],
  ],
  '[ARRAY]',
- 'simplesaml'
+ 'simplesaml',
  );
 
  $this->session = Session::getSessionFromRequest();
@@ -60,7 +60,7 @@ public function testOtpNoState(): void
  {
  $request = Request::create(
  '/otp',
- 'GET'
+ 'GET',
  );
 
  $c = new Controller\Yubikey($this->config, $this->session);
@@ -82,7 +82,7 @@ public function testOtpNoOtp(): void
  $request = Request::create(
  '/otp',
  'GET',
- ['AuthState' => 'abc123']
+ ['AuthState' => 'abc123'],
  );
 
  $c = new Controller\Yubikey($this->config, $this->session);
@@ -109,7 +109,7 @@ public function testOtpFailed(): void
  $request = Request::create(
  '/otp?AuthState=someState',
  'POST',
- ['otp' => 'aabbccddeeffgghhiijjkkllmmnnooppqq']
+ ['otp' => 'aabbccddeeffgghhiijjkkllmmnnooppqq'],
  );
 
  $c = new Controller\Yubikey($this->config, $this->session);
@@ -142,7 +142,7 @@ public function testOtpSucceeded(): void
  $request = Request::create(
  '/otp?AuthState=someState',
  'POST',
- ['otp' => 'aabbccddeeffgghhiijjkkllmmnnooppqq']
+ ['otp' => 'aabbccddeeffgghhiijjkkllmmnnooppqq'],
  );
 
  $c = new Controller\Yubikey($this->config, $this->session);
@@ -175,7 +175,7 @@ public function testOtpUnexpectedException(): void
  $request = Request::create(
  '/otp?AuthState=someState',
  'POST',
- ['otp' => 'aabbccddeeffgghhiijjkkllmmnnooppqq']
+ ['otp' => 'aabbccddeeffgghhiijjkkllmmnnooppqq'],
  );
 
  $c = new Controller\Yubikey($this->config, $this->session);
@@ -189,7 +189,7 @@ public static function loadState(string $id, string $stage, bool $allowMissing =
  public static function authenticate(array &$state, string $otp): bool
  {
  throw new InvalidArgumentException(
- "There was an unexpected error while trying to verify your YubiKey."
+ "There was an unexpected error while trying to verify your YubiKey.",
  );
  }
  });