Merge pull request #191 from Icinga/dop-compat-decorator

Drop `CompatDecorator` & use form default decorator instead
Icinga · Jul 12, 2023 · 2e7b96b · 2e7b96b
2 parents 9d019d0 + bc9da11
commit 2e7b96b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 74 deletions.
diff --git a/library/Reporting/Web/Forms/Decorator/CompatDecorator.php b/library/Reporting/Web/Forms/Decorator/CompatDecorator.php
diff --git a/library/Reporting/Web/Forms/ReportForm.php b/library/Reporting/Web/Forms/ReportForm.php
@@ -7,7 +7,6 @@
 use Icinga\Authentication\Auth;
 use Icinga\Module\Reporting\Database;
 use Icinga\Module\Reporting\ProvidedReports;
-use Icinga\Module\Reporting\Web\Forms\Decorator\CompatDecorator;
 use ipl\Html\Contract\FormSubmitElement;
 use ipl\Html\Form;
 use ipl\Validator\CallbackValidator;
@@ -73,8 +72,6 @@ public function hasBeenSubmitted(): bool
 
     protected function assemble()
     {
-        $this->setDefaultElementDecorator(new CompatDecorator());
-
         $this->addElement('text', 'name', [
             'required'    => true,
             'label'       => $this->translate('Name'),

diff --git a/library/Reporting/Web/Forms/SendForm.php b/library/Reporting/Web/Forms/SendForm.php
@@ -8,7 +8,6 @@
 use Icinga\Module\Reporting\Database;
 use Icinga\Module\Reporting\ProvidedReports;
 use Icinga\Module\Reporting\Report;
-use Icinga\Module\Reporting\Web\Forms\Decorator\CompatDecorator;
 use ipl\Web\Compat\CompatForm;
 
 class SendForm extends CompatForm
@@ -28,8 +27,6 @@ public function setReport(Report $report)
 
     protected function assemble()
     {
-        $this->setDefaultElementDecorator(new CompatDecorator());
-
         (new SendMail())->initConfigForm($this, $this->report);
 
         $this->addElement('submit', 'submit', [

diff --git a/library/Reporting/Web/Forms/TemplateForm.php b/library/Reporting/Web/Forms/TemplateForm.php
@@ -7,7 +7,6 @@
 use Exception;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Reporting\Database;
-use Icinga\Module\Reporting\Web\Forms\Decorator\CompatDecorator;
 use ipl\Html\Contract\FormSubmitElement;
 use ipl\Html\Html;
 use ipl\Web\Compat\CompatForm;
@@ -54,8 +53,6 @@ public function hasBeenSubmitted(): bool
 
     protected function assemble()
     {
-        $this->setDefaultElementDecorator(new CompatDecorator());
-
         $this->setAttribute('enctype', 'multipart/form-data');
 
         $this->add(Html::tag('h2', 'Template Settings'));