From 837922eb6a62e9732795638e2c2e24d2ff531949 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgnerf@ub.uni-leipzig.de>
Date: Tue, 5 Feb 2019 10:53:53 +0100
Subject: [PATCH] several PSR2 fixes at finc module v5.1
---
.../src/finc/ILS/Driver/LiberoDingTrait.php | 50 +++++++++----------
.../RecordDriver/SolrDefaultFincTrait.php | 20 ++++----
.../finc/RecordDriver/SolrMarcFincTrait.php | 4 +-
.../MungerInjectionDelegatorFactory.php | 1 -
.../src/finc/View/Helper/Root/SideFacet.php | 1 +
5 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/module/finc/src/finc/ILS/Driver/LiberoDingTrait.php b/module/finc/src/finc/ILS/Driver/LiberoDingTrait.php
index 3e640872c0a..7216649a848 100644
--- a/module/finc/src/finc/ILS/Driver/LiberoDingTrait.php
+++ b/module/finc/src/finc/ILS/Driver/LiberoDingTrait.php
@@ -162,7 +162,7 @@ trait LiberoDingTrait
*/
public function balanceFinesOfUser($patron, $amount)
{
- $params = $this->_getLiberoDingRequestParams();
+ $params = $this->getLiberoDingRequestParams();
$params['memberCode'] = $patron['cat_username'];
$params['password'] = $patron['cat_password'];
$params['amount'] = $amount;
@@ -172,7 +172,7 @@ trait LiberoDingTrait
$this->getWebScraperUrl() .'payAnyFee.jsp',
$params,
null,
- $this->_getLiberoDingRequestHeaders()
+ $this->getLiberoDingRequestHeaders()
);
} catch (\Exception $e) {
throw new ILSException($e->getMessage());
@@ -189,7 +189,7 @@ trait LiberoDingTrait
// reload PAIA session by paia login again
$this->refreshLogin($patron['cat_username'], $patron['cat_password']);
- return $this->_getLiberoDingResultBool($result);
+ return $this->getLiberoDingResultBool($result);
}
/**
@@ -203,7 +203,7 @@ trait LiberoDingTrait
*/
protected function getSystemMessages($patron)
{
- $params = $this->_getLiberoDingRequestParams();
+ $params = $this->getLiberoDingRequestParams();
$params['memberCode'] = $patron['cat_username'];
$params['password'] = $patron['cat_password'];
@@ -212,7 +212,7 @@ trait LiberoDingTrait
$this->getWebScraperUrl() .'getMySystemMessages.jsp',
$params,
null,
- $this->_getLiberoDingRequestHeaders()
+ $this->getLiberoDingRequestHeaders()
);
} catch (\Exception $e) {
throw new ILSException($e->getMessage());
@@ -227,7 +227,7 @@ trait LiberoDingTrait
return false;
}
- return $this->_getLiberoDingResult($result, 'getMySystemMessages');
+ return $this->getLiberoDingResult($result, 'getMySystemMessages');
}
/**
@@ -248,7 +248,7 @@ trait LiberoDingTrait
$messageIdList = null,
$toDate = null
) {
- $params = $this->_getLiberoDingRequestParams();
+ $params = $this->getLiberoDingRequestParams();
$params['memberCode'] = $patron['cat_username'];
$params['password'] = $patron['cat_password'];
@@ -264,7 +264,7 @@ trait LiberoDingTrait
$this->getWebScraperUrl() .'removeMySystemMessages.jsp',
$params,
null,
- $this->_getLiberoDingRequestHeaders()
+ $this->getLiberoDingRequestHeaders()
);
} catch (\Exception $e) {
throw new ILSException($e->getMessage());
@@ -279,7 +279,7 @@ trait LiberoDingTrait
return false;
}
- return $this->_getLiberoDingResult($result, 'removeMySystemMessages');
+ return $this->getLiberoDingResult($result, 'removeMySystemMessages');
}
/**
@@ -303,7 +303,7 @@ trait LiberoDingTrait
{
$map = self::_profileDataMapper(true);
- $params = $this->_getLiberoDingRequestParams();
+ $params = $this->getLiberoDingRequestParams();
$params['memberCode'] = $patron['cat_username'];
$params['password'] = $patron['cat_password'];
@@ -325,7 +325,7 @@ trait LiberoDingTrait
$this->getWebScraperUrl() .'setMyProfile.jsp',
$params,
null,
- $this->_getLiberoDingRequestHeaders()
+ $this->getLiberoDingRequestHeaders()
);
} catch (\Exception $e) {
throw new ILSException($e->getMessage());
@@ -340,7 +340,7 @@ trait LiberoDingTrait
return false;
}
- return $this->_getLiberoDingResultBool($result);
+ return $this->getLiberoDingResultBool($result);
}
/**
@@ -379,7 +379,7 @@ trait LiberoDingTrait
*/
protected function getLiberoDingProfile($patron, $mapped = true)
{
- $params = $this->_getLiberoDingRequestParams();
+ $params = $this->getLiberoDingRequestParams();
$params['memberCode'] = $patron['cat_username'];
$params['password'] = $patron['cat_password'];
@@ -388,7 +388,7 @@ trait LiberoDingTrait
$this->getWebScraperUrl() .'getMyProfile.jsp',
$params,
null,
- $this->_getLiberoDingRequestHeaders()
+ $this->getLiberoDingRequestHeaders()
);
} catch (\Exception $e) {
throw new ILSException($e->getMessage());
@@ -406,8 +406,8 @@ trait LiberoDingTrait
if ($mapped) {
// define of disabled fields
$mappeddata = [];
- $map = self::_profileDataMapper();
- $data = $this->_getLiberoDingResult($result, 'getMyProfile');
+ $map = self::profileDataMapper();
+ $data = $this->getLiberoDingResult($result, 'getMyProfile');
foreach ($data as $key => $value) {
if ($key == 'disabledInputs') {
@@ -426,7 +426,7 @@ trait LiberoDingTrait
return $mappeddata;
}
- return $this->_getLiberoDingResult($result, 'getMyProfile');
+ return $this->getLiberoDingResult($result, 'getMyProfile');
}
@@ -441,7 +441,7 @@ trait LiberoDingTrait
*/
public function changeUserPin($newPin, $patron)
{
- $params = $this->_getLiberoDingRequestParams();
+ $params = $this->getLiberoDingRequestParams();
$params['memberCode'] = $patron['cat_username'];
$params['password'] = $patron['cat_password'];
$params['newPin'] = $newPin;
@@ -451,7 +451,7 @@ trait LiberoDingTrait
$this->getWebScraperUrl() .'changeUserPin.jsp',
$params,
null,
- $this->_getLiberoDingRequestHeaders()
+ $this->getLiberoDingRequestHeaders()
);
} catch (\Exception $e) {
throw new ILSException($e->getMessage());
@@ -466,7 +466,7 @@ trait LiberoDingTrait
return false;
}
- return $this->_getLiberoDingResult($result, 'changeUserPinOk');
+ return $this->getLiberoDingResult($result, 'changeUserPinOk');
}
/**
@@ -478,7 +478,7 @@ trait LiberoDingTrait
* @return array Return array of mappings.
* @access private
*/
- private static function _profileDataMapper($reverse = false)
+ private static function profileDataMapper($reverse = false)
{
$array = [
"GNAM" => 'firstname',
@@ -513,7 +513,7 @@ trait LiberoDingTrait
*
* @return array
*/
- private function _getLiberoDingRequestParams()
+ private function getLiberoDingRequestParams()
{
return [
'dbName' => $this->getDbName(),
@@ -527,7 +527,7 @@ trait LiberoDingTrait
*
* @return array
*/
- private function _getLiberoDingRequestHeaders()
+ private function getLiberoDingRequestHeaders()
{
return [
'User-Agent' => 'Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)'
@@ -543,7 +543,7 @@ trait LiberoDingTrait
*
* @return mixed
*/
- private function _getLiberoDingResult($result, $resultKey)
+ private function getLiberoDingResult($result, $resultKey)
{
// get result as array
$details = json_decode($result->getBody(), true);
@@ -564,7 +564,7 @@ trait LiberoDingTrait
* @return array
* @access private
*/
- private function _getLiberoDingResultBool($result)
+ private function getLiberoDingResultBool($result)
{
// get result as array
$details = json_decode($result->getBody(), true);
diff --git a/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php b/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php
index 7981bee042c..aae55983068 100644
--- a/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php
+++ b/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php
@@ -523,7 +523,7 @@ trait SolrDefaultFincTrait
*/
public function getPrimaryAuthor()
{
- return $this->_filterAuthorDates(parent::getPrimaryAuthor());
+ return $this->filterAuthorDates(parent::getPrimaryAuthor());
}
/**
@@ -533,7 +533,7 @@ trait SolrDefaultFincTrait
*/
public function getPrimaryAuthors()
{
- return $this->_filterAuthorDates(parent::getPrimaryAuthors());
+ return $this->filterAuthorDates(parent::getPrimaryAuthors());
}
/**
@@ -544,7 +544,7 @@ trait SolrDefaultFincTrait
public function getPrimaryAuthorsOrig()
{
return isset($this->fields['author_orig']) ?
- $this->_filterAuthorDates($this->fields['author_orig']) : [];
+ $this->filterAuthorDates($this->fields['author_orig']) : [];
}
/**
@@ -554,7 +554,7 @@ trait SolrDefaultFincTrait
*/
public function getSecondaryAuthors()
{
- return $this->_filterAuthorDates(parent::getSecondaryAuthors());
+ return $this->filterAuthorDates(parent::getSecondaryAuthors());
}
/**
@@ -566,7 +566,7 @@ trait SolrDefaultFincTrait
public function getSecondaryAuthorsOrig()
{
return isset($this->fields['author2_orig']) ?
- $this->_filterAuthorDates($this->fields['author2_orig']) : [];
+ $this->filterAuthorDates($this->fields['author2_orig']) : [];
}
/**
@@ -576,7 +576,7 @@ trait SolrDefaultFincTrait
*/
public function getCorporateAuthors()
{
- return $this->_filterAuthorDates(parent::getCorporateAuthors());
+ return $this->filterAuthorDates(parent::getCorporateAuthors());
}
/**
@@ -587,7 +587,7 @@ trait SolrDefaultFincTrait
public function getCorporateAuthorsOrig()
{
return isset($this->fields['author_corporate_orig']) ?
- $this->_filterAuthorDates($this->fields['author_corporate_orig']) : [];
+ $this->filterAuthorDates($this->fields['author_corporate_orig']) : [];
}
/**
@@ -598,7 +598,7 @@ trait SolrDefaultFincTrait
public function getCorporateSecondaryAuthors()
{
return isset($this->fields['author_corporate2']) ?
- $this->_filterAuthorDates($this->fields['author_corporate2']) : [];
+ $this->filterAuthorDates($this->fields['author_corporate2']) : [];
}
/**
@@ -609,7 +609,7 @@ trait SolrDefaultFincTrait
public function getCorporateSecondaryAuthorsOrig()
{
return isset($this->fields['author_corporate2_orig']) ?
- $this->_filterAuthorDates($this->fields['author_corporate2_orig']) : [];
+ $this->filterAuthorDates($this->fields['author_corporate2_orig']) : [];
}
/**
@@ -1136,7 +1136,7 @@ trait SolrDefaultFincTrait
*
* @return array
*/
- private function _filterAuthorDates($authordata)
+ private function filterAuthorDates($authordata)
{
$filter = function ($author) {
if (preg_match(
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
index 94b31f8c1b5..b96e12f5f23 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
@@ -105,7 +105,7 @@ trait SolrMarcFincTrait
if (true === in_array($isil, $this->isil)) {
$isISIL = true;
}
- } elseif (!$this->_isEBLRecord()) {
+ } elseif (!$this->isEBLRecord()) {
$isISIL = true;
}
@@ -165,7 +165,7 @@ trait SolrMarcFincTrait
*
* @return bool
*/
- private function _isEBLRecord()
+ private function isEBLRecord()
{
$values = $this->getFieldArray('912', ['a']);
if (isset($this->mainConfig->Ebl->product_sigel)) {
diff --git a/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php b/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php
index 77db439ee90..87455607728 100644
--- a/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php
+++ b/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php
@@ -38,7 +38,6 @@ use Zend\Config\Config;
use Zend\EventManager\EventInterface;
use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
-
/**
* Munger Injection Factory
*
diff --git a/module/finc/src/finc/View/Helper/Root/SideFacet.php b/module/finc/src/finc/View/Helper/Root/SideFacet.php
index 19827c21f50..240b5abd29b 100644
--- a/module/finc/src/finc/View/Helper/Root/SideFacet.php
+++ b/module/finc/src/finc/View/Helper/Root/SideFacet.php
@@ -30,6 +30,7 @@
namespace finc\View\Helper\Root;
use Zend\View\Helper\AbstractHelper;
+
/**
* Permissions view helper
*
--
GitLab