From 354b149c03e1c41418a8bfa6e650246233aaf2ff Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Thu, 9 Jul 2026 22:51:55 +0200
Subject: [PATCH 1/2] fix(ingo): remove deprecated getInfo() $info argument in
 vacation form

Horde_Form\V3\BaseVariable::getInfo() now logs a deprecation warning
whenever a second argument is passed, since the $info parameter is
ignored after the Type/Variable merge in the V3 form migration.
Ingo_Form_Vacation::validate() was still passing an unused empty
array, spamming the log on every vacation form validation.
---
 lib/Form/Vacation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Form/Vacation.php b/lib/Form/Vacation.php
index dca53c5..de2b678 100644
--- a/lib/Form/Vacation.php
+++ b/lib/Form/Vacation.php
@@ -102,8 +102,8 @@ public function validate($vars = null, $canAutoFill = false)
         }
 
         if ($this->hasFeature('period')) {
-            $start = $this->_start->getInfo($vars, []);
-            $end = $this->_end->getInfo($vars, []);
+            $start = $this->_start->getInfo($vars);
+            $end = $this->_end->getInfo($vars);
             if ($start && $end && $end < $start) {
                 $valid = false;
                 $this->_errors['end'] = _("Vacation end date is prior to start.");

From 1e3468886b782339f65addee8682daeebeb29b61 Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Thu, 9 Jul 2026 22:52:29 +0200
Subject: [PATCH 2/2] fix(ingo): remove deprecated ->type indirection in spam
 form

The legacy Horde_Form_Variable/Horde_Form_Type split was merged into
a single Horde\Form\V3\BaseVariable class. Reaching through the
compatibility shim's ->type accessor now logs a deprecation warning
on every access. Ingo_Basic_Spam and Ingo_Form_Spam still used this
indirection to call setFolder() and set newFolderSet on the folder
variable; both now operate directly on the variable object, which
__get(type) already resolved to.
---
 lib/Basic/Spam.php | 2 +-
 lib/Form/Spam.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Basic/Spam.php b/lib/Basic/Spam.php
index f3aeeaa..48b50f6 100644
--- a/lib/Basic/Spam.php
+++ b/lib/Basic/Spam.php
@@ -87,7 +87,7 @@ protected function _init()
         $form->setCustomButtons($spam->disable);
 
         /* Set default values. */
-        $form->folder_var->type->setFolder($spam->mailbox);
+        $form->folder_var->setFolder($spam->mailbox);
         if (!$form->isSubmitted()) {
             $this->vars->level = $spam->level;
             $this->vars->folder = $spam->mailbox;
diff --git a/lib/Form/Spam.php b/lib/Form/Spam.php
index 9d72b93..28f1987 100644
--- a/lib/Form/Spam.php
+++ b/lib/Form/Spam.php
@@ -91,7 +91,7 @@ public function validate($vars = null, $canAutoFill = false)
             $vars = $this->_vars;
         }
         if (strlen($vars->get('folder_new'))) {
-            $this->folder_var->type->newFolderSet = true;
+            $this->folder_var->newFolderSet = true;
         }
         return parent::validate($vars, $canAutoFill);
     }