Feat: modernize test suite

.gitignore

@@ -27,3 +27,29 @@ run-tests.log
 /test/*/*/*/*.log
 /test/*/*/*/*.out
 
+
+# Added by horde-components QC --fix-qc-issues
+# Build artifacts directory
+/build/
+# Composer dependencies directory
+/vendor/
+# Composer lock file (libraries should not commit lock files)
+/composer.lock
+# PHPStorm IDE settings
+/.idea/
+# VSCode IDE settings
+/.vscode/
+# Claude Code CLI cache and state
+/.claude/
+# Cline extension data
+/.cline/
+# PHP CS Fixer cache file
+/.php-cs-fixer.cache
+# PHPUnit result cache
+/.phpunit.result.cache
+# PHPUnit Cache (other)
+/.phpunit.cache
+# PHPStan local configuration
+/phpstan.neon
+# PHPStan cache directory
+/.phpstan.cache/

.horde.yml

@@ -38,7 +38,7 @@ license:
   uri: http://www.horde.org/licenses/lgpl21
 dependencies:
   required:
-    php: ^7.4 || ^8
+    php: ^8
     composer:
       horde/exception: ^3
       horde/support: ^3
@@ -54,4 +54,6 @@ dependencies:
       horde/hashtable: ^2
       horde/log: ^3
       horde/mongo: ^2
-      horde/test: ^3
+keywords:
+  - sessions
+vendor: horde

composer.json

@@ -32,8 +32,7 @@
         "horde/db": "^3 || dev-FRAMEWORK_6_0",
         "horde/hashtable": "^2 || dev-FRAMEWORK_6_0",
         "horde/log": "^3 || dev-FRAMEWORK_6_0",
-        "horde/mongo": "^2 || dev-FRAMEWORK_6_0",
-        "horde/test": "^3 || dev-FRAMEWORK_6_0"
+        "horde/mongo": "^2 || dev-FRAMEWORK_6_0"
     },
     "suggest": {
         "horde/db": "^3 || dev-FRAMEWORK_6_0",
@@ -52,6 +51,9 @@
         }
     },
     "config": {
-        "allow-plugins": {}
-    }
-}
+        "allow-plugins": {
+            "horde/horde-installer-plugin": true
+        }
+    },
+    "minimum-stability": "dev"
+}

lib/Horde/SessionHandler.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * This class provides the interface to the session storage backend.
  *
- * Copyright 2002-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2002-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -61,7 +62,7 @@ class Horde_SessionHandler implements SessionHandlerInterface
      *
      * @var array
      */
-    protected $_params = array();
+    protected $_params = [];
 
     /**
      * Initial session data signature.
@@ -99,14 +100,14 @@ class Horde_SessionHandler implements SessionHandlerInterface
      *            DEFAULT: No
      * </pre>
      */
-    public function __construct(Horde_SessionHandler_Storage $storage,
-                                array $params = array())
-    {
+    public function __construct(
+        Horde_SessionHandler_Storage $storage,
+        array $params = []
+    ) {
         $params = array_merge($this->_params, $params);
 
-        $this->_logger = isset($params['logger'])
-            ? $params['logger']
-            : new Horde_Support_Stub();
+        $this->_logger = $params['logger']
+            ?? new Horde_Support_Stub();
         unset($params['logger']);
 
         $this->_params = $params;
@@ -205,9 +206,9 @@ public function read($id): string|false
      */
     public function write($id, $session_data): bool
     {
-        if ($this->changed ||
-            (empty($this->_params['no_md5']) &&
-             ($this->_sig != md5($session_data)))) {
+        if ($this->changed
+            || (empty($this->_params['no_md5'])
+             && ($this->_sig != md5($session_data)))) {
             if (!$this->_storage->write($id, $session_data)) {
                 $this->_logger->log('Failed to write session data (' . $id . ')', 'DEBUG');
                 return false;
@@ -273,10 +274,10 @@ public function getSessionIDs()
      */
     public function getSessionsInfo()
     {
-        $info = array();
+        $info = [];
 
-        if (empty($this->_params['parse']) ||
-            !is_callable($this->_params['parse'])) {
+        if (empty($this->_params['parse'])
+            || !is_callable($this->_params['parse'])) {
             return $info;
         }
 

lib/Horde/SessionHandler/Exception.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * Exception handler for the SessionHandler package.
  *
- * Copyright 2010-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2010-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -11,6 +12,4 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_Exception extends Horde_Exception_Wrapped
-{
-}
+class Horde_SessionHandler_Exception extends Horde_Exception_Wrapped {}

lib/Horde/SessionHandler/Storage.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * Copyright 2002-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2002-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -36,14 +37,14 @@ abstract class Horde_SessionHandler_Storage
      *
      * @var array
      */
-    protected $_params = array();
+    protected $_params = [];
 
     /**
      * Constructor.
      *
      * @param array $params  Configuration parameters.
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = [])
     {
         $this->_params = array_merge($this->_params, $params);
     }
@@ -61,9 +62,7 @@ public function __sleep()
      *
      * @deprecated
      */
-    public function setLogger(Horde_Log_Logger $log)
-    {
-    }
+    public function setLogger(Horde_Log_Logger $log) {}
 
     /**
      * Open the backend.

lib/Horde/SessionHandler/Storage/Builtin.php

@@ -1,10 +1,11 @@
 <?php
+
 /**
  * SessionHandler storage implementation for PHP's built-in session handler.
  * This doesn't do any session handling itself - instead, it exists to allow
  * utility features to be used with the built-in PHP handler.
  *
- * Copyright 2005-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2005-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -25,7 +26,7 @@ class Horde_SessionHandler_Storage_Builtin extends Horde_SessionHandler_Storage
 
     /**
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = [])
     {
         parent::__construct($params);
 
@@ -37,15 +38,11 @@ public function __construct(array $params = array())
 
     /**
      */
-    public function open($save_path = null, $session_name = null)
-    {
-    }
+    public function open($save_path = null, $session_name = null) {}
 
-     /**
-      */
-    public function close()
-    {
-    }
+    /**
+     */
+    public function close() {}
 
     /**
      */
@@ -73,8 +70,8 @@ public function destroy($id)
 
         foreach ($di as $val) {
             /* Make sure we're dealing with files that start with sess_. */
-            if ($val->isFile() &&
-                ($val->getFilename() == 'sess_' . $id)) {
+            if ($val->isFile()
+                && ($val->getFilename() == 'sess_' . $id)) {
                 return unlink($val->getPathname());
             }
         }
@@ -93,7 +90,7 @@ public function gc($maxlifetime = 300)
      */
     public function getSessionIDs()
     {
-        $sessions = array();
+        $sessions = [];
 
         try {
             $di = new DirectoryIterator($this->_path);
@@ -103,8 +100,8 @@ public function getSessionIDs()
 
         foreach ($di as $val) {
             /* Make sure we're dealing with files that start with sess_. */
-            if ($val->isFile() &&
-                (strpos($val->getFilename(), 'sess_') === 0)) {
+            if ($val->isFile()
+                && (strpos($val->getFilename(), 'sess_') === 0)) {
                 $sessions[] = substr($val->getFilename(), strlen('sess_'));
             }
         }

lib/Horde/SessionHandler/Storage/External.php

@@ -1,9 +1,10 @@
 <?php
+
 /**
  * SessionHandler storage implementation for an external save handler defined
  * via configuration parameters.
  *
- * Copyright 2010-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2010-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -30,9 +31,9 @@ class Horde_SessionHandler_Storage_External extends Horde_SessionHandler_Storage
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = [])
     {
-        foreach (array('open', 'close', 'read', 'write', 'destroy', 'gc') as $val) {
+        foreach (['open', 'close', 'read', 'write', 'destroy', 'gc'] as $val) {
             if (!isset($params[$val])) {
                 throw new InvalidArgumentException('Missing parameter: ' . $val);
             }

lib/Horde/SessionHandler/Storage/File.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * Copyright 2010-2017 Horde LLC (http://www.horde.org/)
+ * Copyright 2010-2026 Horde LLC (http://www.horde.org/)
  *
  * See the enclosed file LICENSE for license information (LGPL). If you
  * did not receive this file, see http://www.horde.org/licenses/lgpl21.
@@ -23,7 +24,7 @@
 class Horde_SessionHandler_Storage_File extends Horde_SessionHandler_Storage
 {
     /* File prefix. */
-    const PREFIX = 'horde_sh_';
+    public const PREFIX = 'horde_sh_';
 
     /**
      * File stream.
@@ -42,7 +43,7 @@ class Horde_SessionHandler_Storage_File extends Horde_SessionHandler_Storage
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = [])
     {
         if (!isset($params['path'])) {
             throw new InvalidArgumentException('Missing path parameter.');
@@ -152,9 +153,9 @@ public function gc($maxlifetime = 300)
         $expire_time = time() - $maxlifetime;
 
         foreach ($di as $val) {
-            if ($val->isFile() &&
-                (strpos($val->getFilename(), self::PREFIX) === 0) &&
-                ($val->getMTime() < $expire_time)) {
+            if ($val->isFile()
+                && (strpos($val->getFilename(), self::PREFIX) === 0)
+                && ($val->getMTime() < $expire_time)) {
                 @unlink($val->getPathname());
             }
         }
@@ -166,17 +167,18 @@ public function gc($maxlifetime = 300)
      */
     public function getSessionIDs()
     {
-        $ids = array();
+        $ids = [];
 
         try {
             $di = new DirectoryIterator($this->_params['path']);
             foreach ($di as $val) {
-                if ($val->isFile() &&
-                    (strpos($val->getFilename(), self::PREFIX) === 0)) {
+                if ($val->isFile()
+                    && (strpos($val->getFilename(), self::PREFIX) === 0)) {
                     $ids[] = substr($val->getFilename(), strlen(self::PREFIX));
                 }
             }
-        } catch (UnexpectedValueException $e) {}
+        } catch (UnexpectedValueException $e) {
+        }
 
         return $ids;
     }