diff --git a/module/VuDL/Module.php b/module/VuDL/Module.php
index 495258804cd52a58010622a756151b4e738a284f..d6d52738d2c2cd3f1a6c54261d205aebda79953d 100644
--- a/module/VuDL/Module.php
+++ b/module/VuDL/Module.php
@@ -26,8 +26,6 @@
* @link https://github.com/dmj/vf2-proxy
*/
namespace VuDL;
-use Zend\ModuleManager\ModuleManager,
- Zend\Mvc\MvcEvent;
/**
* VuDL interface module.
@@ -65,26 +63,4 @@ class Module
),
);
}
-
- /**
- * Initialize the module
- *
- * @param ModuleManager $m Module manager
- *
- * @return void
- */
- public function init(ModuleManager $m)
- {
- }
-
- /**
- * Bootstrap the module
- *
- * @param MvcEvent $e Event
- *
- * @return void
- */
- public function onBootstrap(MvcEvent $e)
- {
- }
}
diff --git a/module/VuFind/Module.php b/module/VuFind/Module.php
index 180edd643ef8ba7d59c8c00e51f3042cf52fbccc..a3353bc35840726ec23c6ea8818286105b0f5a51 100644
--- a/module/VuFind/Module.php
+++ b/module/VuFind/Module.php
@@ -26,8 +26,7 @@
* @link http://vufind.org
*/
namespace VuFind;
-use Zend\ModuleManager\ModuleManager,
- Zend\Mvc\MvcEvent;
+use Zend\Mvc\MvcEvent;
/**
* ZF2 module definition for the VuFind application
@@ -71,17 +70,6 @@ class Module
);
}
- /**
- * Initialize the module
- *
- * @param ModuleManager $m Module manager
- *
- * @return void
- */
- public function init(ModuleManager $m)
- {
- }
-
/**
* Bootstrap the module
*
diff --git a/module/VuFind/src/VuFind/Cache/Storage/Adapter/NoCacheAdapter.php b/module/VuFind/src/VuFind/Cache/Storage/Adapter/NoCacheAdapter.php
index c36d8047a438e2fdd2e6338562e1e434fbc777d1..2b7ce70467c6f693f1e2206d75b848cb744b038c 100644
--- a/module/VuFind/src/VuFind/Cache/Storage/Adapter/NoCacheAdapter.php
+++ b/module/VuFind/src/VuFind/Cache/Storage/Adapter/NoCacheAdapter.php
@@ -26,7 +26,6 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://www.vufind.org Main Page
*/
-
namespace VuFind\Cache\Storage\Adapter;
use Zend\Cache\Storage\Adapter\AbstractAdapter;
@@ -39,6 +38,7 @@ use Zend\Cache\Storage\Adapter\AbstractAdapter;
* @author David Maus <maus@hab.de>
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://www.vufind.org Main Page
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
class NoCacheAdapter extends AbstractAdapter
{
diff --git a/module/VuFind/src/VuFind/Config/PluginFactory.php b/module/VuFind/src/VuFind/Config/PluginFactory.php
index 6ec688e54f51ebe234ef69a20e10c382062776e1..240569cdce2ef84be77be6ba56dfe9a4620f2a1c 100644
--- a/module/VuFind/src/VuFind/Config/PluginFactory.php
+++ b/module/VuFind/src/VuFind/Config/PluginFactory.php
@@ -130,6 +130,7 @@ class PluginFactory implements AbstractFactoryInterface
* @param string $requestedName Unfiltered name of service
*
* @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator,
$name, $requestedName
@@ -146,6 +147,7 @@ class PluginFactory implements AbstractFactoryInterface
* @param string $requestedName Unfiltered name of service
*
* @return object
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function createServiceWithName(ServiceLocatorInterface $serviceLocator,
$name, $requestedName
diff --git a/module/VuFind/src/VuFind/Config/PluginManager.php b/module/VuFind/src/VuFind/Config/PluginManager.php
index 5e89f3b95b7066a95c7a5895bda0f6976dc4bef5..76eaa1c7c222d9723ca497422b908f847c0462c5 100644
--- a/module/VuFind/src/VuFind/Config/PluginManager.php
+++ b/module/VuFind/src/VuFind/Config/PluginManager.php
@@ -49,6 +49,7 @@ class PluginManager extends Base
*
* @throws ServiceManagerRuntimeException if invalid
* @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function validatePlugin($plugin)
{
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index e3e74e75495b173faf85bddfce70475f2c36c59b..968468d1c08df1d085d0e32e618239600fb22c1d 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -38,6 +38,7 @@ use Zend\Mvc\Controller\AbstractActionController, Zend\View\Model\ViewModel;
* @author Chris Hallberg <challber@villanova.edu>
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/vufind2:building_a_controller Wiki
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
class AbstractBase extends AbstractActionController
{
diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php
index d4cee5b1c35fb7958508600dab9d7c775e1bceac..c55a75ad3109a6a44e97a9133ac1f3c3f880fd89 100644
--- a/module/VuFind/src/VuFind/Controller/AjaxController.php
+++ b/module/VuFind/src/VuFind/Controller/AjaxController.php
@@ -699,14 +699,12 @@ class AjaxController extends AbstractBase
/**
* Get entry information on entries tied to a specific map location
*
- * @param array $fields Solr fields to retrieve data from
- *
* @author Chris Hallberg <crhallberg@gmail.com>
* @author Lutz Biedinger <lutz.biedinger@gmail.com>
*
* @return mixed
*/
- public function resultgooglemapinfoAction($fields = array('long_lat'))
+ public function resultgooglemapinfoAction()
{
$this->writeSession(); // avoid session write timing bug
// Set layout to render the page inside a lightbox:
diff --git a/module/VuFind/src/VuFind/Controller/SummonController.php b/module/VuFind/src/VuFind/Controller/SummonController.php
index 49d036eb568e7c765dcbce64f9b662a82300a3c8..49e12f520687598bb39d402ad150242c66cd64b1 100644
--- a/module/VuFind/src/VuFind/Controller/SummonController.php
+++ b/module/VuFind/src/VuFind/Controller/SummonController.php
@@ -62,13 +62,11 @@ class SummonController extends AbstractSearch
}
/**
- * preDispatch -- block access when appropriate.
- *
- * @param MvcEvent $e Event object
+ * preDispatch -- add Summon message.
*
* @return void
*/
- public function preDispatch(MvcEvent $e)
+ public function preDispatch()
{
$this->layout()->poweredBy
= 'Powered by Summonâ„¢ from Serials Solutions, a division of ProQuest.';
diff --git a/module/VuFind/src/VuFind/Controller/SummonrecordController.php b/module/VuFind/src/VuFind/Controller/SummonrecordController.php
index 47891c8a4e28e8d42ef84b244b2016145a2fe447..bb658f486d0398ea546d2dd4aca3b110011950b6 100644
--- a/module/VuFind/src/VuFind/Controller/SummonrecordController.php
+++ b/module/VuFind/src/VuFind/Controller/SummonrecordController.php
@@ -66,13 +66,11 @@ class SummonrecordController extends AbstractRecord
}
/**
- * preDispatch -- block access when appropriate.
- *
- * @param MvcEvent $e Event object
+ * preDispatch -- add Summon message.
*
* @return void
*/
- public function preDispatch(MvcEvent $e)
+ public function preDispatch()
{
$this->layout()->poweredBy
= 'Powered by Summonâ„¢ from Serials Solutions, a division of ProQuest.';
diff --git a/module/VuFind/src/VuFind/Db/Table/Tags.php b/module/VuFind/src/VuFind/Db/Table/Tags.php
index bbe8fd74c7c49cc3947d0eb9ba45632d2c2ab927..59240d507411efa5050974d7e2dfc470e004c5cb 100644
--- a/module/VuFind/src/VuFind/Db/Table/Tags.php
+++ b/module/VuFind/src/VuFind/Db/Table/Tags.php
@@ -148,7 +148,8 @@ class Tags extends Gateway
* Get a list of tags based on a sort method ($sort)
*
* @param string $sort Sort/search parameter
- * @param int $limit Maximum number of tags
+ * @param int $limit Maximum number of tags (default = 100,
+ * < 1 = no limit)
* @param callback $extra_where Extra code to modify $select (null for none)
*
* @return array Tag details.
@@ -189,8 +190,10 @@ class Tags extends Gateway
);
break;
}
- // Limit the size of our results based on the ini browse limit setting
- //$select->limit($limit);
+ // Limit the size of our results
+ if ($limit > 0) {
+ $select->limit($limit);
+ }
};
$tagList = array();
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php b/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php
index 2eeca7e1a7749d8f2fd5125f50dc5974b0c3d6ce..7f9a5e77c36a01d7a3fcdd3614e450e55bd3117f 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrDefault.php
@@ -40,6 +40,7 @@ use VuFind\Code\ISBN;
* @author Demian Katz <demian.katz@villanova.edu>
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/vufind2:record_drivers Wiki
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
*/
class SolrDefault extends AbstractBase
{
diff --git a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
index 0fece6d1e53d68e0f76d06b5836927c0ea613737..f9721dac18a05e9570f0dddc1b8119a3089272af 100644
--- a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
+++ b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
@@ -37,6 +37,7 @@ use Zend\ServiceManager\AbstractPluginManager as Base,
* @author Demian Katz <demian.katz@villanova.edu>
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org/wiki/vufind2:developer_manual Wiki
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
*/
abstract class AbstractPluginManager extends Base
{
diff --git a/module/VuFindConsole/Module.php b/module/VuFindConsole/Module.php
index 792a04ada4b79e6f37abd3d3dde08c1211fc23b3..586a87214515209abf6b49fcd85b28be9d483639 100644
--- a/module/VuFindConsole/Module.php
+++ b/module/VuFindConsole/Module.php
@@ -26,8 +26,6 @@
* @link https://github.com/dmj/vf2-proxy
*/
namespace VuFindConsole;
-use VuFindConsole\Mvc\Router\ConsoleRouter,
- Zend\ModuleManager\ModuleManager, Zend\Mvc\MvcEvent;
/**
* ZF2 module definition for the VuFind console module
@@ -65,26 +63,4 @@ class Module
),
);
}
-
- /**
- * Initialize the module
- *
- * @param ModuleManager $m Module manager
- *
- * @return void
- */
- public function init(ModuleManager $m)
- {
- }
-
- /**
- * Bootstrap the module
- *
- * @param MvcEvent $e Event
- *
- * @return void
- */
- public function onBootstrap(MvcEvent $e)
- {
- }
}
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php
index b358c732857ddef6c7675360ca7f4e3a581e27fc..485970ccb4a6657eed556c5c1b83e936f234e526 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Pazpar2/Backend.php
@@ -246,6 +246,7 @@ class Backend extends AbstractBackend
* @param int $offset Search offset
*
* @return RecordCollectionInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function createRecordCollection($records, $total = 0, $offset = 0)
{
diff --git a/themes/bootstrap/js/lightbox.js b/themes/bootstrap/js/lightbox.js
index 0df06151588226936d085b732757a018502b7e6a..f252e6c40773b77b4f2d3bcfdfc1bf75673bec55 100644
--- a/themes/bootstrap/js/lightbox.js
+++ b/themes/bootstrap/js/lightbox.js
@@ -10,7 +10,7 @@ var modalXHR; // Used for current in-progress XHR lightbox request
// Cart actions based on submission
// Change the content of the lightbox
function changeModalContent(html) {
- var header = $('#modal .modal-header')
+ var header = $('#modal .modal-header');
if(header.find('h3').html().length == 0) {
header.css('border-bottom-width', '0');
} else {