From 36422d923422dfa717ae094fad244c4de6510a4b Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 27 Mar 2026 15:29:45 +0100 Subject: [PATCH 1/2] Use `ipl\Stdlib\Events` in form subclasses Recent versions of Icinga PHP Library introduce strict typing that is not satisfied by using `EventEmitterTrait` directly. --- library/Vspheredb/Web/Table/Objects/VCenterServersTable.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/Vspheredb/Web/Table/Objects/VCenterServersTable.php b/library/Vspheredb/Web/Table/Objects/VCenterServersTable.php index b078c4aa..277a9689 100644 --- a/library/Vspheredb/Web/Table/Objects/VCenterServersTable.php +++ b/library/Vspheredb/Web/Table/Objects/VCenterServersTable.php @@ -12,11 +12,12 @@ use Icinga\Module\Vspheredb\Web\Table\BaseTable; use Icinga\Module\Vspheredb\Web\Table\SimpleColumn; use ipl\Html\Html; +use ipl\Stdlib\Events; use Psr\Http\Message\RequestInterface; -class VCenterServersTable extends BaseTable implements EventEmitterInterface +class VCenterServersTable extends BaseTable { - use EventEmitterTrait; + use Events; public const ON_FORM_ACTION = 'formAction'; From 7aea51db187a20242731f219d56132a28742b59d Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 27 Mar 2026 15:44:07 +0100 Subject: [PATCH 2/2] Replace gipfl TranslationHelper with ipl\I18n\Translation The module previously depended on `gipfl\Translation\TranslationHelper` for i18n support in UI classes. `ipl\I18n\Translation` is the equivalent trait from the IPL library, which the module already uses broadly for other concerns, making the gipfl dependency redundant. --- library/Vspheredb/Hint/ConnectionStateDetails.php | 4 ++-- .../Monitoring/Rule/Definition/MonitoringRuleDefinition.php | 4 ++-- .../Rule/Definition/MonitoringRuleSetDefinition.php | 4 ++-- library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php | 4 ++-- .../Vspheredb/Monitoring/Rule/MonitoringRulesTreeRenderer.php | 4 ++-- library/Vspheredb/Monitoring/Rule/RuleForm.php | 4 ++-- library/Vspheredb/Web/Form/ApplyMigrationsForm.php | 4 ++-- library/Vspheredb/Web/Form/ChooseDbResourceForm.php | 4 ++-- library/Vspheredb/Web/Form/ChooseInfluxDatabaseForm.php | 4 ++-- library/Vspheredb/Web/Form/DeleteVCenterForm.php | 4 ++-- library/Vspheredb/Web/Form/DisableServerForm.php | 4 ++-- library/Vspheredb/Web/Form/Element/VCenterSelection.php | 4 ++-- library/Vspheredb/Web/Form/EnableServerForm.php | 4 ++-- library/Vspheredb/Web/Form/FilterHostParentForm.php | 4 ++-- library/Vspheredb/Web/Form/FilterVCenterForm.php | 4 ++-- library/Vspheredb/Web/Form/InfluxDbConnectionForm.php | 4 ++-- library/Vspheredb/Web/Form/LogLevelForm.php | 4 ++-- library/Vspheredb/Web/Form/MonitoringConnectionForm.php | 4 ++-- library/Vspheredb/Web/Form/ObjectForm.php | 4 ++-- library/Vspheredb/Web/Form/PerfdataConsumerForm.php | 4 ++-- library/Vspheredb/Web/Form/RestartDaemonForm.php | 4 ++-- library/Vspheredb/Web/Form/VCenterForm.php | 4 ++-- library/Vspheredb/Web/Form/VCenterServerForm.php | 4 ++-- library/Vspheredb/Web/Form/VCenterShipMetricsForm.php | 4 ++-- library/Vspheredb/Web/OverviewTree.php | 4 ++-- library/Vspheredb/Web/Table/Object/HostHardwareInfoTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/HostSystemInfoTable.php | 4 ++-- .../Web/Table/Object/HostVirtualizationInfoTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/HostVmsInfoTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/VCenterInfoTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/VmEssentialInfoTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/VmExtraInfoTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/VmLiveCountersTable.php | 4 ++-- library/Vspheredb/Web/Table/Object/VmLocationInfoTable.php | 4 ++-- library/Vspheredb/Web/Tabs/ConfigTabs.php | 4 ++-- library/Vspheredb/Web/Tabs/MainTabs.php | 4 ++-- library/Vspheredb/Web/Tabs/VCenterTabs.php | 4 ++-- library/Vspheredb/Web/Widget/AdditionalTableActions.php | 4 ++-- .../Web/Widget/Addon/IbmSpectrumProtectBackupRunDetails.php | 4 ++-- library/Vspheredb/Web/Widget/Addon/NetBackupRunDetails.php | 4 ++-- .../Vspheredb/Web/Widget/Addon/VRangerBackupRunDetails.php | 4 ++-- library/Vspheredb/Web/Widget/Addon/VeeamBackupRunDetails.php | 4 ++-- library/Vspheredb/Web/Widget/CalendarForEvents.php | 4 ++-- library/Vspheredb/Web/Widget/CalendarMonthSummary.php | 4 ++-- library/Vspheredb/Web/Widget/Config/ProposeMigrations.php | 4 ++-- library/Vspheredb/Web/Widget/CpuAbsoluteUsage.php | 4 ++-- library/Vspheredb/Web/Widget/CustomValueDetails.php | 4 ++-- library/Vspheredb/Web/Widget/DatastoreUsage.php | 4 ++-- library/Vspheredb/Web/Widget/Documentation.php | 4 ++-- library/Vspheredb/Web/Widget/GuestToolsStatusRenderer.php | 4 ++-- library/Vspheredb/Web/Widget/HostMonitoringInfo.php | 4 ++-- library/Vspheredb/Web/Widget/IcingaHostStatusRenderer.php | 4 ++-- library/Vspheredb/Web/Widget/Link/Html5UiLink.php | 4 ++-- library/Vspheredb/Web/Widget/Link/KnowledgeBaseLink.php | 4 ++-- library/Vspheredb/Web/Widget/Link/MobLink.php | 4 ++-- library/Vspheredb/Web/Widget/Link/VmrcLink.php | 4 ++-- library/Vspheredb/Web/Widget/OverallStatusRenderer.php | 4 ++-- library/Vspheredb/Web/Widget/PowerStateRenderer.php | 4 ++-- library/Vspheredb/Web/Widget/ServiceTagRenderer.php | 4 ++-- library/Vspheredb/Web/Widget/Summaries.php | 4 ++-- library/Vspheredb/Web/Widget/TaggingDetails.php | 4 ++-- library/Vspheredb/Web/Widget/ToggleFlagList.php | 4 ++-- library/Vspheredb/Web/Widget/UsageBar.php | 4 ++-- library/Vspheredb/Web/Widget/UsageSummary.php | 4 ++-- library/Vspheredb/Web/Widget/VCenterSyncInfo.php | 4 ++-- library/Vspheredb/Web/Widget/Vm/BackupToolInfo.php | 4 ++-- library/Vspheredb/Web/Widget/VmHardwareTree.php | 4 ++-- library/Vspheredb/Web/Widget/VmHeader.php | 4 ++-- library/Vspheredb/Web/Widget/VmRouteConfigTable.php | 4 ++-- 69 files changed, 138 insertions(+), 138 deletions(-) diff --git a/library/Vspheredb/Hint/ConnectionStateDetails.php b/library/Vspheredb/Hint/ConnectionStateDetails.php index 88be87ff..26532134 100644 --- a/library/Vspheredb/Hint/ConnectionStateDetails.php +++ b/library/Vspheredb/Hint/ConnectionStateDetails.php @@ -2,11 +2,11 @@ namespace Icinga\Module\Vspheredb\Hint; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; class ConnectionStateDetails { - use TranslationHelper; + use Translation; protected static $instance; diff --git a/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleDefinition.php b/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleDefinition.php index 17ad3e65..864c7d10 100644 --- a/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleDefinition.php +++ b/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleDefinition.php @@ -2,17 +2,17 @@ namespace Icinga\Module\Vspheredb\Monitoring\Rule\Definition; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\DbObject\BaseDbObject; use Icinga\Module\Vspheredb\Monitoring\Rule\Enum\ObjectType; use Icinga\Module\Vspheredb\Monitoring\Rule\Settings; use Icinga\Module\Vspheredb\Monitoring\SingleCheckResult; +use ipl\I18n\Translation; use function in_array; abstract class MonitoringRuleDefinition { - use TranslationHelper; + use Translation; public const SUPPORTED_OBJECT_TYPES = []; diff --git a/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleSetDefinition.php b/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleSetDefinition.php index e28ae985..e67eceb9 100644 --- a/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleSetDefinition.php +++ b/library/Vspheredb/Monitoring/Rule/Definition/MonitoringRuleSetDefinition.php @@ -2,11 +2,11 @@ namespace Icinga\Module\Vspheredb\Monitoring\Rule\Definition; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; abstract class MonitoringRuleSetDefinition { - use TranslationHelper; + use Translation; /** @var string[]|MonitoringRuleDefinition[] Type hint, these are class names */ public const RULE_CLASSES = []; diff --git a/library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php b/library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php index fa75cdfd..c3c66c0a 100644 --- a/library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php +++ b/library/Vspheredb/Monitoring/Rule/MonitoringRulesTree.php @@ -2,13 +2,13 @@ namespace Icinga\Module\Vspheredb\Monitoring\Rule; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\DbObject\BaseDbObject; +use ipl\I18n\Translation; class MonitoringRulesTree { - use TranslationHelper; + use Translation; public const ROOT_OBJECT_TYPE = 'root'; diff --git a/library/Vspheredb/Monitoring/Rule/MonitoringRulesTreeRenderer.php b/library/Vspheredb/Monitoring/Rule/MonitoringRulesTreeRenderer.php index 742fd028..d15028bf 100644 --- a/library/Vspheredb/Monitoring/Rule/MonitoringRulesTreeRenderer.php +++ b/library/Vspheredb/Monitoring/Rule/MonitoringRulesTreeRenderer.php @@ -3,15 +3,15 @@ namespace Icinga\Module\Vspheredb\Monitoring\Rule; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Util; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; use ipl\Html\HtmlElement; +use ipl\I18n\Translation; class MonitoringRulesTreeRenderer extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'ul'; diff --git a/library/Vspheredb/Monitoring/Rule/RuleForm.php b/library/Vspheredb/Monitoring/Rule/RuleForm.php index 86e9516d..fa2506a9 100644 --- a/library/Vspheredb/Monitoring/Rule/RuleForm.php +++ b/library/Vspheredb/Monitoring/Rule/RuleForm.php @@ -2,7 +2,6 @@ namespace Icinga\Module\Vspheredb\Monitoring\Rule; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Monitoring\Rule\Definition\MonitoringRuleDefinition as Rule; @@ -14,12 +13,13 @@ use ipl\Html\FormElement\SelectElement; use ipl\Html\FormElement\TextElement; use ipl\Html\Html; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidInterface; class RuleForm extends Form { - use TranslationHelper; + use Translation; public const NEXT_UUID = '00000000-0000-0000-0000-000000000000'; public const RESULT_CREATED = 'created'; diff --git a/library/Vspheredb/Web/Form/ApplyMigrationsForm.php b/library/Vspheredb/Web/Form/ApplyMigrationsForm.php index ca9a724d..3a6c40dd 100644 --- a/library/Vspheredb/Web/Form/ApplyMigrationsForm.php +++ b/library/Vspheredb/Web/Form/ApplyMigrationsForm.php @@ -3,14 +3,14 @@ namespace Icinga\Module\Vspheredb\Web\Form; use gipfl\DbMigration\Migrations; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use gipfl\Web\Widget\Hint; use Icinga\Web\Notification; +use ipl\I18n\Translation; class ApplyMigrationsForm extends Form { - use TranslationHelper; + use Translation; /** @var Migrations */ protected $migrations; diff --git a/library/Vspheredb/Web/Form/ChooseDbResourceForm.php b/library/Vspheredb/Web/Form/ChooseDbResourceForm.php index a226a2d7..f041e736 100644 --- a/library/Vspheredb/Web/Form/ChooseDbResourceForm.php +++ b/library/Vspheredb/Web/Form/ChooseDbResourceForm.php @@ -5,7 +5,6 @@ use Exception; use gipfl\DbMigration\Migrations; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use gipfl\Web\Widget\Hint; use Icinga\Application\Config; @@ -13,10 +12,11 @@ use Icinga\Module\Vspheredb\Db; use Icinga\Web\Notification; use ipl\Html\Html; +use ipl\I18n\Translation; class ChooseDbResourceForm extends Form { - use TranslationHelper; + use Translation; private $config; diff --git a/library/Vspheredb/Web/Form/ChooseInfluxDatabaseForm.php b/library/Vspheredb/Web/Form/ChooseInfluxDatabaseForm.php index 95978b5c..17d6c623 100644 --- a/library/Vspheredb/Web/Form/ChooseInfluxDatabaseForm.php +++ b/library/Vspheredb/Web/Form/ChooseInfluxDatabaseForm.php @@ -2,7 +2,6 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use gipfl\Web\Form\Element\TextWithActionButton; use Icinga\Module\Vspheredb\Daemon\RemoteClient; @@ -10,6 +9,7 @@ use Icinga\Web\Notification; use ipl\Html\FormElement\BaseFormElement; use ipl\Html\FormElement\SelectElement; +use ipl\I18n\Translation; use React\EventLoop\LoopInterface; use function React\Async\await; @@ -17,7 +17,7 @@ class ChooseInfluxDatabaseForm extends Form { - use TranslationHelper; + use Translation; /** @var LoopInterface */ protected $loop; diff --git a/library/Vspheredb/Web/Form/DeleteVCenterForm.php b/library/Vspheredb/Web/Form/DeleteVCenterForm.php index 4e227b87..b99f0b2a 100644 --- a/library/Vspheredb/Web/Form/DeleteVCenterForm.php +++ b/library/Vspheredb/Web/Form/DeleteVCenterForm.php @@ -2,7 +2,6 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use gipfl\Web\Form\Feature\NextConfirmCancel; use gipfl\Web\Widget\Hint; @@ -11,6 +10,7 @@ use Icinga\Module\Vspheredb\DbObject\VCenter; use Icinga\Web\Notification; use ipl\Html\Html; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; use React\EventLoop\LoopInterface; @@ -18,7 +18,7 @@ class DeleteVCenterForm extends Form { - use TranslationHelper; + use Translation; protected $defaultDecoratorClass = null; diff --git a/library/Vspheredb/Web/Form/DisableServerForm.php b/library/Vspheredb/Web/Form/DisableServerForm.php index 7b8956a8..8c32ff3e 100644 --- a/library/Vspheredb/Web/Form/DisableServerForm.php +++ b/library/Vspheredb/Web/Form/DisableServerForm.php @@ -2,13 +2,13 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form\Feature\NextConfirmCancel; use gipfl\Web\InlineForm; +use ipl\I18n\Translation; class DisableServerForm extends InlineForm { - use TranslationHelper; + use Translation; protected $serverId; diff --git a/library/Vspheredb/Web/Form/Element/VCenterSelection.php b/library/Vspheredb/Web/Form/Element/VCenterSelection.php index fff647fb..50e73fd7 100644 --- a/library/Vspheredb/Web/Form/Element/VCenterSelection.php +++ b/library/Vspheredb/Web/Form/Element/VCenterSelection.php @@ -2,16 +2,16 @@ namespace Icinga\Module\Vspheredb\Web\Form\Element; -use gipfl\Translation\TranslationHelper; use Icinga\Authentication\Auth; use Icinga\Module\Vspheredb\Auth\RestrictionHelper; use Icinga\Module\Vspheredb\Db; use ipl\Html\FormElement\SelectElement; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; class VCenterSelection extends SelectElement { - use TranslationHelper; + use Translation; /** @var Db */ protected $connection; diff --git a/library/Vspheredb/Web/Form/EnableServerForm.php b/library/Vspheredb/Web/Form/EnableServerForm.php index 2e72525d..39b8e28e 100644 --- a/library/Vspheredb/Web/Form/EnableServerForm.php +++ b/library/Vspheredb/Web/Form/EnableServerForm.php @@ -2,13 +2,13 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form\Feature\NextConfirmCancel; use gipfl\Web\InlineForm; +use ipl\I18n\Translation; class EnableServerForm extends InlineForm { - use TranslationHelper; + use Translation; protected $serverId; diff --git a/library/Vspheredb/Web/Form/FilterHostParentForm.php b/library/Vspheredb/Web/Form/FilterHostParentForm.php index 7ca460c7..5da1edd7 100644 --- a/library/Vspheredb/Web/Form/FilterHostParentForm.php +++ b/library/Vspheredb/Web/Form/FilterHostParentForm.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Util; +use ipl\I18n\Translation; class FilterHostParentForm extends Form { - use TranslationHelper; + use Translation; protected $useFormName = false; protected $useCsrf = false; diff --git a/library/Vspheredb/Web/Form/FilterVCenterForm.php b/library/Vspheredb/Web/Form/FilterVCenterForm.php index 8b786964..8513057e 100644 --- a/library/Vspheredb/Web/Form/FilterVCenterForm.php +++ b/library/Vspheredb/Web/Form/FilterVCenterForm.php @@ -2,15 +2,15 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use Icinga\Authentication\Auth; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Web\Form\Element\VCenterSelection; +use ipl\I18n\Translation; class FilterVCenterForm extends Form { - use TranslationHelper; + use Translation; /** @var Auth */ protected $auth; diff --git a/library/Vspheredb/Web/Form/InfluxDbConnectionForm.php b/library/Vspheredb/Web/Form/InfluxDbConnectionForm.php index a19a75a4..0bd73e0d 100644 --- a/library/Vspheredb/Web/Form/InfluxDbConnectionForm.php +++ b/library/Vspheredb/Web/Form/InfluxDbConnectionForm.php @@ -2,11 +2,11 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use gipfl\Web\Form\Element\TextWithActionButton; use Icinga\Module\Vspheredb\Daemon\RemoteClient; use ipl\Html\FormElement\SelectElement; +use ipl\I18n\Translation; use React\EventLoop\LoopInterface; use function React\Async\await; @@ -14,7 +14,7 @@ class InfluxDbConnectionForm extends Form { - use TranslationHelper; + use Translation; public const INFLUXDB_MIN_SUPPORTED_VERSION = '1.6.0'; diff --git a/library/Vspheredb/Web/Form/LogLevelForm.php b/library/Vspheredb/Web/Form/LogLevelForm.php index 6c6f1774..2c77ad21 100644 --- a/library/Vspheredb/Web/Form/LogLevelForm.php +++ b/library/Vspheredb/Web/Form/LogLevelForm.php @@ -2,11 +2,11 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form\Feature\NextConfirmCancel; use gipfl\Web\InlineForm; use Icinga\Module\Vspheredb\Daemon\RemoteClient; use ipl\Html\FormElement\SelectElement; +use ipl\I18n\Translation; use Psr\Log\LogLevel; use React\EventLoop\LoopInterface; @@ -14,7 +14,7 @@ class LogLevelForm extends InlineForm { - use TranslationHelper; + use Translation; /** @var RemoteClient */ protected $client; diff --git a/library/Vspheredb/Web/Form/MonitoringConnectionForm.php b/library/Vspheredb/Web/Form/MonitoringConnectionForm.php index d51d2eb5..65c65211 100644 --- a/library/Vspheredb/Web/Form/MonitoringConnectionForm.php +++ b/library/Vspheredb/Web/Form/MonitoringConnectionForm.php @@ -11,7 +11,7 @@ use Icinga\Module\Vspheredb\Web\QueryParams; use Icinga\Web\Notification; use InvalidArgumentException; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\Web\Form; use ipl\Html\FormElement\SubmitElement; use ipl\Html\Html; @@ -19,7 +19,7 @@ class MonitoringConnectionForm extends Form { - use TranslationHelper; + use Translation; protected $db; protected bool $hasBeenDeleted = false; diff --git a/library/Vspheredb/Web/Form/ObjectForm.php b/library/Vspheredb/Web/Form/ObjectForm.php index ba261c95..e2d58025 100644 --- a/library/Vspheredb/Web/Form/ObjectForm.php +++ b/library/Vspheredb/Web/Form/ObjectForm.php @@ -6,13 +6,13 @@ use Icinga\Authentication\Auth; use Ramsey\Uuid\Uuid; use RuntimeException; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\Web\Form; use gipfl\ZfDbStore\StorableInterface; abstract class ObjectForm extends Form { - use TranslationHelper; + use Translation; /** @var Store */ protected $store; diff --git a/library/Vspheredb/Web/Form/PerfdataConsumerForm.php b/library/Vspheredb/Web/Form/PerfdataConsumerForm.php index cf0d5eda..06c18679 100644 --- a/library/Vspheredb/Web/Form/PerfdataConsumerForm.php +++ b/library/Vspheredb/Web/Form/PerfdataConsumerForm.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\Web\Form\Decorator\DdDtDecorator; use gipfl\ZfDbStore\Store; use Icinga\Module\Vspheredb\Daemon\RemoteClient; @@ -14,7 +14,7 @@ class PerfdataConsumerForm extends ObjectForm { use FormElementStealer; - use TranslationHelper; + use Translation; public const ON_DELETE = 'delete'; diff --git a/library/Vspheredb/Web/Form/RestartDaemonForm.php b/library/Vspheredb/Web/Form/RestartDaemonForm.php index 258aed2b..6215bb0c 100644 --- a/library/Vspheredb/Web/Form/RestartDaemonForm.php +++ b/library/Vspheredb/Web/Form/RestartDaemonForm.php @@ -2,17 +2,17 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form\Feature\NextConfirmCancel; use gipfl\Web\InlineForm; use Icinga\Module\Vspheredb\Daemon\RemoteClient; +use ipl\I18n\Translation; use React\EventLoop\LoopInterface; use function React\Async\await; class RestartDaemonForm extends InlineForm { - use TranslationHelper; + use Translation; /** @var RemoteClient */ protected $client; diff --git a/library/Vspheredb/Web/Form/VCenterForm.php b/library/Vspheredb/Web/Form/VCenterForm.php index 2151544d..4a691a34 100644 --- a/library/Vspheredb/Web/Form/VCenterForm.php +++ b/library/Vspheredb/Web/Form/VCenterForm.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use Icinga\Module\Vspheredb\DbObject\VCenter; use ipl\Html\Html; +use ipl\I18n\Translation; class VCenterForm extends Form { - use TranslationHelper; + use Translation; /** @var VCenter */ protected $vCenter; diff --git a/library/Vspheredb/Web/Form/VCenterServerForm.php b/library/Vspheredb/Web/Form/VCenterServerForm.php index 1cd65818..e3f88352 100644 --- a/library/Vspheredb/Web/Form/VCenterServerForm.php +++ b/library/Vspheredb/Web/Form/VCenterServerForm.php @@ -2,16 +2,16 @@ namespace Icinga\Module\Vspheredb\Web\Form; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Form; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\DbObject\BaseDbObject; use Icinga\Module\Vspheredb\DbObject\VCenterServer; use ipl\Html\FormElement\SubmitElement; +use ipl\I18n\Translation; class VCenterServerForm extends Form { - use TranslationHelper; + use Translation; public const UNCHANGED_PASSWORD = '__UNCHANGED__'; diff --git a/library/Vspheredb/Web/Form/VCenterShipMetricsForm.php b/library/Vspheredb/Web/Form/VCenterShipMetricsForm.php index 39ebcae6..a4a7f8c7 100644 --- a/library/Vspheredb/Web/Form/VCenterShipMetricsForm.php +++ b/library/Vspheredb/Web/Form/VCenterShipMetricsForm.php @@ -3,7 +3,7 @@ namespace Icinga\Module\Vspheredb\Web\Form; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\ZfDbStore\ZfDbStore; use Icinga\Module\Vspheredb\Daemon\RemoteClient; use Icinga\Module\Vspheredb\DbObject\VCenter; @@ -17,7 +17,7 @@ class VCenterShipMetricsForm extends ObjectForm { use FormElementStealer; - use TranslationHelper; + use Translation; public const ON_DELETE = 'delete'; diff --git a/library/Vspheredb/Web/OverviewTree.php b/library/Vspheredb/Web/OverviewTree.php index bd7526d4..628b3509 100644 --- a/library/Vspheredb/Web/OverviewTree.php +++ b/library/Vspheredb/Web/OverviewTree.php @@ -3,16 +3,16 @@ namespace Icinga\Module\Vspheredb\Web; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Auth\RestrictionHelper; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Util; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; class OverviewTree extends BaseHtmlElement { - use TranslationHelper; + use Translation; /** @var Db */ protected $db; diff --git a/library/Vspheredb/Web/Table/Object/HostHardwareInfoTable.php b/library/Vspheredb/Web/Table/Object/HostHardwareInfoTable.php index 2260b92c..1427c4ec 100644 --- a/library/Vspheredb/Web/Table/Object/HostHardwareInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/HostHardwareInfoTable.php @@ -2,7 +2,6 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Module\Vspheredb\DbObject\HostQuickStats; use Icinga\Module\Vspheredb\DbObject\HostSystem; @@ -10,10 +9,11 @@ use Icinga\Module\Vspheredb\Web\Widget\MemoryUsage; use Icinga\Module\Vspheredb\Web\Widget\SubTitle; use ipl\Html\Html; +use ipl\I18n\Translation; class HostHardwareInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var HostSystem */ protected $host; diff --git a/library/Vspheredb/Web/Table/Object/HostSystemInfoTable.php b/library/Vspheredb/Web/Table/Object/HostSystemInfoTable.php index c88e6fb3..8d758fb4 100644 --- a/library/Vspheredb/Web/Table/Object/HostSystemInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/HostSystemInfoTable.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use gipfl\Web\Widget\Hint; use Icinga\Date\DateFormatter; @@ -16,10 +15,11 @@ use Icinga\Module\Vspheredb\Web\Widget\Link\MobLink; use Icinga\Module\Vspheredb\Web\Widget\SubTitle; use ipl\Html\Html; +use ipl\I18n\Translation; class HostSystemInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var HostSystem */ protected $host; diff --git a/library/Vspheredb/Web/Table/Object/HostVirtualizationInfoTable.php b/library/Vspheredb/Web/Table/Object/HostVirtualizationInfoTable.php index f5a5cd87..008c4c8d 100644 --- a/library/Vspheredb/Web/Table/Object/HostVirtualizationInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/HostVirtualizationInfoTable.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Exception\NotFoundError; use Icinga\Module\Vspheredb\DbObject\HostSystem; @@ -12,10 +11,11 @@ use Icinga\Module\Vspheredb\Web\Widget\Link\VCenterLink; use Icinga\Module\Vspheredb\Web\Widget\Renderer\PathToObjectRenderer; use Icinga\Module\Vspheredb\Web\Widget\SubTitle; +use ipl\I18n\Translation; class HostVirtualizationInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var HostSystem */ protected $host; diff --git a/library/Vspheredb/Web/Table/Object/HostVmsInfoTable.php b/library/Vspheredb/Web/Table/Object/HostVmsInfoTable.php index 9d2c84a8..3e913881 100644 --- a/library/Vspheredb/Web/Table/Object/HostVmsInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/HostVmsInfoTable.php @@ -3,15 +3,15 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Module\Vspheredb\DbObject\HostSystem; use Icinga\Module\Vspheredb\Util; use Icinga\Module\Vspheredb\Web\Widget\SubTitle; +use ipl\I18n\Translation; class HostVmsInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var HostSystem */ protected $host; diff --git a/library/Vspheredb/Web/Table/Object/VCenterInfoTable.php b/library/Vspheredb/Web/Table/Object/VCenterInfoTable.php index 458a7ea0..69132a4b 100644 --- a/library/Vspheredb/Web/Table/Object/VCenterInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/VCenterInfoTable.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Module\Vspheredb\DbObject\VCenter; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; class VCenterInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; protected $vcenter; diff --git a/library/Vspheredb/Web/Table/Object/VmEssentialInfoTable.php b/library/Vspheredb/Web/Table/Object/VmEssentialInfoTable.php index bd471a33..5c9ee762 100644 --- a/library/Vspheredb/Web/Table/Object/VmEssentialInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/VmEssentialInfoTable.php @@ -4,7 +4,7 @@ use gipfl\IcingaWeb2\Icon; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\Web\Table\NameValueTable; use Exception; use gipfl\Web\Widget\Hint; @@ -31,7 +31,7 @@ class VmEssentialInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $vm; diff --git a/library/Vspheredb/Web/Table/Object/VmExtraInfoTable.php b/library/Vspheredb/Web/Table/Object/VmExtraInfoTable.php index 399c4b71..5ff0d234 100644 --- a/library/Vspheredb/Web/Table/Object/VmExtraInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/VmExtraInfoTable.php @@ -2,16 +2,16 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Module\Vspheredb\DbObject\VCenter; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use Icinga\Module\Vspheredb\Web\Widget\SubTitle; use ipl\Html\Html; +use ipl\I18n\Translation; class VmExtraInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $vm; diff --git a/library/Vspheredb/Web/Table/Object/VmLiveCountersTable.php b/library/Vspheredb/Web/Table/Object/VmLiveCountersTable.php index cc32ff07..dde454cc 100644 --- a/library/Vspheredb/Web/Table/Object/VmLiveCountersTable.php +++ b/library/Vspheredb/Web/Table/Object/VmLiveCountersTable.php @@ -4,17 +4,17 @@ use DateTime; use Exception; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Application\Benchmark; use Icinga\Module\Vspheredb\Api; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use Icinga\Module\Vspheredb\Web\Widget\CompactInOutSparkline; use ipl\Html\Html; +use ipl\I18n\Translation; class VmLiveCountersTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $vm; diff --git a/library/Vspheredb/Web/Table/Object/VmLocationInfoTable.php b/library/Vspheredb/Web/Table/Object/VmLocationInfoTable.php index 1fc0f52a..fbe11393 100644 --- a/library/Vspheredb/Web/Table/Object/VmLocationInfoTable.php +++ b/library/Vspheredb/Web/Table/Object/VmLocationInfoTable.php @@ -2,7 +2,6 @@ namespace Icinga\Module\Vspheredb\Web\Table\Object; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Exception\NotFoundError; use Icinga\Module\Vspheredb\Data\Anonymizer; @@ -19,10 +18,11 @@ use Icinga\Module\Vspheredb\Web\Widget\Renderer\PathToObjectRenderer; use Icinga\Module\Vspheredb\Web\Widget\SubTitle; use ipl\Html\Html; +use ipl\I18n\Translation; class VmLocationInfoTable extends NameValueTable { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $vm; diff --git a/library/Vspheredb/Web/Tabs/ConfigTabs.php b/library/Vspheredb/Web/Tabs/ConfigTabs.php index 9ea2cac7..6ba1d6de 100644 --- a/library/Vspheredb/Web/Tabs/ConfigTabs.php +++ b/library/Vspheredb/Web/Tabs/ConfigTabs.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Tabs; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\IcingaWeb2\Widget\Tabs; use Exception; use Icinga\Module\Vspheredb\Db; class ConfigTabs extends Tabs { - use TranslationHelper; + use Translation; /** @var Db|null */ protected $connection; diff --git a/library/Vspheredb/Web/Tabs/MainTabs.php b/library/Vspheredb/Web/Tabs/MainTabs.php index 25bac5d7..7b80bf76 100644 --- a/library/Vspheredb/Web/Tabs/MainTabs.php +++ b/library/Vspheredb/Web/Tabs/MainTabs.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Vspheredb\Web\Tabs; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\IcingaWeb2\Widget\Tabs; use Exception; use Icinga\Authentication\Auth; @@ -10,7 +10,7 @@ class MainTabs extends Tabs { - use TranslationHelper; + use Translation; /** @var Db|null */ protected $connection; diff --git a/library/Vspheredb/Web/Tabs/VCenterTabs.php b/library/Vspheredb/Web/Tabs/VCenterTabs.php index 5e5ba5a5..1382c1e8 100644 --- a/library/Vspheredb/Web/Tabs/VCenterTabs.php +++ b/library/Vspheredb/Web/Tabs/VCenterTabs.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Tabs; -use gipfl\Translation\TranslationHelper; use gipfl\IcingaWeb2\Widget\Tabs; use Icinga\Module\Vspheredb\DbObject\VCenter; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; class VCenterTabs extends Tabs { - use TranslationHelper; + use Translation; /** @var VCenter */ protected $vCenter; diff --git a/library/Vspheredb/Web/Widget/AdditionalTableActions.php b/library/Vspheredb/Web/Widget/AdditionalTableActions.php index c9f2d177..5785d06f 100644 --- a/library/Vspheredb/Web/Widget/AdditionalTableActions.php +++ b/library/Vspheredb/Web/Widget/AdditionalTableActions.php @@ -6,14 +6,14 @@ use ipl\Html\HtmlDocument; use gipfl\IcingaWeb2\Icon; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\IcingaWeb2\Url; use Icinga\Authentication\Auth; use Icinga\Module\Vspheredb\Web\Table\BaseTable; class AdditionalTableActions { - use TranslationHelper; + use Translation; /** @var Auth */ protected $auth; diff --git a/library/Vspheredb/Web/Widget/Addon/IbmSpectrumProtectBackupRunDetails.php b/library/Vspheredb/Web/Widget/Addon/IbmSpectrumProtectBackupRunDetails.php index 3f8162f8..67b7dfee 100644 --- a/library/Vspheredb/Web/Widget/Addon/IbmSpectrumProtectBackupRunDetails.php +++ b/library/Vspheredb/Web/Widget/Addon/IbmSpectrumProtectBackupRunDetails.php @@ -2,15 +2,15 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Addon; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Date\DateFormatter; use Icinga\Module\Vspheredb\Addon\IbmSpectrumProtect; use Icinga\Util\Format; +use ipl\I18n\Translation; class IbmSpectrumProtectBackupRunDetails extends NameValueTable { - use TranslationHelper; + use Translation; /** * IbmSpectrumProtectBackupRunDetails constructor. diff --git a/library/Vspheredb/Web/Widget/Addon/NetBackupRunDetails.php b/library/Vspheredb/Web/Widget/Addon/NetBackupRunDetails.php index bb7ddb26..ce8779f9 100644 --- a/library/Vspheredb/Web/Widget/Addon/NetBackupRunDetails.php +++ b/library/Vspheredb/Web/Widget/Addon/NetBackupRunDetails.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Addon; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Date\DateFormatter; use Icinga\Exception\NotFoundError; @@ -11,10 +10,11 @@ use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Db\CheckRelatedLookup; use Icinga\Module\Vspheredb\Util; +use ipl\I18n\Translation; class NetBackupRunDetails extends NameValueTable { - use TranslationHelper; + use Translation; /** * @param NetBackup $details diff --git a/library/Vspheredb/Web/Widget/Addon/VRangerBackupRunDetails.php b/library/Vspheredb/Web/Widget/Addon/VRangerBackupRunDetails.php index 816fd4cb..3c525663 100644 --- a/library/Vspheredb/Web/Widget/Addon/VRangerBackupRunDetails.php +++ b/library/Vspheredb/Web/Widget/Addon/VRangerBackupRunDetails.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Addon; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Date\DateFormatter; use Icinga\Module\Vspheredb\Addon\VRangerBackup; +use ipl\I18n\Translation; class VRangerBackupRunDetails extends NameValueTable { - use TranslationHelper; + use Translation; /** * @param VRangerBackup $details diff --git a/library/Vspheredb/Web/Widget/Addon/VeeamBackupRunDetails.php b/library/Vspheredb/Web/Widget/Addon/VeeamBackupRunDetails.php index 309a59d8..a0bdf099 100644 --- a/library/Vspheredb/Web/Widget/Addon/VeeamBackupRunDetails.php +++ b/library/Vspheredb/Web/Widget/Addon/VeeamBackupRunDetails.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Addon; -use gipfl\Translation\TranslationHelper; use gipfl\IcingaWeb2\Widget\NameValueTable; use Icinga\Date\DateFormatter; use Icinga\Module\Vspheredb\Addon\VeeamBackup; +use ipl\I18n\Translation; class VeeamBackupRunDetails extends NameValueTable { - use TranslationHelper; + use Translation; /** * VeeamBackupRunDetails constructor. diff --git a/library/Vspheredb/Web/Widget/CalendarForEvents.php b/library/Vspheredb/Web/Widget/CalendarForEvents.php index b206820c..1e0996ed 100644 --- a/library/Vspheredb/Web/Widget/CalendarForEvents.php +++ b/library/Vspheredb/Web/Widget/CalendarForEvents.php @@ -3,14 +3,14 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Url; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Widget\Hint; use ipl\Html\Html; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; class CalendarForEvents extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var VMotionHeatmap|AlarmHeatmap */ protected $calendars; diff --git a/library/Vspheredb/Web/Widget/CalendarMonthSummary.php b/library/Vspheredb/Web/Widget/CalendarMonthSummary.php index 956e1678..d7560de2 100644 --- a/library/Vspheredb/Web/Widget/CalendarMonthSummary.php +++ b/library/Vspheredb/Web/Widget/CalendarMonthSummary.php @@ -6,14 +6,14 @@ use gipfl\Format\LocalTimeFormat; use gipfl\IcingaWeb2\Link; use gipfl\IcingaWeb2\Url; -use gipfl\Translation\TranslationHelper; use ipl\Html\HtmlElement; use ipl\Html\Table; +use ipl\I18n\Translation; use ipl\Web\Compat\StyleWithNonce; class CalendarMonthSummary extends Table { - use TranslationHelper; + use Translation; protected $defaultAttributes = [ 'data-base-target' => '_next', diff --git a/library/Vspheredb/Web/Widget/Config/ProposeMigrations.php b/library/Vspheredb/Web/Widget/Config/ProposeMigrations.php index 5ef98ab5..afd60af2 100644 --- a/library/Vspheredb/Web/Widget/Config/ProposeMigrations.php +++ b/library/Vspheredb/Web/Widget/Config/ProposeMigrations.php @@ -4,12 +4,12 @@ use Exception; use gipfl\DbMigration\Migrations; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Widget\Hint; use Icinga\Authentication\Auth; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Web\Form\ApplyMigrationsForm; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; use Psr\Http\Message\ServerRequestInterface; /** @@ -25,7 +25,7 @@ */ class ProposeMigrations extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var Db */ protected $db; diff --git a/library/Vspheredb/Web/Widget/CpuAbsoluteUsage.php b/library/Vspheredb/Web/Widget/CpuAbsoluteUsage.php index 60c505d6..046b1527 100644 --- a/library/Vspheredb/Web/Widget/CpuAbsoluteUsage.php +++ b/library/Vspheredb/Web/Widget/CpuAbsoluteUsage.php @@ -5,11 +5,11 @@ use Icinga\Module\Vspheredb\Format; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; class CpuAbsoluteUsage extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'div'; diff --git a/library/Vspheredb/Web/Widget/CustomValueDetails.php b/library/Vspheredb/Web/Widget/CustomValueDetails.php index 7d8da5e9..c861963d 100644 --- a/library/Vspheredb/Web/Widget/CustomValueDetails.php +++ b/library/Vspheredb/Web/Widget/CustomValueDetails.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Vspheredb\Web\Widget; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\Web\Table\NameValueTable; use Icinga\Module\Vspheredb\Addon\IbmSpectrumProtect; use Icinga\Module\Vspheredb\Addon\SimpleBackupTool; @@ -17,7 +17,7 @@ class CustomValueDetails extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var HostSystem|VirtualMachine */ protected $object; diff --git a/library/Vspheredb/Web/Widget/DatastoreUsage.php b/library/Vspheredb/Web/Widget/DatastoreUsage.php index 9ea49cff..a0bfcdd7 100644 --- a/library/Vspheredb/Web/Widget/DatastoreUsage.php +++ b/library/Vspheredb/Web/Widget/DatastoreUsage.php @@ -3,17 +3,17 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Data\Anonymizer; use Icinga\Module\Vspheredb\DbObject\Datastore; use Icinga\Module\Vspheredb\Util; use Icinga\Util\Format; use ipl\Html\BaseHtmlElement; +use ipl\I18n\Translation; use ipl\Web\Compat\StyleWithNonce; class DatastoreUsage extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'div'; diff --git a/library/Vspheredb/Web/Widget/Documentation.php b/library/Vspheredb/Web/Widget/Documentation.php index 726e9b36..47bdee96 100644 --- a/library/Vspheredb/Web/Widget/Documentation.php +++ b/library/Vspheredb/Web/Widget/Documentation.php @@ -3,12 +3,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use Icinga\Application\ApplicationBootstrap; use Icinga\Application\Icinga; use Icinga\Authentication\Auth; use ipl\Html\Html; use ipl\Html\HtmlElement; +use ipl\I18n\Translation; use function preg_replace; use function rawurlencode; @@ -16,7 +16,7 @@ // Stolen from Icinga Director, removed module-specific logic class Documentation { - use TranslationHelper; + use Translation; protected const PUBLIC_URL_MAP = [ 'vspheredb' => 'icinga-vsphere-integration', diff --git a/library/Vspheredb/Web/Widget/GuestToolsStatusRenderer.php b/library/Vspheredb/Web/Widget/GuestToolsStatusRenderer.php index a5a48538..4e9ca26a 100644 --- a/library/Vspheredb/Web/Widget/GuestToolsStatusRenderer.php +++ b/library/Vspheredb/Web/Widget/GuestToolsStatusRenderer.php @@ -3,12 +3,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use ipl\Html\Html; +use ipl\I18n\Translation; class GuestToolsStatusRenderer extends Html { - use TranslationHelper; + use Translation; public function __invoke($state) { diff --git a/library/Vspheredb/Web/Widget/HostMonitoringInfo.php b/library/Vspheredb/Web/Widget/HostMonitoringInfo.php index 2037aae5..905b9299 100644 --- a/library/Vspheredb/Web/Widget/HostMonitoringInfo.php +++ b/library/Vspheredb/Web/Widget/HostMonitoringInfo.php @@ -4,17 +4,17 @@ use Exception; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Widget\Hint; use Icinga\Exception\NotFoundError; use Icinga\Module\Vspheredb\DbObject\HostSystem; use Icinga\Module\Vspheredb\DbObject\VCenter; use ipl\Html\Html; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; class HostMonitoringInfo extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var HostSystem */ protected $host; diff --git a/library/Vspheredb/Web/Widget/IcingaHostStatusRenderer.php b/library/Vspheredb/Web/Widget/IcingaHostStatusRenderer.php index 17ee1fed..5a80a670 100644 --- a/library/Vspheredb/Web/Widget/IcingaHostStatusRenderer.php +++ b/library/Vspheredb/Web/Widget/IcingaHostStatusRenderer.php @@ -3,12 +3,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use ipl\Html\Html; +use ipl\I18n\Translation; class IcingaHostStatusRenderer extends Html { - use TranslationHelper; + use Translation; public function __invoke($state) { diff --git a/library/Vspheredb/Web/Widget/Link/Html5UiLink.php b/library/Vspheredb/Web/Widget/Link/Html5UiLink.php index b0dcf031..874aa7af 100644 --- a/library/Vspheredb/Web/Widget/Link/Html5UiLink.php +++ b/library/Vspheredb/Web/Widget/Link/Html5UiLink.php @@ -2,12 +2,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Link; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\DbObject\BaseDbObject; use Icinga\Module\Vspheredb\DbObject\HostSystem; use Icinga\Module\Vspheredb\DbObject\VCenter; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use ipl\Html\BaseHtmlElement; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; use RuntimeException; @@ -16,7 +16,7 @@ class Html5UiLink extends BaseHtmlElement { - use TranslationHelper; + use Translation; public const QUERYSTRING = '/ui/#?extensionId=%s&objectId=%s&navigator=%s'; public const QUERYSTRING_LEGACY = [ diff --git a/library/Vspheredb/Web/Widget/Link/KnowledgeBaseLink.php b/library/Vspheredb/Web/Widget/Link/KnowledgeBaseLink.php index 1d1c2e1a..a1b0d0e2 100644 --- a/library/Vspheredb/Web/Widget/Link/KnowledgeBaseLink.php +++ b/library/Vspheredb/Web/Widget/Link/KnowledgeBaseLink.php @@ -2,12 +2,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Link; -use gipfl\Translation\TranslationHelper; use ipl\Html\BaseHtmlElement; +use ipl\I18n\Translation; class KnowledgeBaseLink extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'a'; diff --git a/library/Vspheredb/Web/Widget/Link/MobLink.php b/library/Vspheredb/Web/Widget/Link/MobLink.php index bf8fe887..27f21c05 100644 --- a/library/Vspheredb/Web/Widget/Link/MobLink.php +++ b/library/Vspheredb/Web/Widget/Link/MobLink.php @@ -3,20 +3,20 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Link; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use Icinga\Exception\NotFoundError; use Icinga\Module\Vspheredb\DbObject\BaseDbObject; use Icinga\Module\Vspheredb\DbObject\VCenter; use Icinga\Module\Vspheredb\DbObject\VCenterServer; use ipl\Html\Html; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; use function rawurlencode; use function sprintf; class MobLink extends HtmlDocument { - use TranslationHelper; + use Translation; protected $vCenter; diff --git a/library/Vspheredb/Web/Widget/Link/VmrcLink.php b/library/Vspheredb/Web/Widget/Link/VmrcLink.php index 0eaf5317..1faf3aca 100644 --- a/library/Vspheredb/Web/Widget/Link/VmrcLink.php +++ b/library/Vspheredb/Web/Widget/Link/VmrcLink.php @@ -3,16 +3,16 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Link; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use Icinga\Exception\NotFoundError; use Icinga\Module\Vspheredb\DbObject\VCenter; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use ipl\Html\Html; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; class VmrcLink extends HtmlDocument { - use TranslationHelper; + use Translation; protected $vCenter; diff --git a/library/Vspheredb/Web/Widget/OverallStatusRenderer.php b/library/Vspheredb/Web/Widget/OverallStatusRenderer.php index 1c753b23..49ff4cdb 100644 --- a/library/Vspheredb/Web/Widget/OverallStatusRenderer.php +++ b/library/Vspheredb/Web/Widget/OverallStatusRenderer.php @@ -3,12 +3,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use ipl\Html\Html; +use ipl\I18n\Translation; class OverallStatusRenderer extends Html { - use TranslationHelper; + use Translation; public function __invoke($state) { diff --git a/library/Vspheredb/Web/Widget/PowerStateRenderer.php b/library/Vspheredb/Web/Widget/PowerStateRenderer.php index a33182b1..0220be8e 100644 --- a/library/Vspheredb/Web/Widget/PowerStateRenderer.php +++ b/library/Vspheredb/Web/Widget/PowerStateRenderer.php @@ -3,12 +3,12 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use ipl\Html\Html; +use ipl\I18n\Translation; class PowerStateRenderer extends Html { - use TranslationHelper; + use Translation; public function __invoke($state) { diff --git a/library/Vspheredb/Web/Widget/ServiceTagRenderer.php b/library/Vspheredb/Web/Widget/ServiceTagRenderer.php index c9b9719b..6b644aaa 100644 --- a/library/Vspheredb/Web/Widget/ServiceTagRenderer.php +++ b/library/Vspheredb/Web/Widget/ServiceTagRenderer.php @@ -3,13 +3,13 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\DbObject\HostSystem; use ipl\Html\Html; +use ipl\I18n\Translation; class ServiceTagRenderer extends Html { - use TranslationHelper; + use Translation; public function __invoke($host) { diff --git a/library/Vspheredb/Web/Widget/Summaries.php b/library/Vspheredb/Web/Widget/Summaries.php index 4b86244b..31e8a2a5 100644 --- a/library/Vspheredb/Web/Widget/Summaries.php +++ b/library/Vspheredb/Web/Widget/Summaries.php @@ -4,7 +4,7 @@ use gipfl\IcingaWeb2\Icon; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; +use ipl\I18n\Translation; use gipfl\IcingaWeb2\Url; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\Web\Table\Objects\ObjectsTable; @@ -16,7 +16,7 @@ class Summaries extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'div'; diff --git a/library/Vspheredb/Web/Widget/TaggingDetails.php b/library/Vspheredb/Web/Widget/TaggingDetails.php index 2dbd96dc..ae04e6e5 100644 --- a/library/Vspheredb/Web/Widget/TaggingDetails.php +++ b/library/Vspheredb/Web/Widget/TaggingDetails.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\Json\JsonString; -use gipfl\Translation\TranslationHelper; use gipfl\Web\Table\NameValueTable; use Icinga\Module\Vspheredb\DbObject\BaseDbObject; use Icinga\Module\Vspheredb\DbObject\HostSystem; @@ -14,11 +13,12 @@ use InvalidArgumentException; use ipl\Html\Html; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; class TaggingDetails extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var HostSystem|VirtualMachine */ protected $object; diff --git a/library/Vspheredb/Web/Widget/ToggleFlagList.php b/library/Vspheredb/Web/Widget/ToggleFlagList.php index 7136aac9..b183edb4 100644 --- a/library/Vspheredb/Web/Widget/ToggleFlagList.php +++ b/library/Vspheredb/Web/Widget/ToggleFlagList.php @@ -4,14 +4,14 @@ use gipfl\IcingaWeb2\Link; use gipfl\IcingaWeb2\Url; -use gipfl\Translation\TranslationHelper; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; use Zend_Db_Select as DbSelect; abstract class ToggleFlagList extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'li'; diff --git a/library/Vspheredb/Web/Widget/UsageBar.php b/library/Vspheredb/Web/Widget/UsageBar.php index 7f7f0516..86bc2b61 100644 --- a/library/Vspheredb/Web/Widget/UsageBar.php +++ b/library/Vspheredb/Web/Widget/UsageBar.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Widget; -use gipfl\Translation\TranslationHelper; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; use ipl\Web\Compat\StyleWithNonce; class UsageBar extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'div'; diff --git a/library/Vspheredb/Web/Widget/UsageSummary.php b/library/Vspheredb/Web/Widget/UsageSummary.php index c004f0a7..c8df3cea 100644 --- a/library/Vspheredb/Web/Widget/UsageSummary.php +++ b/library/Vspheredb/Web/Widget/UsageSummary.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Widget; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Format; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; class UsageSummary extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'div'; diff --git a/library/Vspheredb/Web/Widget/VCenterSyncInfo.php b/library/Vspheredb/Web/Widget/VCenterSyncInfo.php index 6a5ebad4..253df408 100644 --- a/library/Vspheredb/Web/Widget/VCenterSyncInfo.php +++ b/library/Vspheredb/Web/Widget/VCenterSyncInfo.php @@ -2,16 +2,16 @@ namespace Icinga\Module\Vspheredb\Web\Widget; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\DbObject\VCenter; use Icinga\Module\Vspheredb\Sync\VcenterSyncState; use Icinga\Module\Vspheredb\WebUtil; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; class VCenterSyncInfo extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'div'; diff --git a/library/Vspheredb/Web/Widget/Vm/BackupToolInfo.php b/library/Vspheredb/Web/Widget/Vm/BackupToolInfo.php index 337bb805..52f80bdb 100644 --- a/library/Vspheredb/Web/Widget/Vm/BackupToolInfo.php +++ b/library/Vspheredb/Web/Widget/Vm/BackupToolInfo.php @@ -2,7 +2,6 @@ namespace Icinga\Module\Vspheredb\Web\Widget\Vm; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Addon\BackupTool; use Icinga\Module\Vspheredb\Addon\IbmSpectrumProtect; use Icinga\Module\Vspheredb\Addon\NetBackup; @@ -12,10 +11,11 @@ use Icinga\Module\Vspheredb\Web\Widget\SubTitle; use ipl\Html\Html; use ipl\Html\HtmlDocument; +use ipl\I18n\Translation; class BackupToolInfo extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $vm; diff --git a/library/Vspheredb/Web/Widget/VmHardwareTree.php b/library/Vspheredb/Web/Widget/VmHardwareTree.php index effe65a6..144fcf41 100644 --- a/library/Vspheredb/Web/Widget/VmHardwareTree.php +++ b/library/Vspheredb/Web/Widget/VmHardwareTree.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Link; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Db; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use Icinga\Module\Vspheredb\PathLookup; @@ -11,11 +10,12 @@ use Icinga\Util\Format; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; use Ramsey\Uuid\Uuid; class VmHardwareTree extends BaseHtmlElement { - use TranslationHelper; + use Translation; protected $tag = 'ul'; diff --git a/library/Vspheredb/Web/Widget/VmHeader.php b/library/Vspheredb/Web/Widget/VmHeader.php index 3523aae9..f5609dc4 100644 --- a/library/Vspheredb/Web/Widget/VmHeader.php +++ b/library/Vspheredb/Web/Widget/VmHeader.php @@ -3,16 +3,16 @@ namespace Icinga\Module\Vspheredb\Web\Widget; use gipfl\IcingaWeb2\Icon; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\Data\Anonymizer; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use Icinga\Module\Vspheredb\DbObject\VmQuickStats; use ipl\Html\BaseHtmlElement; use ipl\Html\Html; +use ipl\I18n\Translation; class VmHeader extends BaseHtmlElement { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $vm; diff --git a/library/Vspheredb/Web/Widget/VmRouteConfigTable.php b/library/Vspheredb/Web/Widget/VmRouteConfigTable.php index 093c2ec2..f85daa9d 100644 --- a/library/Vspheredb/Web/Widget/VmRouteConfigTable.php +++ b/library/Vspheredb/Web/Widget/VmRouteConfigTable.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Vspheredb\Web\Widget; -use gipfl\Translation\TranslationHelper; use Icinga\Module\Vspheredb\DbObject\VirtualMachine; use ipl\Html\HtmlDocument; use ipl\Html\Table; +use ipl\I18n\Translation; class VmRouteConfigTable extends HtmlDocument { - use TranslationHelper; + use Translation; /** @var VirtualMachine */ protected $object;