Merge pull request #2 from qcovery/vufind9

Vufind9
qcovery · Mar 5, 2024 · 4695024 · 4695024
2 parents ac2fef2 + 70b8ff2
commit 4695024
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 348 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Module.php b/Module.php
@@ -26,8 +26,8 @@
  * @link     https://github.com/dmj/vf2-proxy
  */
 namespace DAIAplus;
-use Zend\ModuleManager\ModuleManager,
-    Zend\Mvc\MvcEvent;
+use Laminas\ModuleManager\ModuleManager,
+    Laminas\Mvc\MvcEvent;
 
 /**
  * Template for ZF2 module for storing local overrides.
@@ -58,7 +58,7 @@ public function getConfig()
     public function getAutoloaderConfig()
     {
         return array(
-            'Zend\Loader\StandardAutoloader' => array(
+            'Laminas\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ),

diff --git a/composer.json b/composer.json
diff --git a/config/module.config.php b/config/module.config.php
@@ -4,15 +4,23 @@
 $config = [
     'service_manager' => [
         'allow_override' => true,
-        'factories' => [
-            'DAIAplus\AjaxHandler\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
-            'DAIAplus\ILS\Connection' => 'DAIAplus\ILS\ConnectionFactory',
-            'DAIAplus\ILS\Driver\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
-        ],
         'aliases' => [
-            'VuFind\AjaxHandler\PluginManager' => 'DAIAplus\AjaxHandler\PluginManager',
+            'daia' => 'DAIAplus\ILS\Driver\DAIA',
+            'getArticleStatuses' => 'DAIAplus\AjaxHandler\GetArticleStatuses',
+            'getArticleStatusesUW' => 'DAIAplus\AjaxHandler\GetArticleStatusesUW',
+            'getItemStatuses' => 'DAIAplus\AjaxHandler\GetItemStatuses',
+            'paia' => 'DAIAplus\ILS\Driver\PAIA',
             'VuFind\ILSConnection' => 'DAIAplus\ILS\Connection',
-            'VuFind\ILSDriverPluginManager' => 'DAIAplus\ILS\Driver\PluginManager',
+        ],
+        'factories' => [
+            'DAIAplus\ILS\Driver\DAIA' => 'DAIAplus\ILS\Driver\DriverWithDateConverterFactory',
+            'DAIAplus\ILS\Driver\PAIA' => 'DAIAplus\ILS\Driver\PAIAFactory',
+
+
+            'DAIAplus\ILS\Connection' => 'DAIAplus\ILS\ConnectionFactory',
+            'DAIAplus\AjaxHandler\GetArticleStatuses' => 'DAIAplus\AjaxHandler\GetArticleStatusesFactory',
+            'DAIAplus\AjaxHandler\GetArticleStatusesUW' => 'DAIAplus\AjaxHandler\GetArticleStatusesFactoryUW',
+            'DAIAplus\AjaxHandler\GetItemStatuses' => 'DAIAplus\AjaxHandler\GetItemStatusesFactory',
         ],
     ],
 ];

diff --git a/src/DAIAplus/AjaxHandler/GetArticleStatuses.php b/src/DAIAplus/AjaxHandler/GetArticleStatuses.php
@@ -32,8 +32,8 @@
 use VuFind\Record\Loader;
 use VuFind\AjaxHandler\AbstractBase;
 use VuFind\I18n\Translator\TranslatorAwareInterface;
-use Zend\Config\Config;
-use Zend\Mvc\Controller\Plugin\Params;
+use Laminas\Config\Config;
+use Laminas\Mvc\Controller\Plugin\Params;
 
 /**
  * "Get Item Status" AJAX handler

diff --git a/src/DAIAplus/AjaxHandler/GetArticleStatusesFactory.php b/src/DAIAplus/AjaxHandler/GetArticleStatusesFactory.php
@@ -38,7 +38,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class GetArticleStatusesFactory implements \Zend\ServiceManager\Factory\FactoryInterface
+class GetArticleStatusesFactory implements \Laminas\ServiceManager\Factory\FactoryInterface
 {
     /**
      * Create an object

diff --git a/src/DAIAplus/AjaxHandler/GetArticleStatusesFactoryUW.php b/src/DAIAplus/AjaxHandler/GetArticleStatusesFactoryUW.php
@@ -38,7 +38,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class GetArticleStatusesFactoryUW implements \Zend\ServiceManager\Factory\FactoryInterface
+class GetArticleStatusesFactoryUW implements \Laminas\ServiceManager\Factory\FactoryInterface
 {
     /**
      * Create an object

diff --git a/src/DAIAplus/AjaxHandler/GetArticleStatusesUW.php b/src/DAIAplus/AjaxHandler/GetArticleStatusesUW.php
@@ -32,8 +32,8 @@
 use VuFind\Record\Loader;
 use VuFind\AjaxHandler\AbstractBase;
 use VuFind\I18n\Translator\TranslatorAwareInterface;
-use Zend\Config\Config;
-use Zend\Mvc\Controller\Plugin\Params;
+use Laminas\Config\Config;
+use Laminas\Mvc\Controller\Plugin\Params;
 
 /**
  * "Get Item Status" AJAX handler

diff --git a/src/DAIAplus/AjaxHandler/GetItemStatuses.php b/src/DAIAplus/AjaxHandler/GetItemStatuses.php
@@ -35,9 +35,9 @@
 use VuFind\ILS\Logic\Holds;
 use VuFind\Session\Settings as SessionSettings;
 use VuFind\Crypt\HMAC;
-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 Item Status" AJAX handler

diff --git a/src/DAIAplus/AjaxHandler/GetItemStatusesFactory.php b/src/DAIAplus/AjaxHandler/GetItemStatusesFactory.php
@@ -38,7 +38,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class GetItemStatusesFactory implements \Zend\ServiceManager\Factory\FactoryInterface
+class GetItemStatusesFactory implements \Laminas\ServiceManager\Factory\FactoryInterface
 {
     /**
      * Create an object

diff --git a/src/DAIAplus/AjaxHandler/PluginManager.php b/src/DAIAplus/AjaxHandler/PluginManager.php
diff --git a/src/DAIAplus/ILS/Connection.php b/src/DAIAplus/ILS/Connection.php
@@ -34,7 +34,7 @@
 use VuFind\Exception\ILS as ILSException;
 use VuFind\I18n\Translator\TranslatorAwareInterface;
 use VuFind\ILS\Driver\DriverInterface;
-use Zend\Log\LoggerAwareInterface;
+use Laminas\Log\LoggerAwareInterface;
 
 /**
  * Catalog Connection Class

diff --git a/src/DAIAplus/ILS/ConnectionFactory.php b/src/DAIAplus/ILS/ConnectionFactory.php
@@ -28,7 +28,7 @@
 namespace DAIAplus\ILS;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 /**
  * ILS connection factory

diff --git a/src/DAIAplus/ILS/Driver/DAIA.php b/src/DAIAplus/ILS/Driver/DAIA.php
@@ -35,7 +35,7 @@
 use DOMDocument;
 use VuFind\Exception\ILS as ILSException;
 use VuFindHttp\HttpServiceAwareInterface as HttpServiceAwareInterface;
-use Zend\Log\LoggerAwareInterface as LoggerAwareInterface;
+use Laminas\Log\LoggerAwareInterface as LoggerAwareInterface;
 
 /**
  * ILS Driver for VuFind to query availability information via DAIA.

diff --git a/src/DAIAplus/ILS/Driver/PAIA.php b/src/DAIAplus/ILS/Driver/PAIA.php
diff --git a/src/DAIAplus/ILS/Driver/PAIAFactory.php b/src/DAIAplus/ILS/Driver/PAIAFactory.php
@@ -63,7 +63,7 @@ public function __invoke(ContainerInterface $container, $requestedName,
         }
         return parent::__invoke(
             $container, $requestedName,
-            [$container->get('Zend\Session\SessionManager')]
+            [$container->get('Laminas\Session\SessionManager')]
         );
     }
 }
diff --git a/src/DAIAplus/ILS/Driver/PluginFactory.php b/src/DAIAplus/ILS/Driver/PluginFactory.php