refs #22747 [finc] Zend becomes Laminas

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' => [

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

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

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

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;

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.

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

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

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

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

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
             );

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.

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).

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'),

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

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()
     {

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
 {

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()

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
 {

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     : '';