diff --git a/module/VuFind/src/VuFind/Session/AbstractBase.php b/module/VuFind/src/VuFind/Session/AbstractBase.php index 0a28ec51bedea6199d23c118cc0dd7389b55b673..98f3a1dbb7b7279b160c069868bcb469e3f25ada 100644 --- a/module/VuFind/src/VuFind/Session/AbstractBase.php +++ b/module/VuFind/src/VuFind/Session/AbstractBase.php @@ -81,7 +81,7 @@ abstract class AbstractBase implements SaveHandlerInterface, * @param string $sess_path Session save path * @param string $sess_name Session name * - * @return void + * @return bool * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -94,7 +94,7 @@ abstract class AbstractBase implements SaveHandlerInterface, * Close function, this works like a destructor in classes and is executed * when the session operation is done. * - * @return void + * @return bool */ public function close() { @@ -111,12 +111,13 @@ abstract class AbstractBase implements SaveHandlerInterface, * * @param string $sess_id The session ID to destroy * - * @return void + * @return bool */ public function destroy($sess_id) { $table = $this->getTable('Search'); $table->destroySession($sess_id); + return true; } /** @@ -125,7 +126,7 @@ abstract class AbstractBase implements SaveHandlerInterface, * * @param int $sess_maxlifetime Maximum session lifetime. * - * @return void + * @return bool * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ @@ -142,5 +143,6 @@ abstract class AbstractBase implements SaveHandlerInterface, // Anecdotal testing Today and Yesterday seems to indicate destroy() // is called by the garbage collector and everything is good. // Something to keep in mind though. + return true; } } diff --git a/module/VuFind/src/VuFind/Session/Database.php b/module/VuFind/src/VuFind/Session/Database.php index 218609dcb12c9ffde14420fa1d5c79ad1f45cbae..23a57bb56cf036bc2f5f8d6065e63e84aca54827 100644 --- a/module/VuFind/src/VuFind/Session/Database.php +++ b/module/VuFind/src/VuFind/Session/Database.php @@ -79,7 +79,7 @@ class Database extends AbstractBase * * @param string $sess_id The session ID to destroy * - * @return void + * @return bool */ public function destroy($sess_id) { @@ -88,6 +88,8 @@ class Database extends AbstractBase // Now do database-specific destruction: $this->getTable('Session')->destroySession($sess_id); + + return true; } /** @@ -96,10 +98,11 @@ class Database extends AbstractBase * * @param int $sess_maxlifetime Maximum session lifetime. * - * @return void + * @return bool */ public function gc($sess_maxlifetime) { $this->getTable('Session')->garbageCollect($sess_maxlifetime); + return true; } } diff --git a/module/VuFind/src/VuFind/Session/File.php b/module/VuFind/src/VuFind/Session/File.php index b5ebd5dfd47da5390ce016a98436ef649349f3c2..fbfa84da7ba6b7bcbd52fc204b1ff5c77ea523eb 100644 --- a/module/VuFind/src/VuFind/Session/File.php +++ b/module/VuFind/src/VuFind/Session/File.php @@ -132,7 +132,7 @@ class File extends AbstractBase * * @param string $sess_id The session ID to destroy * - * @return void + * @return bool */ public function destroy($sess_id) { @@ -153,7 +153,7 @@ class File extends AbstractBase * * @param int $maxlifetime Maximum session lifetime. * - * @return void + * @return bool */ public function gc($maxlifetime) { diff --git a/module/VuFind/src/VuFind/Session/Memcache.php b/module/VuFind/src/VuFind/Session/Memcache.php index 923bb2e87e59f78d76f46eee736a317da510d7c1..ca035c508eafe652b16aa0b5d1a3e77d5aa24b4c 100644 --- a/module/VuFind/src/VuFind/Session/Memcache.php +++ b/module/VuFind/src/VuFind/Session/Memcache.php @@ -110,7 +110,7 @@ class Memcache extends AbstractBase * * @param string $sess_id The session ID to destroy * - * @return void + * @return bool */ public function destroy($sess_id) { diff --git a/packages/DEBIAN/changelog b/packages/DEBIAN/changelog index a5eeea7332b01658545f75381bdad031eaaa7f66..cf733a3a054eb49e8f9a454abcb4ac93f698c676 100644 --- a/packages/DEBIAN/changelog +++ b/packages/DEBIAN/changelog @@ -4,6 +4,12 @@ vufind 3.0 distribution; urgency=low -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Mo 25 Apr 2016 09:28:51 UTC +vufind 2.5.4 distribution; urgency=low + + * VuFind 2.5.4 release (see http://vufind.org/wiki/changelog for details) + + -- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Mo 25 Apr 2016 07:12:54 UTC + vufind 2.5.3 distribution; urgency=low * VuFind 2.5.3 release (see http://vufind.org/wiki/changelog for details) diff --git a/packages/DEBIAN/control b/packages/DEBIAN/control index c7a43a460d79aa08ed612dcb576325e6d1fb14aa..0b8b0675ca7d6085b3eee42548c6b2fb114e0670 100644 --- a/packages/DEBIAN/control +++ b/packages/DEBIAN/control @@ -3,7 +3,20 @@ Version: 3.0 Section: World Wide Web Priority: Optional Architecture: all -Depends: default-jdk, apache2, php5, php5-dev, php-pear, php5-intl, php5-json, php5-ldap, php5-mcrypt, php5-mysql, php5-xsl, php5-gd, mysql-server +Depends: apache2, + default-jdk, + libapache2-mod-php5 | libapache2-mod-php, + mysql-server | virtual-mysql-server-core, + php-pear, + php5 | php, + php5-dev | php-dev, + php5-gd | php-gd, + php5-intl | php-intl, + php5-json | php-json, + php5-ldap | php-ldap, + php5-mcrypt | php-mcrypt, + php5-mysql | php-mysql, + php5-xsl | php-xml Maintainer: VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Homepage: http://vufind.org/ Description: A library resource discovery portal