Skip to content

Commit

Permalink
Merge pull request #104 from antonioribeiro/analysis-jLNQ7J
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI

[ci skip] [skip ci]
  • Loading branch information
antonioribeiro authored Apr 2, 2020
2 parents e4e843a + 3bb6ab6 commit 0dd5825
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/Google2FA.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ protected function updateCurrentAuthTime()
public function verifyGoogle2FA($secret, $one_time_password)
{
return $this->verifyKey(
$secret,
$one_time_password,
$this->config('window'),
null, // $timestamp
$secret,
$one_time_password,
$this->config('window'),
null, // $timestamp
$this->getOldTimestamp() ?: null
);
}
Expand Down
3 changes: 2 additions & 1 deletion src/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ private function configurePaths()
private function mergeConfig()
{
$this->mergeConfigFrom(
__DIR__.'/config/config.php', 'google2fa'
__DIR__.'/config/config.php',
'google2fa'
);
}

Expand Down

0 comments on commit 0dd5825

Please sign in to comment.