From 902166dd641fa3591a065e31b3832941ee0c8423 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 14 Sep 2012 10:12:56 -0400
Subject: [PATCH] Cleaned up namespaces and added type hints.
---
module/VuFind/src/VuFind/ILS/Logic/Holds.php | 9 ++++-----
module/VuFind/src/VuFind/ILS/Logic/TitleHolds.php | 9 ++++-----
module/VuFind/src/VuFind/RecordDriver/SolrDefault.php | 2 +-
module/VuFind/src/VuFind/RecordDriver/SolrMarc.php | 4 ++--
module/VuFind/src/VuFind/RecordDriver/WorldCat.php | 2 +-
5 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Logic/Holds.php b/module/VuFind/src/VuFind/ILS/Logic/Holds.php
index 543ba0180f7..c71dec29370 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 103ccc2e0ac..188f56e20bc 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 9e5b89b0549..08853d27c3c 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 2a20ad712ef..3d8f05a4452 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 1add839bc35..2fc867e947f 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();
--
GitLab