From 741500f358756f9f0d08b1e83ca018f5a725be9d Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 23 Aug 2012 14:45:41 -0400
Subject: [PATCH] Comment cleanup.

---
 module/VuFind/src/VuFind/Db/Row/UserList.php      | 5 ++---
 module/VuFind/src/VuFind/Db/Table/Resource.php    | 6 +++---
 module/VuFind/src/VuFind/Session/AbstractBase.php | 2 +-
 module/VuFind/src/VuFind/Session/Database.php     | 2 +-
 module/VuFind/src/VuFind/Session/File.php         | 2 +-
 module/VuFind/src/VuFind/Session/Memcache.php     | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/module/VuFind/src/VuFind/Db/Row/UserList.php b/module/VuFind/src/VuFind/Db/Row/UserList.php
index f5cd5ef6f5c..319e931e970 100644
--- a/module/VuFind/src/VuFind/Db/Row/UserList.php
+++ b/module/VuFind/src/VuFind/Db/Row/UserList.php
@@ -88,9 +88,8 @@ class UserList extends RowGateway
      * Update and save the list object using a request object -- useful for
      * sharing form processing between multiple actions.
      *
-     * @param \VuFind\Db\Row\User|bool         $user    Logged-in user (false if
-     * none)
-     * @param Zend_Controller_Request_Abstract $request Request to process
+     * @param \VuFind\Db\Row\User|bool $user    Logged-in user (false if none)
+     * @param \Zend\Stdlib\Parameters  $request Request to process
      *
      * @return int ID of newly created row
      * @throws ListPermissionException
diff --git a/module/VuFind/src/VuFind/Db/Table/Resource.php b/module/VuFind/src/VuFind/Db/Table/Resource.php
index 85aae3e19c0..6f12ae015a0 100644
--- a/module/VuFind/src/VuFind/Db/Table/Resource.php
+++ b/module/VuFind/src/VuFind/Db/Table/Resource.php
@@ -195,10 +195,10 @@ class Resource extends Gateway
     /**
      * Apply a sort parameter to a query on the resource table.
      *
-     * @param Zend_Db_Select $query Query to modify
-     * @param string         $sort  Field to use for sorting (may include 'desc'
+     * @param \Zend\Db\Sql\Select $query Query to modify
+     * @param string              $sort  Field to use for sorting (may include 'desc'
      * qualifier)
-     * @param string         $alias Alias to the resource table (defaults to
+     * @param string              $alias Alias to the resource table (defaults to
      * 'resource')
      *
      * @return void
diff --git a/module/VuFind/src/VuFind/Session/AbstractBase.php b/module/VuFind/src/VuFind/Session/AbstractBase.php
index c8b067ca129..15c52e4ba06 100644
--- a/module/VuFind/src/VuFind/Session/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Session/AbstractBase.php
@@ -45,7 +45,7 @@ abstract class AbstractBase implements SaveHandlerInterface
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
diff --git a/module/VuFind/src/VuFind/Session/Database.php b/module/VuFind/src/VuFind/Session/Database.php
index 878caf3f66d..c1ee7abd8c9 100644
--- a/module/VuFind/src/VuFind/Session/Database.php
+++ b/module/VuFind/src/VuFind/Session/Database.php
@@ -45,7 +45,7 @@ class Database extends AbstractBase
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
diff --git a/module/VuFind/src/VuFind/Session/File.php b/module/VuFind/src/VuFind/Session/File.php
index e77ed87d7a2..86c708999c9 100644
--- a/module/VuFind/src/VuFind/Session/File.php
+++ b/module/VuFind/src/VuFind/Session/File.php
@@ -43,7 +43,7 @@ class File extends AbstractBase
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
diff --git a/module/VuFind/src/VuFind/Session/Memcache.php b/module/VuFind/src/VuFind/Session/Memcache.php
index 1dde4673270..5783c1cfb99 100644
--- a/module/VuFind/src/VuFind/Session/Memcache.php
+++ b/module/VuFind/src/VuFind/Session/Memcache.php
@@ -46,7 +46,7 @@ class Memcache extends AbstractBase
     /**
      * Constructor.
      *
-     * @param Zend_Config $config Session configuration ([Session] section of
+     * @param \Zend\Config\Config $config Session configuration ([Session] section of
      * config.ini)
      */
     public function __construct($config)
-- 
GitLab