Skip to content

Use config array instead of object for Overdrive connectors #5658

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 3 commits into from
Sep 10, 2026
+39 −73
Merged

Use config array instead of object for Overdrive connectors #5658

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3bbd2b
Use config instead of array for Overdrive connectors
rtloftus Sep 9, 2026
698547d
composer fix
rtloftus Sep 9, 2026
76c61c3
factory fix
rtloftus 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
10 changes: 4 additions & 6 deletions module/VuFind/src/VuFind/DigitalContent/FakeOverdriveConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@

namespace VuFind\DigitalContent;

use VuFind\Config\Config;

/**
* FakeOverdriveConnector.
*
Expand All @@ -51,12 +49,12 @@ class FakeOverdriveConnector extends OverdriveConnector
/**
* Constructor.
*
* @param Config $mainConfig VuFind main conf
* @param Config $recordConfig Record-specific conf file
* @param array $mainConfig VuFind main conf
* @param array $recordConfig Record-specific conf file
*/
public function __construct(
Config $mainConfig,
Config $recordConfig
array $mainConfig,
array $recordConfig
) {
$this->mainConfig = $mainConfig;
$this->recordConfig = $recordConfig;
Expand Down
96 changes: 32 additions & 64 deletions module/VuFind/src/VuFind/DigitalContent/OverdriveConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,34 +80,6 @@ class OverdriveConnector implements
use TranslatorAwareTrait;
use KeyGeneratorTrait;

/**
* Session Container.
*
* @var ?Container
*/
protected $sessionContainer;

/**
* OverDrive-specific configuration.
*
* @var Config
*/
protected $recordConfig;

/**
* Main VuFind configuration.
*
* @var Config
*/
protected $mainConfig;

/**
* ILS Authorization.
*
* @var ILSAuthenticator
*/
protected $ilsAuth;

/**
* HTTP Client.
*
Expand All @@ -127,21 +99,17 @@ class OverdriveConnector implements
/**
* Constructor.
*
* @param Config $mainConfig VuFind main conf
* @param Config $recordConfig Record-specific conf file
* @param array $mainConfig VuFind main conf
* @param array $recordConfig Record-specific conf file
* @param ILSAuthenticator $ilsAuth ILS Authenticator
* @param ?Container $sessionContainer container
*/
public function __construct(
Config $mainConfig,
Config $recordConfig,
ILSAuthenticator $ilsAuth,
?Container $sessionContainer = null
protected array $mainConfig,
Comment thread
rtloftus marked this conversation as resolved.
protected array $recordConfig,
protected ILSAuthenticator $ilsAuth,
protected ?Container $sessionContainer = null
) {
$this->mainConfig = $mainConfig;
$this->recordConfig = $recordConfig;
$this->ilsAuth = $ilsAuth;
$this->sessionContainer = $sessionContainer;
}

/**
Expand Down Expand Up @@ -931,41 +899,41 @@ public function getConfig()
);
return false;
}
if ($this->recordConfig->API->productionMode == false) {
if ($this->recordConfig['API']['productionMode'] == false) {
$conf->productionMode = false;
$conf->discURL = $this->recordConfig->API->integrationDiscoveryURL;
$conf->circURL = $this->recordConfig->API->integrationCircURL;
$conf->libraryID = $this->recordConfig->API->integrationLibraryID;
$conf->websiteID = $this->recordConfig->API->integrationWebsiteID;
$conf->discURL = $this->recordConfig['API']['integrationDiscoveryURL'];
$conf->circURL = $this->recordConfig['API']['integrationCircURL'];
$conf->libraryID = $this->recordConfig['API']['integrationLibraryID'];
$conf->websiteID = $this->recordConfig['API']['integrationWebsiteID'];
} else {
$conf->productionMode = true;
$conf->discURL = $this->recordConfig->API->productionDiscoveryURL;
$conf->circURL = $this->recordConfig->API->productionCircURL;
$conf->libraryID = $this->recordConfig->API->productionLibraryID;
$conf->websiteID = $this->recordConfig->API->productionWebsiteID;
$conf->discURL = $this->recordConfig['API']['productionDiscoveryURL'];
$conf->circURL = $this->recordConfig['API']['productionCircURL'];
$conf->libraryID = $this->recordConfig['API']['productionLibraryID'];
$conf->websiteID = $this->recordConfig['API']['productionWebsiteID'];
}

$conf->clientKey = $this->recordConfig->API->clientKey;
$conf->clientSecret = $this->recordConfig->API->clientSecret;
$conf->tokenURL = $this->recordConfig->API->tokenURL;
$conf->patronTokenURL = $this->recordConfig->API->patronTokenURL;
$conf->usePatronAPI = (bool)($this->recordConfig->API->usePatronAPI ?? true);
$conf->idField = $this->recordConfig->Overdrive->overdriveIdMarcField;
$conf->clientKey = $this->recordConfig['API']['clientKey'];
$conf->clientSecret = $this->recordConfig['API']['clientSecret'];
$conf->tokenURL = $this->recordConfig['API']['tokenURL'];
$conf->patronTokenURL = $this->recordConfig['API']['patronTokenURL'];
$conf->usePatronAPI = (bool)($this->recordConfig['API']['usePatronAPI'] ?? true);
$conf->idField = $this->recordConfig['Overdrive']['overdriveIdMarcField'];
$conf->idSubfield
= $this->recordConfig->Overdrive->overdriveIdMarcSubfield;
$conf->ILSname = $this->recordConfig->API->ILSname;
$conf->isMarc = $this->recordConfig->Overdrive->isMarc;
$conf->displayDateFormat = $this->mainConfig->Site->displayDateFormat;
= $this->recordConfig['Overdrive']['overdriveIdMarcSubfield'];
$conf->ILSname = $this->recordConfig['API']['ILSname'];
$conf->isMarc = $this->recordConfig['Overdrive']['isMarc'];
$conf->displayDateFormat = $this->mainConfig['Site']['displayDateFormat'];
$conf->consortiumSupport
= $this->recordConfig->Overdrive->consortiumSupport;
= $this->recordConfig['Overdrive']['consortiumSupport'];
$conf->showMyContent
= strtolower($this->recordConfig->Overdrive->showMyContent);
$conf->noAccessString = $this->recordConfig->Overdrive->noAccessString;
= strtolower($this->recordConfig['Overdrive']['showMyContent']);
$conf->noAccessString = $this->recordConfig['Overdrive']['noAccessString'];
$conf->tokenCacheLifetime
= $this->recordConfig->API->tokenCacheLifetime;
$conf->libraryURL = $this->recordConfig->Overdrive->overdriveLibraryURL;
$conf->enableAjaxStatus = $this->recordConfig->Overdrive->enableAjaxStatus;
$conf->showOverdriveAdminMenu = $this->recordConfig->Overdrive->showOverdriveAdminMenu;
= $this->recordConfig['API']['tokenCacheLifetime'];
$conf->libraryURL = $this->recordConfig['Overdrive']['overdriveLibraryURL'];
$conf->enableAjaxStatus = $this->recordConfig['Overdrive']['enableAjaxStatus'];
$conf->showOverdriveAdminMenu = $this->recordConfig['Overdrive']['showOverdriveAdminMenu'];
return $conf;
}

Expand Down