diff --git a/module/VuFind/src/VuFind/ILS/Logic/Holds.php b/module/VuFind/src/VuFind/ILS/Logic/Holds.php index 543ba0180f789933ae76b9e36412a38fb8cda930..c71dec293708d00d103f128f80f60832978e8d17 100644 --- a/module/VuFind/src/VuFind/ILS/Logic/Holds.php +++ b/module/VuFind/src/VuFind/ILS/Logic/Holds.php @@ -27,8 +27,7 @@ * @link http://vufind.org/wiki/system_classes#index_interface Wiki */ namespace VuFind\ILS\Logic; -use VuFind\Config\Reader as ConfigReader, - VuFind\Crypt\HMAC, +use VuFind\Config\Reader as ConfigReader, VuFind\Crypt\HMAC, VuFind\ILS\Connection as ILSConnection; /** @@ -52,9 +51,9 @@ class Holds * Constructor * * @param \VuFind\Auth\Manager $account Auth manager object - * @param ILSConnection $catalog A catalog connection + * @param ILSConnection $ils A catalog connection */ - public function __construct($account, $catalog) + public function __construct(\VuFind\Auth\Manager $account, ILSConnection $ils) { $this->account = $account; $this->config = ConfigReader::getConfig(); @@ -65,7 +64,7 @@ class Holds } } - $this->catalog = $catalog; + $this->catalog = $ils; } /** diff --git a/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php b/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php index 103ccc2e0ac2e3edb2390c2bdfef68390e42ec14..188f56e20bcfbc87d0a2400fc32b6665554cb0f3 100644 --- a/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php +++ b/module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php @@ -27,8 +27,7 @@ * @link http://vufind.org/wiki/system_classes#index_interface Wiki */ namespace VuFind\ILS\Logic; -use VuFind\Config\Reader as ConfigReader, - VuFind\Crypt\HMAC, +use VuFind\Config\Reader as ConfigReader, VuFind\Crypt\HMAC, VuFind\ILS\Connection as ILSConnection; /** @@ -52,9 +51,9 @@ class TitleHolds * Constructor * * @param \VuFind\Auth\Manager $account Auth manager object - * @param ILSConnection $catalog A catalog connection + * @param ILSConnection $ils A catalog connection */ - public function __construct($account, $catalog) + public function __construct(\VuFind\Auth\Manager $account, ILSConnection $ils) { $this->account = $account; $this->config = ConfigReader::getConfig(); @@ -65,7 +64,7 @@ class TitleHolds } } - $this->catalog = $catalog; + $this->catalog = $ils; } /** diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php b/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php index 9e5b89b054910daacd8e499b09862c4061e82db0..08853d27c3c183fbe2ebb4dd21bc652b7918a6bb 100644 --- a/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php +++ b/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php @@ -828,7 +828,7 @@ class SolrDefault extends AbstractBase * * @return array */ - public function getRealTimeHoldings($account) + public function getRealTimeHoldings(\VuFind\Auth\Manager $account) { // Not supported by the Solr index -- implement in child classes. return array(); diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php index 2a20ad712effa10e7be83e10f81d7cb495807ef0..3d8f05a44524ff6f9ee0ac642e53e8ae4ca98bd3 100644 --- a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php +++ b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php @@ -808,7 +808,7 @@ class SolrMarc extends SolrDefault * * @return array */ - public function getRealTimeHoldings($account) + public function getRealTimeHoldings(\VuFind\Auth\Manager $account) { $holdLogic = new HoldLogic($account, $this->getILS()); return $holdLogic->getHoldings($this->getUniqueID()); @@ -837,7 +837,7 @@ class SolrMarc extends SolrDefault * * @return mixed A url if a hold is possible, boolean false if not */ - public function getRealTimeTitleHold($account) + public function getRealTimeTitleHold(\VuFind\Auth\Manager $account) { $biblioLevel = $this->getBibliographicLevel(); if ("monograph" == strtolower($biblioLevel) diff --git a/module/VuFind/src/VuFind/RecordDriver/WorldCat.php b/module/VuFind/src/VuFind/RecordDriver/WorldCat.php index 1add839bc3538f6a9a5dc12a65b491fc0c3a1650..2fc867e947ff29f8a8fc4015e8b73dda3dd80c61 100644 --- a/module/VuFind/src/VuFind/RecordDriver/WorldCat.php +++ b/module/VuFind/src/VuFind/RecordDriver/WorldCat.php @@ -83,7 +83,7 @@ class WorldCat extends SolrMarc * * @return array */ - public function getRealTimeHoldings($account) + public function getRealTimeHoldings(\VuFind\Auth\Manager $account) { // Not supported here: return array();