From f23b28c67f9ea0bcceb9b08cdeef39bfa0045040 Mon Sep 17 00:00:00 2001
From: Sebastian Kehr <kehr@ub.uni-leipzig.de>
Date: Mon, 16 Apr 2018 22:37:20 +0200
Subject: [PATCH] Use cache trait with renamed method (#1163)
---
module/VuFind/src/VuFind/ILS/Driver/DAIA.php | 6 ++++--
module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php | 6 ++++--
module/VuFind/src/VuFind/ILS/Driver/PAIA.php | 2 +-
module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php | 4 +++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
index e18eea7a342..c66ef8702a1 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/DAIA.php
@@ -51,7 +51,9 @@ use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
class DAIA extends AbstractBase implements
HttpServiceAwareInterface, LoggerAwareInterface
{
- use CacheTrait;
+ use CacheTrait {
+ getCacheKey as protected getBaseCacheKey;
+ }
use \VuFindHttp\HttpServiceAwareTrait;
use \VuFind\Log\LoggerAwareTrait;
@@ -208,7 +210,7 @@ class DAIA extends AbstractBase implements
*/
protected function getCacheKey($suffix = null)
{
- return parent::getCacheKey(md5($this->baseURL) . $suffix);
+ return $this->getBaseCacheKey(md5($this->baseUrl) . $suffix);
}
/**
diff --git a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
index 6a87936bfdf..2552784b208 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
@@ -49,7 +49,9 @@ use Zend\Log\LoggerInterface;
class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
\VuFindHttp\HttpServiceAwareInterface, \Zend\Log\LoggerAwareInterface
{
- use CacheTrait;
+ use CacheTrait {
+ getCacheKey as protected getBaseCacheKey;
+ }
use \VuFindHttp\HttpServiceAwareTrait;
use \VuFind\Log\LoggerAwareTrait;
@@ -324,7 +326,7 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
*/
protected function getCacheKey($suffix = null)
{
- return \VuFind\ILS\Driver\AbstractBase::getCacheKey(
+ return $this->getBaseCacheKey(
md5($this->ilsBaseUrl) . $suffix
);
}
diff --git a/module/VuFind/src/VuFind/ILS/Driver/PAIA.php b/module/VuFind/src/VuFind/ILS/Driver/PAIA.php
index 8cc6efa39ec..d1c3a5e09a9 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/PAIA.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/PAIA.php
@@ -123,7 +123,7 @@ class PAIA extends DAIA
*/
protected function getCacheKey($suffix = null)
{
- return \VuFind\ILS\Driver\AbstractBase::getCacheKey(
+ return $this->getBaseCacheKey(
md5($this->baseUrl . $this->paiaURL) . $suffix
);
}
diff --git a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
index b308360c65b..6970f6a380f 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
@@ -50,7 +50,9 @@ use VuFind\Exception\ILS as ILSException;
*/
class VoyagerRestful extends Voyager implements \VuFindHttp\HttpServiceAwareInterface
{
- use CacheTrait;
+ use CacheTrait {
+ getCacheKey as protected getBaseCacheKey;
+ }
use \VuFindHttp\HttpServiceAwareTrait;
/**
--
GitLab