From 6a6b58b4379b3f348bf726a2a6ef182a1e90fa43 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 7 Jan 2019 16:18:02 -0500
Subject: [PATCH] Upgrade php_codesniffer.
---
composer.json | 2 +-
composer.lock | 12 +++++-----
.../src/VuFind/ILS/Driver/KohaILSDI.php | 22 +++++++++----------
.../VuFind/src/VuFind/ILS/Driver/Symphony.php | 11 ++++------
.../src/VuFind/Recommend/SideFacets.php | 2 +-
.../src/VuFind/View/Helper/AbstractSearch.php | 2 +-
.../src/VuFindSearch/Backend/EDS/Base.php | 2 +-
7 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/composer.json b/composer.json
index 8c0f2ca8e78..e94f30f937a 100644
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,7 @@
"phpmd/phpmd": "2.6.0",
"phpunit/phpunit": "6.5.8",
"sebastian/phpcpd": "3.0.1",
- "squizlabs/php_codesniffer": "3.2.3"
+ "squizlabs/php_codesniffer": "3.4.0"
},
"scripts": {
"phing-install-dependencies": "phing installsolr installswaggerui",
diff --git a/composer.lock b/composer.lock
index f29e8a93289..3350543f86e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "fd6810272e920bf36183fa286bb0ccdd",
+ "content-hash": "c3cd2256ea45e2c238f13fe20bb3555e",
"packages": [
{
"name": "ahand/mobileesp",
@@ -7149,16 +7149,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.2.3",
+ "version": "3.4.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
+ "reference": "379deb987e26c7cd103a7b387aea178baec96e48"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
- "reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48",
+ "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
"shasum": ""
},
"require": {
@@ -7196,7 +7196,7 @@
"phpcs",
"standards"
],
- "time": "2018-02-20T21:35:23+00:00"
+ "time": "2018-12-19T23:57:18+00:00"
},
{
"name": "symfony/config",
diff --git a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
index 264a2e296b0..49c0bb9c8d6 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/KohaILSDI.php
@@ -400,17 +400,17 @@ class KohaILSDI extends \VuFind\ILS\Driver\AbstractBase implements
* Makes a request to the Koha ILSDI API
*
* @param string $service Called function (GetAvailability,
- * GetRecords,
- * GetAuthorityRecords,
- * LookupPatron,
- * AuthenticatePatron,
- * GetPatronInfo,
- * GetPatronStatus,
- * GetServices,
- * RenewLoan,
- * HoldTitle,
- * HoldItem,
- * CancelHold)
+ * GetRecords,
+ * GetAuthorityRecords,
+ * LookupPatron,
+ * AuthenticatePatron,
+ * GetPatronInfo,
+ * GetPatronStatus,
+ * GetServices,
+ * RenewLoan,
+ * HoldTitle,
+ * HoldItem,
+ * CancelHold)
* @param array $params Key is parameter name, value is parameter value
* @param string $http_method HTTP method (default = GET)
*
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
index 153fb4691b4..3fb4b127f22 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Symphony.php
@@ -270,13 +270,10 @@ class Symphony extends AbstractBase implements LoggerAwareInterface
* @param string $operation the SymWS operation name
* @param array $parameters the request parameters for the operation
* @param array $options An associative array of additional options:
- * - 'login': login to use for the operation;
- * omit for configured default
- * credentials or anonymous
- * - 'password': password associated with login;
- * omit for no password
- * - 'header': SoapHeader to use for the request;
- * omit to handle automatically
+ * - 'login': login to use for the operation; omit for configured default
+ * credentials or anonymous
+ * - 'password': password associated with login; omit for no password
+ * - 'header': SoapHeader to use for the request; omit to handle automatically
*
* @return mixed the result of the SOAP call
*/
diff --git a/module/VuFind/src/VuFind/Recommend/SideFacets.php b/module/VuFind/src/VuFind/Recommend/SideFacets.php
index f6cca916b79..f1565f6a599 100644
--- a/module/VuFind/src/VuFind/Recommend/SideFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/SideFacets.php
@@ -270,7 +270,7 @@ class SideFacets extends AbstractFacets
);
$facetSet[$hierarchicalFacet]['list']
= $this->hierarchicalFacetHelper
- ->flattenFacetHierarchy($facetArray);
+ ->flattenFacetHierarchy($facetArray);
}
}
diff --git a/module/VuFind/src/VuFind/View/Helper/AbstractSearch.php b/module/VuFind/src/VuFind/View/Helper/AbstractSearch.php
index b8eca57de70..0084c34864f 100644
--- a/module/VuFind/src/VuFind/View/Helper/AbstractSearch.php
+++ b/module/VuFind/src/VuFind/View/Helper/AbstractSearch.php
@@ -85,7 +85,7 @@ abstract class AbstractSearch extends AbstractHelper
}
$html .= '<a href="'
. $results->getUrlQuery()
- ->replaceTerm($term, $data['new_term'])->getParams()
+ ->replaceTerm($term, $data['new_term'])->getParams()
. '">' . $view->escapeHtml($word) . '</a>';
if (isset($data['expand_term']) && !empty($data['expand_term'])) {
$url = $results->getUrlQuery()
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Base.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Base.php
index 344c442c00b..373ccffc0f0 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Base.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Base.php
@@ -87,7 +87,7 @@ abstract class Base
* Sets up the EDS API Client
*
* @param array $settings Associative array of setting to use in
- * conjunction with the EDS API
+ * conjunction with the EDS API
* <ul>
* <li>debug - boolean to control debug mode</li>
* <li>orgid - Organization making calls to the EDS API </li>
--
GitLab