Skip to content

fix: Make IMP compatible with both modern and old style Horde\Util\Variables in many places #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralflang merged 1 commit into from
Apr 2, 2026
Merged

fix: Make IMP compatible with both modern and old style Horde\Util\Variables in many places #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,6 @@
"branch-alias": {
"dev-FRAMEWORK_6_0": "7.x-dev"
}
}
}
},
"minimum-stability": "dev"
}
6 changes: 5 additions & 1 deletion lib/Ajax/Imple/ImportEncryptKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* @copyright 2012-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/

/**
Expand All @@ -20,6 +22,8 @@
* @copyright 2012-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/
class IMP_Ajax_Imple_ImportEncryptKey extends Horde_Core_Ajax_Imple
{
Expand Down Expand Up @@ -58,7 +62,7 @@ protected function _attach($init)
* @return boolean True on success.
* @throws IMP_Exception
*/
protected function _handle(Horde_Variables $vars)
protected function _handle(Variables|Horde_Variables $vars)
{
global $injector, $notification;

Expand Down
6 changes: 5 additions & 1 deletion lib/Ajax/Imple/ItipRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* @copyright 2012-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/

/**
Expand All @@ -20,6 +22,8 @@
* @copyright 2012-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/
class IMP_Ajax_Imple_ItipRequest extends Horde_Core_Ajax_Imple
{
Expand Down Expand Up @@ -57,7 +61,7 @@ protected function _attach($init)
*
* @return boolean True on success.
*/
protected function _handle(Horde_Variables $vars)
protected function _handle(Variables|Horde_Variables $vars)
{
global $injector, $notification, $registry;

Expand Down
6 changes: 5 additions & 1 deletion lib/Ajax/Imple/PassphraseDialog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* @copyright 2010-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/

/**
Expand All @@ -20,6 +22,8 @@
* @copyright 2010-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/
class IMP_Ajax_Imple_PassphraseDialog extends Horde_Core_Ajax_Imple
{
Expand Down Expand Up @@ -84,7 +88,7 @@ protected function _attach($init)

/**
*/
protected function _handle(Horde_Variables $vars)
protected function _handle(Variables|Horde_Variables $vars)
{
return false;
}
Expand Down
6 changes: 5 additions & 1 deletion lib/Ajax/Imple/VcardImport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* @copyright 2012-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/

/**
Expand All @@ -20,6 +22,8 @@
* @copyright 2014-2017 Horde LLC
* @license http://www.horde.org/licenses/gpl GPL
* @package IMP

use Horde\Util\Variables;
*/
class IMP_Ajax_Imple_VcardImport extends Horde_Core_Ajax_Imple
{
Expand Down Expand Up @@ -59,7 +63,7 @@ protected function _attach($init)
*
* @return boolean True on success.
*/
protected function _handle(Horde_Variables $vars)
protected function _handle(Variables|Horde_Variables $vars)
{
global $registry, $injector, $notification;

Expand Down
4 changes: 3 additions & 1 deletion lib/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
* Horde_Registry_Application::). */
require_once HORDE_BASE . '/lib/core.php';

use Horde\Util\Variables;

/**
* IMP application API.
*
Expand Down Expand Up @@ -411,7 +413,7 @@ public function nosqlDrivers()
*
* @throws IMP_Exception
*/
public function download(Horde_Variables $vars)
public function download(Variables|Horde_Variables $vars)
{
global $injector, $registry;

Expand Down
4 changes: 3 additions & 1 deletion lib/Basic/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* @package IMP
*/

use Horde\Util\Variables;

/**
* Base class for basic view pages.
*
Expand Down Expand Up @@ -50,7 +52,7 @@ abstract class IMP_Basic_Base

/**
*/
public function __construct(Horde_Variables $vars)
public function __construct(Variables|Horde_Variables $vars)
{
global $page_output;

Expand Down
3 changes: 2 additions & 1 deletion lib/Compose.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* @package IMP
*/
use function PHP81_BC\strftime;
use Horde\Util\Variables;

/**
* An object representing an outgoing mail message.
Expand Down Expand Up @@ -3504,7 +3505,7 @@ protected function _addAttachment($atc_file, $bytes, $filename, $type)
*
* @param Horde_Variables $vars Object with the form data.
*/
public function sessionExpireDraft(Horde_Variables $vars)
public function sessionExpireDraft(Variables|Horde_Variables $vars)
{
global $injector;

Expand Down
4 changes: 3 additions & 1 deletion lib/Compose/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* @package IMP
*/

use Horde\Util\Variables;

/**
* Process incoming compose arguments and generate compose links.
*
Expand Down Expand Up @@ -44,7 +46,7 @@ public function __construct($in = null)
} else {
$this->args['to'] = $in;
}
} elseif ($in instanceof Horde_Variables) {
} elseif ($in instanceof Horde_Variables || $in instanceof Variables) {
foreach ($fields as $val) {
if (isset($in->$val)) {
$this->args[$val] = $in->$val;
Expand Down
4 changes: 3 additions & 1 deletion lib/Contents/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* @package IMP
*/

use Horde\Util\Variables;

/**
* Provides logic to format message content for delivery to the browser.
*
Expand Down Expand Up @@ -340,7 +342,7 @@ public function printAttach($id)
*
* @throws Horde_Exception Exception on incorrect token.
*/
public function checkToken(Horde_Variables $vars)
public function checkToken(Variables|Horde_Variables $vars)
{
$GLOBALS['session']->checkToken($vars->get(self::VIEW_TOKEN_PARAM));
}
Expand Down
4 changes: 3 additions & 1 deletion lib/Dynamic/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* @package IMP
*/

use Horde\Util\Variables;

/**
* Base class for dynamic view pages.
*
Expand Down Expand Up @@ -67,7 +69,7 @@ abstract class IMP_Dynamic_Base

/**
*/
public function __construct(Horde_Variables $vars)
public function __construct(Variables|Horde_Variables $vars)
{
global $page_output;

Expand Down
4 changes: 3 additions & 1 deletion lib/Indices/Mailbox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* @package IMP
*/

use Horde\Util\Variables;

/**
* Extends base Indices object by incorporating base mailbox information.
*
Expand Down Expand Up @@ -55,7 +57,7 @@ public function __construct()

switch (func_num_args()) {
case 1:
if ($args[0] instanceof Horde_Variables) {
if ($args[0] instanceof Horde_Variables || $args[0] instanceof Variables) {
if (isset($args[0]->mailbox) && strlen($args[0]->mailbox)) {
$this->mailbox = IMP_Mailbox::formFrom($args[0]->mailbox);

Expand Down
4 changes: 3 additions & 1 deletion lib/Smartmobile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* @package IMP
*/

use Horde\Util\Variables;

/**
* Base class for smartmobile view pages.
*
Expand All @@ -35,7 +37,7 @@ class IMP_Smartmobile

/**
*/
public function __construct(Horde_Variables $vars)
public function __construct(Variables|Horde_Variables $vars)
{
global $notification, $page_output;

Expand Down
Loading
Loading