Skip to content

Use config array instead of object in Interval Captcha module #5655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
demiankatz merged 4 commits into from
Sep 10, 2026
Merged

Use config array instead of object in Interval Captcha module #5655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
054a9cc
Use config array instead of value in Interval Captcha module
rtloftus Sep 9, 2026
e34d14d
fix test
rtloftus Sep 9, 2026
0622600
factory
rtloftus Sep 9, 2026
cae33c3
Tweak indentation.
demiankatz Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions module/VuFind/src/VuFind/Captcha/Interval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@

use Laminas\Mvc\Controller\Plugin\Params;
use Laminas\Session\Container as SessionContainer;
use VuFind\Config\Config;
use VuFind\I18n\Translator\TranslatorAwareInterface;
use VuFind\I18n\Translator\TranslatorAwareTrait;

use function intval;

/**
* Interval CAPTCHA (requires an interval between actions or from start of session).
*
Expand Down Expand Up @@ -82,14 +79,14 @@ class Interval extends AbstractBase implements TranslatorAwareInterface
* Constructor.
*
* @param SessionContainer $sc Session data container
* @param Config $config VuFind main configuration
* @param array $config VuFind main configuration
*/
public function __construct(SessionContainer $sc, Config $config)
public function __construct(SessionContainer $sc, array $config)
{
$this->sessionData = $sc;
$this->actionInterval = intval($config->Captcha->action_interval ?? 60);
$this->timeFromSessionStart = intval(
$config->Captcha->time_from_session_start ?? $this->actionInterval
$this->actionInterval = (int)($config['Captcha']['action_interval'] ?? 60);
$this->timeFromSessionStart = (int)(
$config['Captcha']['time_from_session_start'] ?? $this->actionInterval
);
}

Expand Down
2 changes: 1 addition & 1 deletion module/VuFind/src/VuFind/Captcha/IntervalFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function __invoke(
);
return new $requestedName(
$sessionStorage,
$container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigObject('config')
$container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigArray('config')
);
}
}
12 changes: 5 additions & 7 deletions module/VuFind/tests/unit-tests/src/VuFindTest/Captcha/IntervalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ class IntervalTest extends \PHPUnit\Framework\TestCase
public function testIntervalCaptcha(): void
{
$session = new \Laminas\Session\Container('SessionState');
$config = new \VuFind\Config\Config(
[
'Captcha' => [
'time_from_session_start' => 20,
],
]
);
$config = [
'Captcha' => [
'time_from_session_start' => 20,
],
];

$interval = new \VuFind\Captcha\Interval($session, $config);

Expand Down