From c6cd99f9db96457186482f9359dbf1f935ee83d1 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 17 Feb 2016 11:49:56 +0100 Subject: [PATCH] Hooks: remove last traces of Web\Hook --- application/forms/DirectorDatafieldForm.php | 2 +- application/forms/ImportRowModifierForm.php | 1 - application/forms/SyncPropertyForm.php | 6 +++--- application/forms/SyncRuleForm.php | 1 - application/tables/ImportsourceHookTable.php | 2 +- library/Director/IcingaConfig/IcingaConfig.php | 4 ++-- library/Director/Import/Import.php | 4 ++-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/application/forms/DirectorDatafieldForm.php b/application/forms/DirectorDatafieldForm.php index f420a5aa..dc8f002a 100644 --- a/application/forms/DirectorDatafieldForm.php +++ b/application/forms/DirectorDatafieldForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Forms; use Icinga\Exception\ConfigurationError; use Icinga\Module\Director\Web\Form\DirectorObjectForm; -use Icinga\Web\Hook; +use Icinga\Application\Hook; use Exception; class DirectorDatafieldForm extends DirectorObjectForm diff --git a/application/forms/ImportRowModifierForm.php b/application/forms/ImportRowModifierForm.php index e69a1b2f..a078611d 100644 --- a/application/forms/ImportRowModifierForm.php +++ b/application/forms/ImportRowModifierForm.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Director\Forms; use Icinga\Module\Director\Web\Form\DirectorObjectForm; -use Icinga\Web\Hook; class ImportRowModifierForm extends DirectorObjectForm { diff --git a/application/forms/SyncPropertyForm.php b/application/forms/SyncPropertyForm.php index df0ddbd4..473b6201 100644 --- a/application/forms/SyncPropertyForm.php +++ b/application/forms/SyncPropertyForm.php @@ -2,13 +2,13 @@ namespace Icinga\Module\Director\Forms; -use Icinga\Module\Director\Web\Form\DirectorObjectForm; +use Exception; use Icinga\Exception\InvalidPropertyException; +use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\SyncRule; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\ImportSource; -use Icinga\Module\Director\Web\Hook\ImportSourceHook; -use Exception; +use Icinga\Module\Director\Web\Form\DirectorObjectForm; class SyncPropertyForm extends DirectorObjectForm { diff --git a/application/forms/SyncRuleForm.php b/application/forms/SyncRuleForm.php index 10e15498..a036f54a 100644 --- a/application/forms/SyncRuleForm.php +++ b/application/forms/SyncRuleForm.php @@ -3,7 +3,6 @@ namespace Icinga\Module\Director\Forms; use Icinga\Module\Director\Web\Form\DirectorObjectForm; -use Icinga\Web\Hook; class SyncRuleForm extends DirectorObjectForm { diff --git a/application/tables/ImportsourceHookTable.php b/application/tables/ImportsourceHookTable.php index f03f7b66..d8f3d2d0 100644 --- a/application/tables/ImportsourceHookTable.php +++ b/application/tables/ImportsourceHookTable.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Tables; use Icinga\Data\DataArray\ArrayDatasource; use Icinga\Data\Paginatable; +use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\ImportSource; -use Icinga\Module\Director\Web\Hook\ImportSourceHook; use Icinga\Module\Director\Web\Table\QuickTable; class ImportsourceHookTable extends QuickTable diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php index 131724bc..aca1b9c4 100644 --- a/library/Director/IcingaConfig/IcingaConfig.php +++ b/library/Director/IcingaConfig/IcingaConfig.php @@ -2,14 +2,14 @@ namespace Icinga\Module\Director\IcingaConfig; +use Icinga\Application\Benchmark; +use Icinga\Application\Hook; use Icinga\Exception\ProgrammingError; use Icinga\Module\Director\Db; use Icinga\Module\Director\Util; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Objects\IcingaZone; use Icinga\Module\Director\Objects\IcingaEndpoint; -use Icinga\Application\Benchmark; -use Icinga\Web\Hook; use Exception; class IcingaConfig diff --git a/library/Director/Import/Import.php b/library/Director/Import/Import.php index a728bebc..471f3233 100644 --- a/library/Director/Import/Import.php +++ b/library/Director/Import/Import.php @@ -2,10 +2,10 @@ namespace Icinga\Module\Director\Import; +use Icinga\Exception\IcingaException; +use Icinga\Module\Director\Hook\ImportSourceHook; use Icinga\Module\Director\Objects\ImportSource; use Icinga\Module\Director\Util; -use Icinga\Module\Director\Web\Hook\ImportSourceHook; -use Icinga\Exception\IcingaException; use stdClass; class Import