From 29f6fd76bb7e9f37fcf6e2cb17d5ea0213395117 Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Wed, 18 Jan 2023 09:09:29 +0100
Subject: [PATCH] refs #22747 [finc] Zend becomes Laminas
---
module/finc/config/module.config.php | 12 +++----
.../AjaxHandler/GetAdditionalAccountInfo.php | 2 +-
.../src/finc/AjaxHandler/GetIlsStatus.php | 2 +-
.../src/finc/AjaxHandler/GetItemStatuses.php | 2 +-
.../src/finc/AjaxHandler/GetRecordCover.php | 4 +--
.../AjaxHandler/GetRecordCoverFactory.php | 6 ++--
.../src/finc/AjaxHandler/GetResolverLinks.php | 6 ++--
.../AjaxHandler/GetResolverLinksFactory.php | 2 +-
.../AjaxHandler/GetUserPermanentLoans.php | 2 +-
module/finc/src/finc/Auth/ILS.php | 2 +-
.../finc/src/finc/Auth/ILSAuthenticator.php | 6 ++--
.../src/finc/Auth/ILSAuthenticatorFactory.php | 2 +-
module/finc/src/finc/Auth/ILSFactory.php | 2 +-
module/finc/src/finc/Bootstrapper.php | 8 ++---
module/finc/src/finc/Cache/Manager.php | 2 +-
.../finc/Controller/Admin/I18nController.php | 6 ++--
.../Admin/I18nControllerFactory.php | 4 +--
.../Controller/AmslResourceController.php | 12 +++----
.../AmslResourceControllerFactory.php | 2 +-
.../CustomTraits/AcquisitionTrait.php | 14 ++++----
.../CustomTraits/EmailHoldTrait.php | 2 +-
.../CustomTraits/EmailProfileTrait.php | 2 +-
.../finc/Controller/CustomTraits/PdaTrait.php | 14 ++++----
.../CustomTraits/ReportErrorsTrait.php | 12 +++----
.../CustomTraits/ResetPasswordTrait.php | 14 ++++----
.../DocumentDeliveryServiceController.php | 34 +++++++++----------
...cumentDeliveryServiceControllerFactory.php | 6 ++--
.../finc/Controller/MyResearchController.php | 6 ++--
.../Controller/Plugin/EmailHoldFactory.php | 2 +-
.../src/finc/Controller/Plugin/NewItems.php | 4 +--
.../Controller/Plugin/NewItemsFactory.php | 4 +--
.../src/finc/Controller/RecordController.php | 4 +--
.../src/finc/Controller/RecordsController.php | 4 +--
module/finc/src/finc/Cover/Router.php | 2 +-
module/finc/src/finc/Cover/RouterFactory.php | 2 +-
.../src/finc/Form/View/Helper/FormLabel.php | 4 +--
.../finc/Hierarchy/TreeRenderer/JSTree.php | 2 +-
.../TreeRenderer/JSTreeDelegatorFactory.php | 2 +-
.../Translator/ZendI18nResourcesInjector.php | 2 +-
module/finc/src/finc/ILS/Driver/FincILS.php | 8 ++---
.../src/finc/ILS/Driver/FincILSFactory.php | 2 +-
module/finc/src/finc/ILS/Driver/PAIA.php | 6 ++--
.../finc/src/finc/ILS/Driver/PAIAFactory.php | 2 +-
.../StaticStatusRulesDelegatorFactory.php | 6 ++--
.../src/finc/Listener/I18nDataDirListener.php | 8 ++---
module/finc/src/finc/Mailer/Mailer.php | 14 ++++----
.../finc/src/finc/Recommend/EbscoResults.php | 6 ++--
.../finc/Recommend/EbscoResultsFactory.php | 2 +-
.../src/finc/Recommend/InterlibraryLoan.php | 2 +-
.../src/finc/RecordDriver/SolrDefault.php | 8 ++---
.../RecordDriver/SolrDefaultFincTrait.php | 2 +-
.../finc/src/finc/RecordDriver/SolrDico.php | 6 ++--
.../finc/src/finc/RecordDriver/SolrLido.php | 6 ++--
.../src/finc/RecordDriver/SolrLidoNdl.php | 6 ++--
.../src/finc/RecordDriver/SolrMarcFinc.php | 6 ++--
.../src/finc/RecordDriver/SolrMarcRemote.php | 8 ++---
.../finc/RecordDriver/SolrMarcRemoteFinc.php | 6 ++--
.../finc/RecordTab/HierarchyTreeFactory.php | 2 +-
module/finc/src/finc/Resolver/Driver/Ezb.php | 8 ++---
.../Driver/FincResolverDriverFactory.php | 4 +--
.../src/finc/Rewrite/EblRewriteFactory.php | 6 ++--
.../PermissionProvider/CatUserTypeFactory.php | 4 +--
.../IpRangeFoForFactory.php | 4 +--
.../PermissionProvider/IpRangeRealFactory.php | 4 +--
.../IpRegExFoForFactory.php | 4 +--
.../PermissionProvider/IpRegExRealFactory.php | 4 +--
.../MungerInjectionDelegatorFactory.php | 6 ++--
.../src/finc/View/Helper/Root/BranchInfo.php | 4 +--
.../Root/BranchInfoViewHelperFactory.php | 2 +-
.../Helper/Root/CitationViewHelperFactory.php | 2 +-
.../View/Helper/Root/EnhancedRenderArray.php | 2 +-
.../Helper/Root/ExternalCatalogueLink.php | 8 ++---
.../ExternalCatalogueLinkHelperFactory.php | 2 +-
.../finc/View/Helper/Root/ExternalLink.php | 6 ++--
.../View/Helper/Root/InterlibraryLoanLink.php | 2 +-
.../src/finc/View/Helper/Root/OpenUrl.php | 6 ++--
.../Helper/Root/OpenUrlViewHelperFactory.php | 2 +-
.../src/finc/View/Helper/Root/Permission.php | 2 +-
.../Root/PermissionViewHelperFactory.php | 2 +-
.../finc/src/finc/View/Helper/Root/Record.php | 14 ++++----
.../Root/RecordLinkViewHelperFactory.php | 2 +-
.../Helper/Root/RecordViewHelperFactory.php | 2 +-
.../src/finc/View/Helper/Root/ResultFeed.php | 4 +--
.../src/finc/View/Helper/Root/SideFacet.php | 6 ++--
.../Root/SideFacetViewHelperFactory.php | 2 +-
.../View/Helper/Root/ViewHelperFactory.php | 2 +-
86 files changed, 221 insertions(+), 221 deletions(-)
diff --git a/module/finc/config/module.config.php b/module/finc/config/module.config.php
index eaabdac9936..6cfec1f1144 100644
--- a/module/finc/config/module.config.php
+++ b/module/finc/config/module.config.php
@@ -16,7 +16,7 @@ $config = [
'finc\ILS\Connection' => 'VuFind\ILS\ConnectionFactory',
'finc\ILS\Logic\Holds' => 'VuFind\ILS\Logic\LogicFactory',
'finc\Rewrite\EblRewrite' => 'finc\Rewrite\EblRewriteFactory',
- 'finc\Listener\I18nDataDirListener' => 'Zend\ServiceManager\Factory\InvokableFactory',
+ 'finc\Listener\I18nDataDirListener' => 'Laminas\ServiceManager\Factory\InvokableFactory',
'finc\Cover\Loader' => 'VuFind\Cover\LoaderFactory',
'finc\Cover\Router' => 'finc\Cover\RouterFactory',
],
@@ -24,12 +24,12 @@ $config = [
'VuFindSearch\Service' => [
'finc\Service\MungerInjectionDelegatorFactory',
],
- 'Zend\Mvc\I18n\Translator' => [
+ 'Laminas\Mvc\I18n\Translator' => [
'finc\I18n\Translator\ZendI18nResourcesInjector',
],
],
'aliases' => [
- 'MvcTranslator' => 'Zend\Mvc\I18n\Translator',
+ 'MvcTranslator' => 'Laminas\Mvc\I18n\Translator',
'VuFind\Auth\ILSAuthenticator' => 'finc\Auth\ILSAuthenticator',
'VuFind\Cache\Manager' => 'finc\Cache\Manager',
'VuFind\ILS\Connection' => 'finc\ILS\Connection',
@@ -75,7 +75,7 @@ $config = [
'formLabel' => 'finc\Form\View\Helper\FormLabel',
],
'factories' => [
- 'finc\Form\View\Helper\FormLabel' => 'Zend\ServiceManager\Factory\InvokableFactory',
+ 'finc\Form\View\Helper\FormLabel' => 'Laminas\ServiceManager\Factory\InvokableFactory',
],
],
'vufind' => [
@@ -222,7 +222,7 @@ $config = [
'hierarchy_treedataformatter' => [
'factories' => [
'finc\Hierarchy\TreeDataFormatter\NoCollections' =>
- 'Zend\ServiceManager\Factory\InvokableFactory',
+ 'Laminas\ServiceManager\Factory\InvokableFactory',
],
'aliases' => [
'json' => 'finc\Hierarchy\TreeDataFormatter\NoCollections',
@@ -286,7 +286,7 @@ $config = [
'admin' => [
'child_routes' => [
'i18n' => [
- 'type' => 'Zend\Router\Http\Segment',
+ 'type' => 'Laminas\Router\Http\Segment',
'options' => [
'route' => '/I18n[/:action]',
'defaults' => [
diff --git a/module/finc/src/finc/AjaxHandler/GetAdditionalAccountInfo.php b/module/finc/src/finc/AjaxHandler/GetAdditionalAccountInfo.php
index 0554c25de2d..eed6f9c8c26 100644
--- a/module/finc/src/finc/AjaxHandler/GetAdditionalAccountInfo.php
+++ b/module/finc/src/finc/AjaxHandler/GetAdditionalAccountInfo.php
@@ -27,7 +27,7 @@
*/
namespace finc\AjaxHandler;
-use Zend\Mvc\Controller\Plugin\Params;
+use Laminas\Mvc\Controller\Plugin\Params;
/**
* AJAX handler to count items for view
diff --git a/module/finc/src/finc/AjaxHandler/GetIlsStatus.php b/module/finc/src/finc/AjaxHandler/GetIlsStatus.php
index cfd95b0ee7e..8802446f937 100644
--- a/module/finc/src/finc/AjaxHandler/GetIlsStatus.php
+++ b/module/finc/src/finc/AjaxHandler/GetIlsStatus.php
@@ -30,7 +30,7 @@
*/
namespace finc\AjaxHandler;
-use Zend\Mvc\Controller\Plugin\Params;
+use Laminas\Mvc\Controller\Plugin\Params;
/**
* "Get ILS Status" AJAX handler
diff --git a/module/finc/src/finc/AjaxHandler/GetItemStatuses.php b/module/finc/src/finc/AjaxHandler/GetItemStatuses.php
index da973f7cbea..6373cae984c 100644
--- a/module/finc/src/finc/AjaxHandler/GetItemStatuses.php
+++ b/module/finc/src/finc/AjaxHandler/GetItemStatuses.php
@@ -31,7 +31,7 @@
*/
namespace finc\AjaxHandler;
-use Zend\Mvc\Controller\Plugin\Params;
+use Laminas\Mvc\Controller\Plugin\Params;
/**
* "Get Item Status" AJAX handler
diff --git a/module/finc/src/finc/AjaxHandler/GetRecordCover.php b/module/finc/src/finc/AjaxHandler/GetRecordCover.php
index 5555926d6e7..1273bb12c28 100644
--- a/module/finc/src/finc/AjaxHandler/GetRecordCover.php
+++ b/module/finc/src/finc/AjaxHandler/GetRecordCover.php
@@ -34,8 +34,8 @@ namespace finc\AjaxHandler;
use VuFind\AjaxHandler\AbstractBase;
use VuFind\AjaxHandler\AjaxHandlerInterface;
-use Zend\Mvc\Controller\Plugin\Params;
-use Zend\View\Renderer\PhpRenderer;
+use Laminas\Mvc\Controller\Plugin\Params;
+use Laminas\View\Renderer\PhpRenderer;
use finc\Cover\Router as CoverRouter;
use VuFind\Exception\RecordMissing as RecordMissingException;
use VuFind\ILS\Driver\CacheTrait;
diff --git a/module/finc/src/finc/AjaxHandler/GetRecordCoverFactory.php b/module/finc/src/finc/AjaxHandler/GetRecordCoverFactory.php
index 45fad1b98b8..35850578735 100644
--- a/module/finc/src/finc/AjaxHandler/GetRecordCoverFactory.php
+++ b/module/finc/src/finc/AjaxHandler/GetRecordCoverFactory.php
@@ -34,9 +34,9 @@ namespace finc\AjaxHandler;
use Interop\Container\ContainerInterface;
use Interop\Container\Exception\ContainerException;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* Factory for GetRecordCover AJAX handler.
diff --git a/module/finc/src/finc/AjaxHandler/GetResolverLinks.php b/module/finc/src/finc/AjaxHandler/GetResolverLinks.php
index ab83397f92c..d4aec391512 100644
--- a/module/finc/src/finc/AjaxHandler/GetResolverLinks.php
+++ b/module/finc/src/finc/AjaxHandler/GetResolverLinks.php
@@ -35,9 +35,9 @@ use VuFind\Resolver\Connection;
use VuFind\Resolver\Driver\DriverInterface;
use VuFind\Resolver\Driver\PluginManager as ResolverManager;
use VuFind\Session\Settings as SessionSettings;
-use Zend\Config\Config;
-use Zend\Mvc\Controller\Plugin\Params;
-use Zend\View\Renderer\RendererInterface;
+use Laminas\Config\Config;
+use Laminas\Mvc\Controller\Plugin\Params;
+use Laminas\View\Renderer\RendererInterface;
/**
* "Get Resolver Links" AJAX handler
diff --git a/module/finc/src/finc/AjaxHandler/GetResolverLinksFactory.php b/module/finc/src/finc/AjaxHandler/GetResolverLinksFactory.php
index bac9ae52ddf..238a1d64d94 100644
--- a/module/finc/src/finc/AjaxHandler/GetResolverLinksFactory.php
+++ b/module/finc/src/finc/AjaxHandler/GetResolverLinksFactory.php
@@ -41,7 +41,7 @@ use Interop\Container\ContainerInterface;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*/
-class GetResolverLinksFactory implements \Zend\ServiceManager\Factory\FactoryInterface
+class GetResolverLinksFactory implements \Laminas\ServiceManager\Factory\FactoryInterface
{
/**
* Create an object
diff --git a/module/finc/src/finc/AjaxHandler/GetUserPermanentLoans.php b/module/finc/src/finc/AjaxHandler/GetUserPermanentLoans.php
index b259aa2c3cf..a8206510aa1 100644
--- a/module/finc/src/finc/AjaxHandler/GetUserPermanentLoans.php
+++ b/module/finc/src/finc/AjaxHandler/GetUserPermanentLoans.php
@@ -25,7 +25,7 @@
*/
namespace finc\AjaxHandler;
-use Zend\Mvc\Controller\Plugin\Params;
+use Laminas\Mvc\Controller\Plugin\Params;
/**
* "Get User Holds" AJAX handler
diff --git a/module/finc/src/finc/Auth/ILS.php b/module/finc/src/finc/Auth/ILS.php
index c51865d9eeb..c8a2f917d1b 100644
--- a/module/finc/src/finc/Auth/ILS.php
+++ b/module/finc/src/finc/Auth/ILS.php
@@ -46,7 +46,7 @@ class ILS extends \VuFind\Auth\ILS
/**
* Update a user's password from the request.
*
- * @param \Zend\Http\PhpEnvironment\Request $request Request object containing
+ * @param \Laminas\Http\PhpEnvironment\Request $request Request object containing
* new account details.
*
* @throws AuthException
diff --git a/module/finc/src/finc/Auth/ILSAuthenticator.php b/module/finc/src/finc/Auth/ILSAuthenticator.php
index 8f891bb1eb8..d24e288457a 100644
--- a/module/finc/src/finc/Auth/ILSAuthenticator.php
+++ b/module/finc/src/finc/Auth/ILSAuthenticator.php
@@ -30,7 +30,7 @@ namespace finc\Auth;
use VuFind\Auth\EmailAuthenticator as EmailAuthenticator;
use VuFind\Auth\Manager as Manager;
use VuFind\ILS\Connection as ILSConnection;
-use Zend\Session\SessionManager as SessionManager;
+use Laminas\Session\SessionManager as SessionManager;
/**
* Class for managing ILS-specific authentication.
@@ -46,7 +46,7 @@ class ILSAuthenticator extends \VuFind\Auth\ILSAuthenticator
/**
* Session containing PAIA login information
*
- * @var Zend\Session\Container
+ * @var Laminas\Session\Container
*/
protected $session;
@@ -86,7 +86,7 @@ class ILSAuthenticator extends \VuFind\Auth\ILSAuthenticator
{
// SessionContainer not defined yet? Build it now:
if (null === $this->session) {
- $this->session = new \Zend\Session\Container(
+ $this->session = new \Laminas\Session\Container(
'PAIA',
$this->sessionManager
);
diff --git a/module/finc/src/finc/Auth/ILSAuthenticatorFactory.php b/module/finc/src/finc/Auth/ILSAuthenticatorFactory.php
index d202d0650bd..2d6c1191b9c 100644
--- a/module/finc/src/finc/Auth/ILSAuthenticatorFactory.php
+++ b/module/finc/src/finc/Auth/ILSAuthenticatorFactory.php
@@ -29,7 +29,7 @@
namespace finc\Auth;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ILS Authenticator factory.
diff --git a/module/finc/src/finc/Auth/ILSFactory.php b/module/finc/src/finc/Auth/ILSFactory.php
index c9c92ae1c55..b3d04dd7ca2 100644
--- a/module/finc/src/finc/Auth/ILSFactory.php
+++ b/module/finc/src/finc/Auth/ILSFactory.php
@@ -29,7 +29,7 @@ namespace finc\Auth;
use Interop\Container\ContainerInterface;
use VuFind\XSLT\Import\VuFind;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* Factory for ILS authentication module (and others with equivalent constructors).
diff --git a/module/finc/src/finc/Bootstrapper.php b/module/finc/src/finc/Bootstrapper.php
index 178435297e4..08f8822867d 100644
--- a/module/finc/src/finc/Bootstrapper.php
+++ b/module/finc/src/finc/Bootstrapper.php
@@ -27,7 +27,7 @@
*/
namespace finc;
-use Zend\Console\Console;
+use Laminas\Console\Console;
/**
* Finc Bootstrapper
@@ -64,7 +64,7 @@ class Bootstrapper extends \VuFind\Bootstrapper
protected function initFincCustomErrorView()
{
//custom error page not needed in console mode:
- if (\Zend\Console\Console::isConsole()) {
+ if (\Laminas\Console\Console::isConsole()) {
return;
}
@@ -84,14 +84,14 @@ class Bootstrapper extends \VuFind\Bootstrapper
);
$resolver = $e->getApplication()
- ->getServiceManager()->get('Zend\View\Resolver\TemplatePathStack');
+ ->getServiceManager()->get('Laminas\View\Resolver\TemplatePathStack');
if (false === $resolver->resolve($template = "error/$exceptionName")) {
// custom error template does not exist
return;
}
- $model = new \Zend\View\Model\ViewModel(
+ $model = new \Laminas\View\Model\ViewModel(
[
'display_exceptions' => APPLICATION_ENV == 'development',
'exception' => $e->getParam('exception'),
diff --git a/module/finc/src/finc/Cache/Manager.php b/module/finc/src/finc/Cache/Manager.php
index 394e7f92521..abfca556e6d 100644
--- a/module/finc/src/finc/Cache/Manager.php
+++ b/module/finc/src/finc/Cache/Manager.php
@@ -27,7 +27,7 @@
*/
namespace finc\Cache;
-use Zend\Config\Config;
+use Laminas\Config\Config;
/**
* VuFind Cache Manager
diff --git a/module/finc/src/finc/Controller/Admin/I18nController.php b/module/finc/src/finc/Controller/Admin/I18nController.php
index b29ba1e16ac..d6240cb5bf6 100644
--- a/module/finc/src/finc/Controller/Admin/I18nController.php
+++ b/module/finc/src/finc/Controller/Admin/I18nController.php
@@ -27,8 +27,8 @@ use VuFind\Auth\InvalidArgumentException;
use VuFind\Config\Writer as ConfigWriter;
use VuFind\I18n\Translator\Loader\ExtendedIni;
use VuFindAdmin\Controller\AbstractAdmin;
-use Zend\I18n\Translator\Translator;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\I18n\Translator\Translator;
+use Laminas\ServiceManager\ServiceLocatorInterface;
class I18nController extends AbstractAdmin
{
@@ -357,7 +357,7 @@ class I18nController extends AbstractAdmin
* Construct an HTTP 205 (refresh) response. Useful for reporting success
* in the lightbox without actually rendering content.
*
- * @return \Zend\Http\Response
+ * @return \Laminas\Http\Response
*/
protected function getRefreshResponse()
{
diff --git a/module/finc/src/finc/Controller/Admin/I18nControllerFactory.php b/module/finc/src/finc/Controller/Admin/I18nControllerFactory.php
index bcd73107a9a..36905bde2cf 100644
--- a/module/finc/src/finc/Controller/Admin/I18nControllerFactory.php
+++ b/module/finc/src/finc/Controller/Admin/I18nControllerFactory.php
@@ -24,8 +24,8 @@ namespace finc\Controller\Admin;
use Psr\Container\ContainerInterface;
use VuFind\Config\PluginManager;
-use Zend\Mvc\I18n\Translator;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Mvc\I18n\Translator;
+use Laminas\ServiceManager\ServiceLocatorInterface;
class I18nControllerFactory
{
diff --git a/module/finc/src/finc/Controller/AmslResourceController.php b/module/finc/src/finc/Controller/AmslResourceController.php
index ce15e705760..d1c65ac4870 100644
--- a/module/finc/src/finc/Controller/AmslResourceController.php
+++ b/module/finc/src/finc/Controller/AmslResourceController.php
@@ -29,7 +29,7 @@
namespace finc\Controller;
use VuFind\Controller\AbstractBase;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Controller for the user account area.
@@ -48,7 +48,7 @@ class AmslResourceController extends AbstractBase
/**
* Amsl.ini configuration.
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $config = [];
@@ -60,7 +60,7 @@ class AmslResourceController extends AbstractBase
/**
* HTTP client
*
- * @var \Zend\Http\Client
+ * @var \Laminas\Http\Client
*/
protected $httpClient;
@@ -89,14 +89,14 @@ class AmslResourceController extends AbstractBase
* Constructor
*
* @param ServiceLocatorInterface $sm
- * @param \Zend\Config\Config $config VuFind configuration
+ * @param \Laminas\Config\Config $config VuFind configuration
* @param \VuFindHttp\HttpService $httpClient HttpClient
* @param \VuFind\Cache\Manager $cacheManager Cache manager (optional)
*
*/
public function __construct(
ServiceLocatorInterface $sm,
- \Zend\Config\Config $config,
+ \Laminas\Config\Config $config,
\VuFindHttp\HttpService $httpClient,
\VuFind\Cache\Manager $cacheManager = null,
array $resourceMapping = null
@@ -112,7 +112,7 @@ class AmslResourceController extends AbstractBase
/**
* Amsl action - controller method
*
- * @return \Zend\View\Model\ViewModel
+ * @return \Laminas\View\Model\ViewModel
* @throws \Exception
*/
public function homeAction()
diff --git a/module/finc/src/finc/Controller/AmslResourceControllerFactory.php b/module/finc/src/finc/Controller/AmslResourceControllerFactory.php
index a0b5134d6a8..e77a965014d 100644
--- a/module/finc/src/finc/Controller/AmslResourceControllerFactory.php
+++ b/module/finc/src/finc/Controller/AmslResourceControllerFactory.php
@@ -3,7 +3,7 @@ namespace finc\Controller;
use Psr\Container\ContainerInterface;
use VuFind\Config\YamlReader;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
class AmslResourceControllerFactory
{
diff --git a/module/finc/src/finc/Controller/CustomTraits/AcquisitionTrait.php b/module/finc/src/finc/Controller/CustomTraits/AcquisitionTrait.php
index c4b197df5fd..ca91bf4dcd8 100644
--- a/module/finc/src/finc/Controller/CustomTraits/AcquisitionTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/AcquisitionTrait.php
@@ -32,9 +32,9 @@ namespace finc\Controller\CustomTraits;
use VuFind\Exception\Mail as MailException;
use finc\Mailer\Mailer;
-use Zend\Mail\Address;
-use Zend\Validator\StringLength;
-use Zend\Validator\Identical;
+use Laminas\Mail\Address;
+use Laminas\Validator\StringLength;
+use Laminas\Validator\Identical;
/**
* Acquisition Trait
@@ -59,7 +59,7 @@ trait AcquisitionTrait
*
* @todo Open issue: Implementation of accession/domain check of user by PAIA.
*
- * @return \Zend\View\Model\ViewModel
+ * @return \Laminas\View\Model\ViewModel
* @throws \Exception Authorization service missing
*/
public function acquisitionAction()
@@ -109,12 +109,12 @@ trait AcquisitionTrait
// Create view
$view = $this->createAcquisitionViewModel();
- // Set up reCaptcha
+ // Set up captcha
//todo: testen!
- $view->useRecaptcha = $this->recaptcha()->active('acquisition');
+ $view->useCaptcha = $this->captcha()->active('acquisition');
// Process form submission
- if ($this->formWasSubmitted('submit', $view->useRecaptcha)) {
+ if ($this->formWasSubmitted('submit', $view->useCaptcha)) {
// Collect the data submitted by form
$params['field_of_study'] = !empty($view->acquisitionFieldOfStudy) ? $view->acquisitionFieldOfStudy : '';
$params['proposal'] = !empty($view->acquisitionProposal) ? $view->acquisitionProposal : '';
diff --git a/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php b/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php
index 8568a4b8da5..1033376a4c7 100644
--- a/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/EmailHoldTrait.php
@@ -31,7 +31,7 @@ namespace finc\Controller\CustomTraits;
use finc\Mailer\Mailer as Mailer;
use VuFind\Exception\Mail as MailException;
-use Zend\Mail\Address as Address;
+use Laminas\Mail\Address as Address;
/**
* Email Hold trait (for subclasses of AbstractRecord)
diff --git a/module/finc/src/finc/Controller/CustomTraits/EmailProfileTrait.php b/module/finc/src/finc/Controller/CustomTraits/EmailProfileTrait.php
index 06967d8ac66..8c01fcc9d07 100644
--- a/module/finc/src/finc/Controller/CustomTraits/EmailProfileTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/EmailProfileTrait.php
@@ -42,7 +42,7 @@ trait EmailProfileTrait
/*
* Important:
* Usage of this Trait requires that the including class implements the
- * Zend\Log\LoggerAwareInterface and uses VuFind\Log\LoggerAwareTrait
+ * Laminas\Log\LoggerAwareInterface and uses VuFind\Log\LoggerAwareTrait
*/
/**
diff --git a/module/finc/src/finc/Controller/CustomTraits/PdaTrait.php b/module/finc/src/finc/Controller/CustomTraits/PdaTrait.php
index 258c392e19f..ec73d2ed7ac 100644
--- a/module/finc/src/finc/Controller/CustomTraits/PdaTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/PdaTrait.php
@@ -32,9 +32,9 @@ namespace finc\Controller\CustomTraits;
use VuFind\Exception\Mail as MailException;
use finc\Mailer\Mailer;
-use Zend\Mail\Address;
-use Zend\Validator\StringLength;
-use Zend\Validator\Identical;
+use Laminas\Mail\Address;
+use Laminas\Validator\StringLength;
+use Laminas\Validator\Identical;
/**
* PDA Trait
@@ -59,7 +59,7 @@ trait PdaTrait
*
* @todo Open issue: Implementation of accession/domain check of user by PAIA.
*
- * @return \Zend\View\Model\ViewModel
+ * @return \Laminas\View\Model\ViewModel
* @throws \Exception Authorization service missing
*/
public function pdaAction()
@@ -110,12 +110,12 @@ trait PdaTrait
// Create view
$view = $this->createPDAEmailViewModel();
- // Set up reCaptcha
+ // Set up captcha
//todo: testen!
- $view->useRecaptcha = $this->recaptcha()->active('pda');
+ $view->useCaptcha = $this->captcha()->active('pda');
// Process form submission
- if ($this->formWasSubmitted('submit', $view->useRecaptcha)) {
+ if ($this->formWasSubmitted('submit', $view->useCaptcha)) {
// Collect the data submitted by form
$params['field_of_study'] = !empty($view->pdaFieldOfStudy) ? $view->pdaFieldOfStudy : '';
$params['statement'] = !empty($view->pdaStatement) ? $view->pdaStatement : '';
diff --git a/module/finc/src/finc/Controller/CustomTraits/ReportErrorsTrait.php b/module/finc/src/finc/Controller/CustomTraits/ReportErrorsTrait.php
index 868b79f5a8e..e7a3c30cf25 100644
--- a/module/finc/src/finc/Controller/CustomTraits/ReportErrorsTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/ReportErrorsTrait.php
@@ -30,8 +30,8 @@ namespace finc\Controller\CustomTraits;
use VuFind\Exception\Mail as MailException;
use finc\Mailer\Mailer;
-use Zend\Mail\Address;
-use Zend\Validator\StringLength;
+use Laminas\Mail\Address;
+use Laminas\Validator\StringLength;
/**
* ReportErrors Trait
@@ -48,7 +48,7 @@ trait ReportErrorsTrait
/**
* PDA action - controller method
*
- * @return \Zend\View\Model\ViewModel
+ * @return \Laminas\View\Model\ViewModel
*/
public function reportErrorsAction()
{
@@ -68,12 +68,12 @@ trait ReportErrorsTrait
// Create view
$view = $this->createReportErrorsEmailViewModel($params);
- // Set up reCaptcha
+ // Set up Captcha
//todo: testen!
- $view->useRecaptcha = $this->recaptcha()->active('reportErrors');
+ $view->useCaptcha = $this->captcha()->active('reportErrors');
// Process form submission
- if ($this->formWasSubmitted('submit', $view->useRecaptcha)) {
+ if ($this->formWasSubmitted('submit', $view->useCaptcha)) {
// Collect the data submitted by form
$params['reply_requested'] = $view->reply_requested;
$params['email'] = !empty($view->email) ? $view->email : '';
diff --git a/module/finc/src/finc/Controller/CustomTraits/ResetPasswordTrait.php b/module/finc/src/finc/Controller/CustomTraits/ResetPasswordTrait.php
index d6cec6414d8..7d26d1be05a 100644
--- a/module/finc/src/finc/Controller/CustomTraits/ResetPasswordTrait.php
+++ b/module/finc/src/finc/Controller/CustomTraits/ResetPasswordTrait.php
@@ -32,9 +32,9 @@ namespace finc\Controller\CustomTraits;
use VuFind\Exception\Mail as MailException;
use finc\Mailer\Mailer;
-use Zend\Mail\Address;
-use Zend\Validator\Identical;
-use Zend\Validator\EmailAddress;
+use Laminas\Mail\Address;
+use Laminas\Validator\Identical;
+use Laminas\Validator\EmailAddress;
/**
* ResetPassword Trait
@@ -57,18 +57,18 @@ trait ResetPasswordTrait
/**
* Reset password action - Allows the reset password form to appear.
*
- * @return \Zend\View\Model\ViewModel
+ * @return \Laminas\View\Model\ViewModel
*/
public function resetPasswordAction()
{
// Create view
$view = $this->createResetPasswordViewModel();
- // Set up reCaptcha
- $view->useRecaptcha = $this->recaptcha()->active('resetPassword');
+ // Set up captcha
+ $view->useCaptcha = $this->captcha()->active('resetPassword');
// Process form submission:
- if ($this->formWasSubmitted('submit', $view->useRecaptcha)) {
+ if ($this->formWasSubmitted('submit', $view->useCaptcha)) {
$params = [
'firstname' => !empty($view->firstname) ? $view->firstname : '',
'lastname' => !empty($view->lastname) ? $view->lastname : '',
diff --git a/module/finc/src/finc/Controller/DocumentDeliveryServiceController.php b/module/finc/src/finc/Controller/DocumentDeliveryServiceController.php
index 805fe9abc2c..611f655bc83 100644
--- a/module/finc/src/finc/Controller/DocumentDeliveryServiceController.php
+++ b/module/finc/src/finc/Controller/DocumentDeliveryServiceController.php
@@ -31,11 +31,11 @@ namespace finc\Controller;
use finc\Exception\DDS as DDSException;
use finc\Mailer\Mailer as Mailer;
use VuFind\Exception\Mail as MailException;
-use Zend\Form\Element\Select;
-use Zend\Form\Form;
-use Zend\Http\PhpEnvironment\Request;
-use Zend\Mail\Address as Address;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Form\Element\Select;
+use Laminas\Form\Form;
+use Laminas\Http\PhpEnvironment\Request;
+use Laminas\Mail\Address as Address;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Controller for Document Delivery Service
@@ -47,7 +47,7 @@ use Zend\ServiceManager\ServiceLocatorInterface;
* @link http://vufind.org Main Site
*/
class DocumentDeliveryServiceController extends \VuFind\Controller\AbstractBase implements
- \Zend\Log\LoggerAwareInterface
+ \Laminas\Log\LoggerAwareInterface
{
use \VuFind\Log\LoggerAwareTrait;
@@ -75,14 +75,14 @@ class DocumentDeliveryServiceController extends \VuFind\Controller\AbstractBase
/**
* HTTP client
*
- * @var \Zend\Http\Client
+ * @var \Laminas\Http\Client
*/
protected $httpClient;
/**
* Session container
*
- * @var \Zend\Session\Container
+ * @var \Laminas\Session\Container
*/
protected $session;
@@ -90,15 +90,15 @@ class DocumentDeliveryServiceController extends \VuFind\Controller\AbstractBase
* Constructor
*
* @param ServiceLocatorInterface $sm
- * @param \Zend\Config\Config $config VuFind configuration
- * @param \Zend\Config\Config $dds Document Delivery Service configuration
- * @param \Zend\Session\Container $session Session container
+ * @param \Laminas\Config\Config $config VuFind configuration
+ * @param \Laminas\Config\Config $dds Document Delivery Service configuration
+ * @param \Laminas\Session\Container $session Session container
*/
public function __construct(
ServiceLocatorInterface $sm,
- \Zend\Config\Config $config,
- \Zend\Config\Config $dds,
- \Zend\Session\Container $session
+ \Laminas\Config\Config $config,
+ \Laminas\Config\Config $dds,
+ \Laminas\Session\Container $session
) {
parent::__construct($sm);
$this->config = array_merge($dds->toArray(), $config->toArray());
@@ -133,7 +133,7 @@ class DocumentDeliveryServiceController extends \VuFind\Controller\AbstractBase
/**
* Display Feedback home form.
*
- * @return \Zend\View\Model\ViewModel
+ * @return \Laminas\View\Model\ViewModel
* @throws \Exception Authorization service missing
*/
public function homeAction()
@@ -442,7 +442,7 @@ class DocumentDeliveryServiceController extends \VuFind\Controller\AbstractBase
/**
* Create http client if it is not already exists.
*
- * @return \Zend\Http\Client
+ * @return \Laminas\Http\Client
*/
protected function createHttpClient()
{
@@ -910,7 +910,7 @@ class DocumentDeliveryServiceController extends \VuFind\Controller\AbstractBase
'Authorization' => 'Bearer ' . $this->getDDSToken()]
);
//$client->setAdapter($adapter);
- $client->setAdapter(new \Zend\Http\Client\Adapter\Curl());
+ $client->setAdapter(new \Laminas\Http\Client\Adapter\Curl());
$response = $client->send();
if (!$response->isSuccess()) {
diff --git a/module/finc/src/finc/Controller/DocumentDeliveryServiceControllerFactory.php b/module/finc/src/finc/Controller/DocumentDeliveryServiceControllerFactory.php
index a2109d1a379..2f57166c1b0 100644
--- a/module/finc/src/finc/Controller/DocumentDeliveryServiceControllerFactory.php
+++ b/module/finc/src/finc/Controller/DocumentDeliveryServiceControllerFactory.php
@@ -2,8 +2,8 @@
namespace finc\Controller;
use Psr\Container\ContainerInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Session\Container;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\Session\Container;
class DocumentDeliveryServiceControllerFactory
{
@@ -16,7 +16,7 @@ class DocumentDeliveryServiceControllerFactory
{
$session = new Container(
'DDS',
- $container->get('Zend\Session\SessionManager')
+ $container->get('Laminas\Session\SessionManager')
);
return new DocumentDeliveryServiceController(
$container,
diff --git a/module/finc/src/finc/Controller/MyResearchController.php b/module/finc/src/finc/Controller/MyResearchController.php
index 6e95b173f7b..e8421dfb60a 100644
--- a/module/finc/src/finc/Controller/MyResearchController.php
+++ b/module/finc/src/finc/Controller/MyResearchController.php
@@ -30,8 +30,8 @@ namespace finc\Controller;
use VuFind\Exception\Forbidden as ForbiddenException;
use VuFind\Exception\ListPermission as ListPermissionException;
use VuFind\Search\RecommendListener;
-use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
-use Zend\Mvc\MvcEvent as MvcEvent;
+use Laminas\Log\LoggerAwareInterface as LoggerAwareInterface;
+use Laminas\Mvc\MvcEvent as MvcEvent;
/**
* Controller for the user account area.
@@ -53,7 +53,7 @@ class MyResearchController extends \VuFind\Controller\MyResearchController imple
/**
* Execute the request
*
- * @param \Zend\Mvc\MvcEvent $event Event
+ * @param \Laminas\Mvc\MvcEvent $event Event
*
* @return mixed
* @throws Exception\DomainException
diff --git a/module/finc/src/finc/Controller/Plugin/EmailHoldFactory.php b/module/finc/src/finc/Controller/Plugin/EmailHoldFactory.php
index 6c2401bc52a..43869130a57 100644
--- a/module/finc/src/finc/Controller/Plugin/EmailHoldFactory.php
+++ b/module/finc/src/finc/Controller/Plugin/EmailHoldFactory.php
@@ -29,7 +29,7 @@
namespace finc\Controller\Plugin;
use Psr\Container\ContainerInterface;
-use Zend\Session\SessionManager;
+use Laminas\Session\SessionManager;
/**
* Factory for controller plugins.
diff --git a/module/finc/src/finc/Controller/Plugin/NewItems.php b/module/finc/src/finc/Controller/Plugin/NewItems.php
index 25998371eac..b39a7b5696e 100644
--- a/module/finc/src/finc/Controller/Plugin/NewItems.php
+++ b/module/finc/src/finc/Controller/Plugin/NewItems.php
@@ -28,8 +28,8 @@
*/
namespace finc\Controller\Plugin;
-use Zend\Config\Config;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
+use Laminas\Config\Config;
+use Laminas\Mvc\Controller\Plugin\AbstractPlugin;
/**
* Zend action helper to perform new items-related actions
diff --git a/module/finc/src/finc/Controller/Plugin/NewItemsFactory.php b/module/finc/src/finc/Controller/Plugin/NewItemsFactory.php
index 42fe4cf4689..675d66b9ad8 100644
--- a/module/finc/src/finc/Controller/Plugin/NewItemsFactory.php
+++ b/module/finc/src/finc/Controller/Plugin/NewItemsFactory.php
@@ -30,7 +30,7 @@ namespace finc\Controller\Plugin;
use Psr\Container\ContainerInterface;
use finc\Controller\Plugin\NewItems;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\ServiceManager;
/**
* Factory for controller plugins.
@@ -57,7 +57,7 @@ class NewItemsFactory
{
$search = $sm->get('VuFind\Config\PluginManager')->get('searches');
$config = isset($search->NewItem)
- ? $search->NewItem : new \Zend\Config\Config([]);
+ ? $search->NewItem : new \Laminas\Config\Config([]);
return new NewItems($config, $sm->get('VuFind\Config\PluginManager')->get('config'));
}
}
diff --git a/module/finc/src/finc/Controller/RecordController.php b/module/finc/src/finc/Controller/RecordController.php
index be0586f1205..121cb06f61a 100644
--- a/module/finc/src/finc/Controller/RecordController.php
+++ b/module/finc/src/finc/Controller/RecordController.php
@@ -31,8 +31,8 @@ namespace finc\Controller;
use finc\Rewrite\EblRewrite;
use VuFind\Exception\RecordMissing;
-use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
-use Zend\View\View;
+use Laminas\Log\LoggerAwareInterface as LoggerAwareInterface;
+use Laminas\View\View;
/**
* Record Controller
diff --git a/module/finc/src/finc/Controller/RecordsController.php b/module/finc/src/finc/Controller/RecordsController.php
index 17fcb556f8e..3238f713812 100644
--- a/module/finc/src/finc/Controller/RecordsController.php
+++ b/module/finc/src/finc/Controller/RecordsController.php
@@ -51,7 +51,7 @@ class RecordsController extends BaseController
/**
* Bypass the single record handling of the parent method when printing
- * @return bool|mixed|\VuFind\Controller\ViewModel|\Zend\View\Model\ViewModel
+ * @return bool|mixed|\VuFind\Controller\ViewModel|\Laminas\View\Model\ViewModel
*/
public function homeAction()
{
@@ -71,7 +71,7 @@ class RecordsController extends BaseController
* @see \VuFind\Controller\AbstractSearch::processJumpTo()
*
* @param \VuFind\Search\Base\Results $results
- * @return bool|\Zend\Http\Response|\Zend\View\Model\ViewModel
+ * @return bool|\Laminas\Http\Response|\Laminas\View\Model\ViewModel
*/
public function processJumpTo($results)
{
diff --git a/module/finc/src/finc/Cover/Router.php b/module/finc/src/finc/Cover/Router.php
index 700b5c34c09..760d69e3a12 100644
--- a/module/finc/src/finc/Cover/Router.php
+++ b/module/finc/src/finc/Cover/Router.php
@@ -41,7 +41,7 @@ use VuFind\RecordDriver\AbstractBase as RecordDriver;
* @link https://vufind.org/wiki/configuration:external_content Wiki
*/
// Add "extends \VuFind\Cover\Router" to prevent "Whoops" error - #18898 - HR
-class Router extends \VuFind\Cover\Router implements \Zend\Log\LoggerAwareInterface
+class Router extends \VuFind\Cover\Router implements \Laminas\Log\LoggerAwareInterface
{
use \VuFind\Log\LoggerAwareTrait;
diff --git a/module/finc/src/finc/Cover/RouterFactory.php b/module/finc/src/finc/Cover/RouterFactory.php
index 95b59b8df5c..1c6b62a6f20 100644
--- a/module/finc/src/finc/Cover/RouterFactory.php
+++ b/module/finc/src/finc/Cover/RouterFactory.php
@@ -28,7 +28,7 @@
namespace finc\Cover;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* Cover router factory.
diff --git a/module/finc/src/finc/Form/View/Helper/FormLabel.php b/module/finc/src/finc/Form/View/Helper/FormLabel.php
index 058f46dd758..131bda4d327 100644
--- a/module/finc/src/finc/Form/View/Helper/FormLabel.php
+++ b/module/finc/src/finc/Form/View/Helper/FormLabel.php
@@ -22,8 +22,8 @@
namespace finc\Form\View\Helper;
-use Zend\Form\Element;
-use Zend\Form\View\Helper\FormLabel as Base;
+use Laminas\Form\Element;
+use Laminas\Form\View\Helper\FormLabel as Base;
class FormLabel extends Base
{
diff --git a/module/finc/src/finc/Hierarchy/TreeRenderer/JSTree.php b/module/finc/src/finc/Hierarchy/TreeRenderer/JSTree.php
index 33089995cb3..16364aac71a 100644
--- a/module/finc/src/finc/Hierarchy/TreeRenderer/JSTree.php
+++ b/module/finc/src/finc/Hierarchy/TreeRenderer/JSTree.php
@@ -27,7 +27,7 @@
*/
namespace finc\Hierarchy\TreeRenderer;
-use Zend\Config\Config;
+use Laminas\Config\Config;
/**
* Hierarchy Tree Renderer
diff --git a/module/finc/src/finc/Hierarchy/TreeRenderer/JSTreeDelegatorFactory.php b/module/finc/src/finc/Hierarchy/TreeRenderer/JSTreeDelegatorFactory.php
index 96e506c1540..a19b5c90cbd 100644
--- a/module/finc/src/finc/Hierarchy/TreeRenderer/JSTreeDelegatorFactory.php
+++ b/module/finc/src/finc/Hierarchy/TreeRenderer/JSTreeDelegatorFactory.php
@@ -31,7 +31,7 @@
namespace finc\Hierarchy\TreeRenderer;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
/**
* JSTree Delegator Factory
diff --git a/module/finc/src/finc/I18n/Translator/ZendI18nResourcesInjector.php b/module/finc/src/finc/I18n/Translator/ZendI18nResourcesInjector.php
index f9b7b898402..af8fdc103e7 100644
--- a/module/finc/src/finc/I18n/Translator/ZendI18nResourcesInjector.php
+++ b/module/finc/src/finc/I18n/Translator/ZendI18nResourcesInjector.php
@@ -22,7 +22,7 @@
namespace finc\I18n\Translator;
use Psr\Container\ContainerInterface;
-use Zend\I18n\Translator\Resources;
+use Laminas\I18n\Translator\Resources;
class ZendI18nResourcesInjector
{
diff --git a/module/finc/src/finc/ILS/Driver/FincILS.php b/module/finc/src/finc/ILS/Driver/FincILS.php
index 169b8f021ea..a6f07f7ca54 100644
--- a/module/finc/src/finc/ILS/Driver/FincILS.php
+++ b/module/finc/src/finc/ILS/Driver/FincILS.php
@@ -35,7 +35,7 @@ use Herrera\Json\Exception\Exception;
use Sabre\VObject;
use VuFind\Exception\ILS as ILSException;
use VuFindSearch\Service as SearchService;
-use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
+use Laminas\Log\LoggerAwareInterface as LoggerAwareInterface;
/**
@@ -152,7 +152,7 @@ class FincILS extends PAIA implements LoggerAwareInterface
/**
* Main Config
*
- * @var null|\Zend\Config\Config
+ * @var null|\Laminas\Config\Config
*/
protected $mainConfig;
@@ -174,7 +174,7 @@ class FincILS extends PAIA implements LoggerAwareInterface
* Constructor
*
* @param \VuFind\Date\Converter $converter Date converter
- * @param \Zend\Session\SessionManager $sessionManager Record loader
+ * @param \Laminas\Session\SessionManager $sessionManager Record loader
* @param \VuFind\Record\Loader $loader VuFind main configuration
* (omit for built-in defaults)
* @param SearchService $ss Search Service
@@ -183,7 +183,7 @@ class FincILS extends PAIA implements LoggerAwareInterface
*/
public function __construct(
\VuFind\Date\Converter $converter,
- \Zend\Session\SessionManager $sessionManager,
+ \Laminas\Session\SessionManager $sessionManager,
\VuFind\Record\Loader $loader,
SearchService $ss,
$mainConfig = null,
diff --git a/module/finc/src/finc/ILS/Driver/FincILSFactory.php b/module/finc/src/finc/ILS/Driver/FincILSFactory.php
index 0b34cc7ebff..fdcb1f2d14c 100644
--- a/module/finc/src/finc/ILS/Driver/FincILSFactory.php
+++ b/module/finc/src/finc/ILS/Driver/FincILSFactory.php
@@ -29,7 +29,7 @@
namespace finc\ILS\Driver;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* FincILS Factory Class
diff --git a/module/finc/src/finc/ILS/Driver/PAIA.php b/module/finc/src/finc/ILS/Driver/PAIA.php
index ccdf2d1f776..f14a04e48b3 100644
--- a/module/finc/src/finc/ILS/Driver/PAIA.php
+++ b/module/finc/src/finc/ILS/Driver/PAIA.php
@@ -81,11 +81,11 @@ class PAIA extends \VuFind\ILS\Driver\PAIA
* Constructor
*
* @param \VuFind\Date\Converter $converter Date converter
- * @param \Zend\Session\SessionManager $sessionManager Session Manager
+ * @param \Laminas\Session\SessionManager $sessionManager Session Manager
*/
public function __construct(
\VuFind\Date\Converter $converter,
- \Zend\Session\SessionManager $sessionManager
+ \Laminas\Session\SessionManager $sessionManager
) {
parent::__construct($converter, $sessionManager);
$this->sessionManager = $sessionManager;
@@ -1639,7 +1639,7 @@ class PAIA extends \VuFind\ILS\Driver\PAIA
try {
$client = $this->httpService->createClient(
$this->paiaURL . $file,
- \Zend\Http\Request::METHOD_DELETE,
+ \Laminas\Http\Request::METHOD_DELETE,
$this->paiaTimeout
);
$client->setHeaders($http_headers);
diff --git a/module/finc/src/finc/ILS/Driver/PAIAFactory.php b/module/finc/src/finc/ILS/Driver/PAIAFactory.php
index f4fdb0a8e87..205851ee09b 100644
--- a/module/finc/src/finc/ILS/Driver/PAIAFactory.php
+++ b/module/finc/src/finc/ILS/Driver/PAIAFactory.php
@@ -29,7 +29,7 @@
namespace finc\ILS\Driver;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* PAIA Factory Class
diff --git a/module/finc/src/finc/ILS/Driver/StaticStatusRulesDelegatorFactory.php b/module/finc/src/finc/ILS/Driver/StaticStatusRulesDelegatorFactory.php
index ffc988c2d4f..e6e89d66d82 100644
--- a/module/finc/src/finc/ILS/Driver/StaticStatusRulesDelegatorFactory.php
+++ b/module/finc/src/finc/ILS/Driver/StaticStatusRulesDelegatorFactory.php
@@ -34,9 +34,9 @@ use Interop\Container\ContainerInterface;
use VuFindSearch\Query\Query;
use VuFindSearch\Query\QueryGroup;
use VuFindSearch\Service as SearchService;
-use Zend\Config\Config;
-use Zend\EventManager\EventInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\Config\Config;
+use Laminas\EventManager\EventInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
/**
* Munger Injection Factory
diff --git a/module/finc/src/finc/Listener/I18nDataDirListener.php b/module/finc/src/finc/Listener/I18nDataDirListener.php
index 0a9e17befc4..f58ef6edb48 100644
--- a/module/finc/src/finc/Listener/I18nDataDirListener.php
+++ b/module/finc/src/finc/Listener/I18nDataDirListener.php
@@ -24,10 +24,10 @@
namespace finc\Listener;
use Symfony\Component\Filesystem\Filesystem;
-use Zend\EventManager\AbstractListenerAggregate;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Mvc\I18n\Translator;
-use Zend\Mvc\MvcEvent;
+use Laminas\EventManager\AbstractListenerAggregate;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\Mvc\I18n\Translator;
+use Laminas\Mvc\MvcEvent;
class I18nDataDirListener extends AbstractListenerAggregate
{
diff --git a/module/finc/src/finc/Mailer/Mailer.php b/module/finc/src/finc/Mailer/Mailer.php
index d46e43b740e..cbd1f75efca 100644
--- a/module/finc/src/finc/Mailer/Mailer.php
+++ b/module/finc/src/finc/Mailer/Mailer.php
@@ -28,12 +28,12 @@
namespace finc\Mailer;
use VuFind\Exception\Mail as MailException;
-use Zend\Mail\Address;
-use Zend\Mail\AddressList;
-use Zend\Mail\Message;
-use Zend\Mime\Message as MimeMessage;
-use Zend\Mime\Part as MimePart;
-use Zend\Mime as Mime;
+use Laminas\Mail\Address;
+use Laminas\Mail\AddressList;
+use Laminas\Mail\Message;
+use Laminas\Mime\Message as MimeMessage;
+use Laminas\Mime\Part as MimePart;
+use Laminas\Mime as Mime;
/**
* VuFind Mailer Class
@@ -91,7 +91,7 @@ class Mailer extends \VuFind\Mailer\Mailer
}
// Validate email addresses:
- $validator = new \Zend\Validator\EmailAddress();
+ $validator = new \Laminas\Validator\EmailAddress();
if (count($recipients) == 0) {
throw new MailException('Invalid Recipient Email Address');
}
diff --git a/module/finc/src/finc/Recommend/EbscoResults.php b/module/finc/src/finc/Recommend/EbscoResults.php
index 5db3a26577a..64d6610c20c 100644
--- a/module/finc/src/finc/Recommend/EbscoResults.php
+++ b/module/finc/src/finc/Recommend/EbscoResults.php
@@ -44,7 +44,7 @@ namespace finc\Recommend;
class EbscoResults implements
\VuFind\Recommend\RecommendInterface,
\VuFindHttp\HttpServiceAwareInterface,
- \Zend\Log\LoggerAwareInterface
+ \Laminas\Log\LoggerAwareInterface
{
use \VuFind\Log\LoggerAwareTrait;
use \VuFindHttp\HttpServiceAwareTrait;
@@ -121,7 +121,7 @@ class EbscoResults implements
* be needed.
*
* @param \VuFind\Search\Base\Params $params Search parameter object
- * @param \Zend\StdLib\Parameters $request Parameter object representing user
+ * @param \Laminas\StdLib\Parameters $request Parameter object representing user
* request.
*
* @return void
@@ -180,7 +180,7 @@ class EbscoResults implements
*
* @param string $url URL for client to use
*
- * @return \Zend\Http\Client
+ * @return \Laminas\Http\Client
* @throws \Exception Http service missing.
*/
protected function getHttpClient($url)
diff --git a/module/finc/src/finc/Recommend/EbscoResultsFactory.php b/module/finc/src/finc/Recommend/EbscoResultsFactory.php
index 8930ec5af3c..2bc998a1f05 100644
--- a/module/finc/src/finc/Recommend/EbscoResultsFactory.php
+++ b/module/finc/src/finc/Recommend/EbscoResultsFactory.php
@@ -29,7 +29,7 @@ namespace finc\Recommend;
use finc\Recommend\EbscoResults;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* EbscoResults Factory Class
diff --git a/module/finc/src/finc/Recommend/InterlibraryLoan.php b/module/finc/src/finc/Recommend/InterlibraryLoan.php
index 55e29021407..7adc7cdadd8 100644
--- a/module/finc/src/finc/Recommend/InterlibraryLoan.php
+++ b/module/finc/src/finc/Recommend/InterlibraryLoan.php
@@ -67,7 +67,7 @@ class InterlibraryLoan implements RecommendInterface
* be needed.
*
* @param \VuFind\Search\Base\Params $params Search parameter object
- * @param \Zend\StdLib\Parameters $request Parameter object representing user
+ * @param \Laminas\StdLib\Parameters $request Parameter object representing user
* request.
*
* @return void
diff --git a/module/finc/src/finc/RecordDriver/SolrDefault.php b/module/finc/src/finc/RecordDriver/SolrDefault.php
index 6453db75379..8921a90c8bb 100644
--- a/module/finc/src/finc/RecordDriver/SolrDefault.php
+++ b/module/finc/src/finc/RecordDriver/SolrDefault.php
@@ -31,7 +31,7 @@
*/
namespace finc\RecordDriver;
-use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
+use Laminas\Log\LoggerAwareInterface as LoggerAwareInterface;
/**
* finc specific model for Solr records based on the stock
@@ -73,11 +73,11 @@ class SolrDefault extends \VuFind\RecordDriver\SolrDefault implements
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit for
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit for
* built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration file
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration file
* (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration file
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration file
*/
public function __construct(
$mainConfig = null,
diff --git a/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php b/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php
index c52d57ee2e0..3b4b6a6330d 100644
--- a/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php
+++ b/module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php
@@ -34,7 +34,7 @@ namespace finc\RecordDriver;
use VuFind\RecordDriver\Response\PublicationDetails as PublicationDetails;
use VuFindSearch\Query\Query as Query;
-use Zend\Config\Config;
+use Laminas\Config\Config;
/**
* finc specific model for Solr records based on the stock
diff --git a/module/finc/src/finc/RecordDriver/SolrDico.php b/module/finc/src/finc/RecordDriver/SolrDico.php
index f534a67a14f..1c953aab31f 100644
--- a/module/finc/src/finc/RecordDriver/SolrDico.php
+++ b/module/finc/src/finc/RecordDriver/SolrDico.php
@@ -48,11 +48,11 @@ class SolrDico extends SolrDefault
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit
* for built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration
* file (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration
* file
*/
public function __construct($mainConfig = null, $recordConfig = null, $searchSettings = null)
diff --git a/module/finc/src/finc/RecordDriver/SolrLido.php b/module/finc/src/finc/RecordDriver/SolrLido.php
index 9cbcc26fb5a..af98b581eb4 100644
--- a/module/finc/src/finc/RecordDriver/SolrLido.php
+++ b/module/finc/src/finc/RecordDriver/SolrLido.php
@@ -50,11 +50,11 @@ class SolrLido extends SolrLidoNdl
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit
* for built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration
* file (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration
* file
* @param \VuFind\Date\Converter $dateConverter Date Converter
*/
diff --git a/module/finc/src/finc/RecordDriver/SolrLidoNdl.php b/module/finc/src/finc/RecordDriver/SolrLidoNdl.php
index 82393c5c10a..a27630de41d 100644
--- a/module/finc/src/finc/RecordDriver/SolrLidoNdl.php
+++ b/module/finc/src/finc/RecordDriver/SolrLidoNdl.php
@@ -57,11 +57,11 @@ class SolrLidoNdl extends \finc\RecordDriver\SolrDefault
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit
* for built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration
* file (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration
* file
* @param \VuFind\Date\Converter $dateConverter Date Converter
*/
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcFinc.php b/module/finc/src/finc/RecordDriver/SolrMarcFinc.php
index e619a542201..28cf93bcbe8 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcFinc.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcFinc.php
@@ -70,11 +70,11 @@ class SolrMarcFinc extends SolrMarc
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit for
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit for
* built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration file
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration file
* (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration file
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration file
*/
public function __construct(
$mainConfig = null,
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcRemote.php b/module/finc/src/finc/RecordDriver/SolrMarcRemote.php
index 4ad52ee2192..e65c0e2ed5e 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcRemote.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcRemote.php
@@ -31,7 +31,7 @@
namespace finc\RecordDriver;
use VuFindHttp\HttpServiceAwareInterface as HttpServiceAwareInterface;
-use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
+use Laminas\Log\LoggerAwareInterface as LoggerAwareInterface;
/**
* Model for MARC records without a fullrecord in Solr. The fullrecord is being
@@ -63,11 +63,11 @@ class SolrMarcRemote extends SolrMarc implements
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit for
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit for
* built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration file
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration file
* (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration file
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration file
*
* @throws \Exception
*/
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcRemoteFinc.php b/module/finc/src/finc/RecordDriver/SolrMarcRemoteFinc.php
index 4253a456144..1597dbce9b4 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcRemoteFinc.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcRemoteFinc.php
@@ -67,11 +67,11 @@ class SolrMarcRemoteFinc extends SolrMarcRemote
/**
* Constructor
*
- * @param \Zend\Config\Config $mainConfig VuFind main configuration (omit for
+ * @param \Laminas\Config\Config $mainConfig VuFind main configuration (omit for
* built-in defaults)
- * @param \Zend\Config\Config $recordConfig Record-specific configuration file
+ * @param \Laminas\Config\Config $recordConfig Record-specific configuration file
* (omit to use $mainConfig as $recordConfig)
- * @param \Zend\Config\Config $searchSettings Search-specific configuration file
+ * @param \Laminas\Config\Config $searchSettings Search-specific configuration file
*/
public function __construct(
$mainConfig = null,
diff --git a/module/finc/src/finc/RecordTab/HierarchyTreeFactory.php b/module/finc/src/finc/RecordTab/HierarchyTreeFactory.php
index 7c2b1c7672f..ed58f9079d0 100644
--- a/module/finc/src/finc/RecordTab/HierarchyTreeFactory.php
+++ b/module/finc/src/finc/RecordTab/HierarchyTreeFactory.php
@@ -28,7 +28,7 @@
*/
namespace finc\RecordTab;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\ServiceManager;
/**
* Record Tab Invokable Factory Class
diff --git a/module/finc/src/finc/Resolver/Driver/Ezb.php b/module/finc/src/finc/Resolver/Driver/Ezb.php
index bba6b82fe53..51fcbceecf2 100644
--- a/module/finc/src/finc/Resolver/Driver/Ezb.php
+++ b/module/finc/src/finc/Resolver/Driver/Ezb.php
@@ -66,14 +66,14 @@ class Ezb extends Base implements TranslatorAwareInterface
/**
* Resolver configuration
*
- * @var \Zend\Config\Resolver $resolver
+ * @var \Laminas\Config\Resolver $resolver
*/
protected $config;
/**
* HTTP client
*
- * @var \Zend\Http\Client
+ * @var \Laminas\Http\Client
*/
protected $httpClient;
@@ -128,9 +128,9 @@ class Ezb extends Base implements TranslatorAwareInterface
* Constructor
*
* @param string $config ezb configuration
- * @param \Zend\Http\Client $httpClient HTTP client
+ * @param \Laminas\Http\Client $httpClient HTTP client
*/
- public function __construct($config, \Zend\Http\Client $httpClient)
+ public function __construct($config, \Laminas\Http\Client $httpClient)
{
$this->baseUrl = $config->url;
$this->httpClient = $httpClient;
diff --git a/module/finc/src/finc/Resolver/Driver/FincResolverDriverFactory.php b/module/finc/src/finc/Resolver/Driver/FincResolverDriverFactory.php
index c57fb6595b8..c6c3dc79be2 100644
--- a/module/finc/src/finc/Resolver/Driver/FincResolverDriverFactory.php
+++ b/module/finc/src/finc/Resolver/Driver/FincResolverDriverFactory.php
@@ -23,8 +23,8 @@
namespace finc\Resolver\Driver;
use VuFind\Resolver\Driver\DriverInterface;
-use Zend\Config\Config;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\Config\Config;
+use Laminas\ServiceManager\Factory\FactoryInterface;
use Interop\Container\ContainerInterface;
class FincResolverDriverFactory implements FactoryInterface
diff --git a/module/finc/src/finc/Rewrite/EblRewriteFactory.php b/module/finc/src/finc/Rewrite/EblRewriteFactory.php
index bd3718f87f5..dacd164cc3c 100644
--- a/module/finc/src/finc/Rewrite/EblRewriteFactory.php
+++ b/module/finc/src/finc/Rewrite/EblRewriteFactory.php
@@ -30,9 +30,9 @@ namespace finc\Rewrite;
use Interop\Container\ContainerInterface;
use Interop\Container\Exception\ContainerException;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
+use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* Factory for instantiating Rewrite objects
diff --git a/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php b/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php
index 31a8ab74d21..0c434ce8caa 100644
--- a/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php
+++ b/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php
@@ -28,8 +28,8 @@
namespace finc\Role\PermissionProvider;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\ServiceManager;
/**
* Permission Provider Factory Class
diff --git a/module/finc/src/finc/Role/PermissionProvider/IpRangeFoForFactory.php b/module/finc/src/finc/Role/PermissionProvider/IpRangeFoForFactory.php
index c8c3127c40b..d29a348c76a 100644
--- a/module/finc/src/finc/Role/PermissionProvider/IpRangeFoForFactory.php
+++ b/module/finc/src/finc/Role/PermissionProvider/IpRangeFoForFactory.php
@@ -28,8 +28,8 @@
namespace finc\Role\PermissionProvider;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\ServiceManager;
/**
* IpRangeFoFor Factory Class
diff --git a/module/finc/src/finc/Role/PermissionProvider/IpRangeRealFactory.php b/module/finc/src/finc/Role/PermissionProvider/IpRangeRealFactory.php
index f5c90a936de..947ce4f2b90 100644
--- a/module/finc/src/finc/Role/PermissionProvider/IpRangeRealFactory.php
+++ b/module/finc/src/finc/Role/PermissionProvider/IpRangeRealFactory.php
@@ -28,8 +28,8 @@
namespace finc\Role\PermissionProvider;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\ServiceManager;
/**
* IpRangeReal Factory Class
diff --git a/module/finc/src/finc/Role/PermissionProvider/IpRegExFoForFactory.php b/module/finc/src/finc/Role/PermissionProvider/IpRegExFoForFactory.php
index 651a6167bac..06c261aca36 100644
--- a/module/finc/src/finc/Role/PermissionProvider/IpRegExFoForFactory.php
+++ b/module/finc/src/finc/Role/PermissionProvider/IpRegExFoForFactory.php
@@ -28,8 +28,8 @@
namespace finc\Role\PermissionProvider;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\ServiceManager;
/**
* IpRegExFoFor Factory Class
diff --git a/module/finc/src/finc/Role/PermissionProvider/IpRegExRealFactory.php b/module/finc/src/finc/Role/PermissionProvider/IpRegExRealFactory.php
index 883971b944e..4c6f5368105 100644
--- a/module/finc/src/finc/Role/PermissionProvider/IpRegExRealFactory.php
+++ b/module/finc/src/finc/Role/PermissionProvider/IpRegExRealFactory.php
@@ -28,8 +28,8 @@
namespace finc\Role\PermissionProvider;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\ServiceManager;
/**
* IpRegExReal Factory Class
diff --git a/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php b/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php
index a7e35943f00..ff739670b13 100644
--- a/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php
+++ b/module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php
@@ -34,9 +34,9 @@ use Interop\Container\ContainerInterface;
use VuFindSearch\Query\Query;
use VuFindSearch\Query\QueryGroup;
use VuFindSearch\Service as SearchService;
-use Zend\Config\Config;
-use Zend\EventManager\EventInterface;
-use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+use Laminas\Config\Config;
+use Laminas\EventManager\EventInterface;
+use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
/**
* Munger Injection Factory
diff --git a/module/finc/src/finc/View/Helper/Root/BranchInfo.php b/module/finc/src/finc/View/Helper/Root/BranchInfo.php
index ef3da92196c..4ed9132e1c3 100644
--- a/module/finc/src/finc/View/Helper/Root/BranchInfo.php
+++ b/module/finc/src/finc/View/Helper/Root/BranchInfo.php
@@ -28,8 +28,8 @@
namespace finc\View\Helper\Root;
use finc\Config\BranchesReader;
-use Zend\View\Helper\AbstractHelper;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\View\Helper\AbstractHelper;
+use Laminas\ServiceManager\ServiceLocatorInterface;
/**
* Branch info view helper
diff --git a/module/finc/src/finc/View/Helper/Root/BranchInfoViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/BranchInfoViewHelperFactory.php
index d69e56bb37f..53ddd899b72 100644
--- a/module/finc/src/finc/View/Helper/Root/BranchInfoViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/BranchInfoViewHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/CitationViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/CitationViewHelperFactory.php
index 17aa0ee617f..0c379930aee 100644
--- a/module/finc/src/finc/View/Helper/Root/CitationViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/CitationViewHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/EnhancedRenderArray.php b/module/finc/src/finc/View/Helper/Root/EnhancedRenderArray.php
index 3979230f556..2cebac89438 100644
--- a/module/finc/src/finc/View/Helper/Root/EnhancedRenderArray.php
+++ b/module/finc/src/finc/View/Helper/Root/EnhancedRenderArray.php
@@ -28,7 +28,7 @@
*/
namespace finc\View\Helper\Root;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
/**
* View helper to render a portion of an array.
diff --git a/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php b/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php
index 3218af2a610..0801b7314a4 100644
--- a/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php
+++ b/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php
@@ -36,12 +36,12 @@ namespace finc\View\Helper\Root;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*/
-class ExternalCatalogueLink extends \Zend\View\Helper\AbstractHelper
+class ExternalCatalogueLink extends \Laminas\View\Helper\AbstractHelper
{
/**
* VuFind configuration
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $config;
@@ -55,7 +55,7 @@ class ExternalCatalogueLink extends \Zend\View\Helper\AbstractHelper
/**
* External Access configuration
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $extCatConf;
@@ -69,7 +69,7 @@ class ExternalCatalogueLink extends \Zend\View\Helper\AbstractHelper
/**
* Constructor
*
- * @param \Zend\Config\Config $config VuFind configuration
+ * @param \Laminas\Config\Config $config VuFind configuration
* @param array $extCatConf External catalogue link configuration
*/
public function __construct(
diff --git a/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLinkHelperFactory.php b/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLinkHelperFactory.php
index 04ff87339c4..13e72eebaf8 100644
--- a/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLinkHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLinkHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/ExternalLink.php b/module/finc/src/finc/View/Helper/Root/ExternalLink.php
index 6bfbb6de3cc..5d437f73fd7 100644
--- a/module/finc/src/finc/View/Helper/Root/ExternalLink.php
+++ b/module/finc/src/finc/View/Helper/Root/ExternalLink.php
@@ -27,8 +27,8 @@
*/
namespace finc\View\Helper\Root;
-use Zend\View\Helper\EscapeHtml;
-use Zend\View\Helper\EscapeHtmlAttr;
+use Laminas\View\Helper\EscapeHtml;
+use Laminas\View\Helper\EscapeHtmlAttr;
/**
* External link view helper
@@ -39,7 +39,7 @@ use Zend\View\Helper\EscapeHtmlAttr;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*/
-class ExternalLink extends \Zend\View\Helper\AbstractHelper
+class ExternalLink extends \Laminas\View\Helper\AbstractHelper
{
/**
* Default html attributes for external links
diff --git a/module/finc/src/finc/View/Helper/Root/InterlibraryLoanLink.php b/module/finc/src/finc/View/Helper/Root/InterlibraryLoanLink.php
index aa640023af7..3e8a5d3ff29 100644
--- a/module/finc/src/finc/View/Helper/Root/InterlibraryLoanLink.php
+++ b/module/finc/src/finc/View/Helper/Root/InterlibraryLoanLink.php
@@ -27,7 +27,7 @@
*/
namespace finc\View\Helper\Root;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
/**
* Record link view helper
diff --git a/module/finc/src/finc/View/Helper/Root/OpenUrl.php b/module/finc/src/finc/View/Helper/Root/OpenUrl.php
index d5edf896fbd..4edd2e0ce70 100644
--- a/module/finc/src/finc/View/Helper/Root/OpenUrl.php
+++ b/module/finc/src/finc/View/Helper/Root/OpenUrl.php
@@ -39,7 +39,7 @@ use finc\Resolver\Driver\Redi;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*/
-class OpenUrl extends \Zend\View\Helper\AbstractHelper
+class OpenUrl extends \Laminas\View\Helper\AbstractHelper
{
/**
* Context helper
@@ -51,7 +51,7 @@ class OpenUrl extends \Zend\View\Helper\AbstractHelper
/**
* VuFind OpenURL configuration
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $config;
@@ -110,7 +110,7 @@ class OpenUrl extends \Zend\View\Helper\AbstractHelper
*
* @param \VuFind\View\Helper\Root\Context $context Context helper
* @param array $openUrlRules VuFind OpenURL rules
- * @param \Zend\Config\Config $config VuFind OpenURL config
+ * @param \Laminas\Config\Config $config VuFind OpenURL config
*/
public function __construct(
\VuFind\View\Helper\Root\Context $context,
diff --git a/module/finc/src/finc/View/Helper/Root/OpenUrlViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/OpenUrlViewHelperFactory.php
index ce4b4efaf00..7d70632a50c 100644
--- a/module/finc/src/finc/View/Helper/Root/OpenUrlViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/OpenUrlViewHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/Permission.php b/module/finc/src/finc/View/Helper/Root/Permission.php
index 1186717e4a7..0dafe119f55 100644
--- a/module/finc/src/finc/View/Helper/Root/Permission.php
+++ b/module/finc/src/finc/View/Helper/Root/Permission.php
@@ -36,7 +36,7 @@ namespace finc\View\Helper\Root;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*/
-class Permission extends \Zend\View\Helper\AbstractHelper
+class Permission extends \Laminas\View\Helper\AbstractHelper
{
/**
* Authentication manager
diff --git a/module/finc/src/finc/View/Helper/Root/PermissionViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/PermissionViewHelperFactory.php
index a47259af414..a2b6d31504a 100644
--- a/module/finc/src/finc/View/Helper/Root/PermissionViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/PermissionViewHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/Record.php b/module/finc/src/finc/View/Helper/Root/Record.php
index c7117e000c2..2d5c009f4de 100644
--- a/module/finc/src/finc/View/Helper/Root/Record.php
+++ b/module/finc/src/finc/View/Helper/Root/Record.php
@@ -43,7 +43,7 @@ class Record extends \VuFind\View\Helper\Root\Record
/**
* VuFind configuration
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $config;
@@ -57,7 +57,7 @@ class Record extends \VuFind\View\Helper\Root\Record
/**
* URL helper
*
- * @var \Zend\View\Helper\Url
+ * @var \Laminas\View\Helper\Url
*/
protected $url;
@@ -71,14 +71,14 @@ class Record extends \VuFind\View\Helper\Root\Record
/**
* Resolver configuration
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $resolverConfig;
/**
* Mapping for facets on style based icons
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $iconConfig;
@@ -117,8 +117,8 @@ class Record extends \VuFind\View\Helper\Root\Record
/**
* Constructor
*
- * @param \Zend\Config\Config $config VuFind configuration
- * @param \Zend\View\Helper\Url $helper URL helper
+ * @param \Laminas\Config\Config $config VuFind configuration
+ * @param \Laminas\View\Helper\Url $helper URL helper
* @param \VuFind\Auth\Manager $manager AuthManager
* @param mixed $rewrite Ebl rewrite service for VuFind
* @param mixed $resolverConfig Resolver.ini
@@ -126,7 +126,7 @@ class Record extends \VuFind\View\Helper\Root\Record
*/
public function __construct(
$config,
- \Zend\View\Helper\Url $helper,
+ \Laminas\View\Helper\Url $helper,
\VuFind\Auth\Manager $manager,
$rewrite,
$resolverConfig,
diff --git a/module/finc/src/finc/View/Helper/Root/RecordLinkViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/RecordLinkViewHelperFactory.php
index a2ba78abb7b..bddebb92aef 100644
--- a/module/finc/src/finc/View/Helper/Root/RecordLinkViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/RecordLinkViewHelperFactory.php
@@ -29,7 +29,7 @@ namespace finc\View\Helper\Root;
use finc\Rewrite\EblRewrite;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/RecordViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/RecordViewHelperFactory.php
index 947e063b1da..fdc13c9a2cf 100644
--- a/module/finc/src/finc/View/Helper/Root/RecordViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/RecordViewHelperFactory.php
@@ -29,7 +29,7 @@ namespace finc\View\Helper\Root;
use finc\Rewrite\EblRewrite;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/ResultFeed.php b/module/finc/src/finc/View/Helper/Root/ResultFeed.php
index 26b9fdb2409..c0faee32a80 100644
--- a/module/finc/src/finc/View/Helper/Root/ResultFeed.php
+++ b/module/finc/src/finc/View/Helper/Root/ResultFeed.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use DateTime;
-use Zend\Feed\Writer\Feed;
+use Laminas\Feed\Writer\Feed;
/**
* "Results as feed" view helper
@@ -66,7 +66,7 @@ class ResultFeed extends \VuFind\View\Helper\Root\ResultFeed
$recordLink = $this->getView()->plugin('recordLink');
try {
$url = $serverUrl($recordLink->getUrl($record));
- } catch (\Zend\Mvc\Router\Exception\RuntimeException $e) {
+ } catch (\Laminas\Mvc\Router\Exception\RuntimeException $e) {
// No route defined? See if we can get a URL out of the driver.
// Useful for web results, among other things.
$url = $record->tryMethod('getUrl');
diff --git a/module/finc/src/finc/View/Helper/Root/SideFacet.php b/module/finc/src/finc/View/Helper/Root/SideFacet.php
index 6bcabed6194..b42b51a2935 100644
--- a/module/finc/src/finc/View/Helper/Root/SideFacet.php
+++ b/module/finc/src/finc/View/Helper/Root/SideFacet.php
@@ -29,7 +29,7 @@
*/
namespace finc\View\Helper\Root;
-use Zend\View\Helper\AbstractHelper;
+use Laminas\View\Helper\AbstractHelper;
/**
* Permissions view helper
@@ -46,7 +46,7 @@ class SideFacet extends AbstractHelper
/**
* VuFind configuration
*
- * @var \Zend\Config\Config
+ * @var \Laminas\Config\Config
*/
protected $config;
@@ -60,7 +60,7 @@ class SideFacet extends AbstractHelper
/**
* Constructor
*
- * @param \Zend\Config\Config $config VuFind configuration
+ * @param \Laminas\Config\Config $config VuFind configuration
*/
public function __construct($config = null)
{
diff --git a/module/finc/src/finc/View/Helper/Root/SideFacetViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/SideFacetViewHelperFactory.php
index a3d7b49aaa3..1ab35c112fc 100644
--- a/module/finc/src/finc/View/Helper/Root/SideFacetViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/SideFacetViewHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
diff --git a/module/finc/src/finc/View/Helper/Root/ViewHelperFactory.php b/module/finc/src/finc/View/Helper/Root/ViewHelperFactory.php
index 5dcc8455240..b5d054975f3 100644
--- a/module/finc/src/finc/View/Helper/Root/ViewHelperFactory.php
+++ b/module/finc/src/finc/View/Helper/Root/ViewHelperFactory.php
@@ -28,7 +28,7 @@
namespace finc\View\Helper\Root;
use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
/**
* ViewHelper Factory Class
--
GitLab