From 7b65efee23846beb10603bff115c8b75bb7c66fc Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 17 Feb 2016 10:49:28 +0100 Subject: [PATCH] Hooks: get rid of legacy pre 2.1 hook classes In case you already implemented such you have to adjust your implementations. Just replace Director/Web/Hook with Director/Hook. Sorry for the inconvenience. Compat classes would have been possible, but as Director isn't stable yet I'd like to avoid doing so. --- library/Director/DataType/DataTypeDatalist.php | 2 +- library/Director/DataType/DataTypeNumber.php | 2 +- library/Director/DataType/DataTypeSqlQuery.php | 2 +- library/Director/DataType/DataTypeString.php | 2 +- library/Director/DataType/DataTypeTime.php | 2 +- library/Director/{Web => }/Hook/DataTypeHook.php | 2 +- .../Director/{Web => }/Hook/ImportSourceHook.php | 2 +- .../{Web => }/Hook/PropertyModifierHook.php | 2 +- .../{Web => }/Hook/ShipConfigFilesHook.php | 2 +- library/Director/Import/ImportSourceCoreApi.php | 2 +- library/Director/Import/ImportSourceLdap.php | 2 +- library/Director/Import/ImportSourceSql.php | 2 +- run.php | 15 ++++++++------- 13 files changed, 20 insertions(+), 19 deletions(-) rename library/Director/{Web => }/Hook/DataTypeHook.php (95%) rename library/Director/{Web => }/Hook/ImportSourceHook.php (98%) rename library/Director/{Web => }/Hook/PropertyModifierHook.php (97%) rename library/Director/{Web => }/Hook/ShipConfigFilesHook.php (72%) diff --git a/library/Director/DataType/DataTypeDatalist.php b/library/Director/DataType/DataTypeDatalist.php index 37df5343..6f38e561 100644 --- a/library/Director/DataType/DataTypeDatalist.php +++ b/library/Director/DataType/DataTypeDatalist.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\DataType; +use Icinga\Module\Director\Hook\DataTypeHook; use Icinga\Module\Director\Web\Form\QuickForm; -use Icinga\Module\Director\Web\Hook\DataTypeHook; class DataTypeDatalist extends DataTypeHook { diff --git a/library/Director/DataType/DataTypeNumber.php b/library/Director/DataType/DataTypeNumber.php index 5f54dbd2..d0c26b6a 100644 --- a/library/Director/DataType/DataTypeNumber.php +++ b/library/Director/DataType/DataTypeNumber.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\DataType; +use Icinga\Module\Director\Hook\DataTypeHook; use Icinga\Module\Director\Web\Form\QuickForm; -use Icinga\Module\Director\Web\Hook\DataTypeHook; class DataTypeNumber extends DataTypeHook { diff --git a/library/Director/DataType/DataTypeSqlQuery.php b/library/Director/DataType/DataTypeSqlQuery.php index 84df22e5..01d18bcc 100644 --- a/library/Director/DataType/DataTypeSqlQuery.php +++ b/library/Director/DataType/DataTypeSqlQuery.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Director\DataType; use Exception; use Icinga\Data\Db\DbConnection; +use Icinga\Module\Director\Hook\DataTypeHook; use Icinga\Module\Director\Web\Form\QuickForm; -use Icinga\Module\Director\Web\Hook\DataTypeHook; use Icinga\Module\Director\Util; class DataTypeSqlQuery extends DataTypeHook diff --git a/library/Director/DataType/DataTypeString.php b/library/Director/DataType/DataTypeString.php index 73ebcb21..db6a284d 100644 --- a/library/Director/DataType/DataTypeString.php +++ b/library/Director/DataType/DataTypeString.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\DataType; +use Icinga\Module\Director\Hook\DataTypeHook; use Icinga\Module\Director\Web\Form\QuickForm; -use Icinga\Module\Director\Web\Hook\DataTypeHook; class DataTypeString extends DataTypeHook { diff --git a/library/Director/DataType/DataTypeTime.php b/library/Director/DataType/DataTypeTime.php index f360782f..13b96355 100644 --- a/library/Director/DataType/DataTypeTime.php +++ b/library/Director/DataType/DataTypeTime.php @@ -2,8 +2,8 @@ namespace Icinga\Module\Director\DataType; +use Icinga\Module\Director\Hook\DataTypeHook; use Icinga\Module\Director\Web\Form\QuickForm; -use Icinga\Module\Director\Web\Hook\DataTypeHook; class DataTypeTime extends DataTypeHook { diff --git a/library/Director/Web/Hook/DataTypeHook.php b/library/Director/Hook/DataTypeHook.php similarity index 95% rename from library/Director/Web/Hook/DataTypeHook.php rename to library/Director/Hook/DataTypeHook.php index 3bb3dabe..3ed41dc3 100644 --- a/library/Director/Web/Hook/DataTypeHook.php +++ b/library/Director/Hook/DataTypeHook.php @@ -1,6 +1,6 @@ provideHook('monitoring/HostActions'); $this->provideHook('monitoring/ServiceActions'); -$this->registerHook('Director\\ImportSource', '\\Icinga\\Module\\Director\\Import\\ImportSourceSql', 'sql'); -$this->registerHook('Director\\ImportSource', '\\Icinga\\Module\\Director\\Import\\ImportSourceLdap', 'ldap'); + +$this->provideHook('director/ImportSource', '\\Icinga\\Module\\Director\\Import\\ImportSourceSql'); +$this->provideHook('director/ImportSource', '\\Icinga\\Module\\Director\\Import\\ImportSourceLdap'); $this->provideHook('director/ImportSource', '\\Icinga\\Module\\Director\\Import\\ImportSourceCoreApi'); -$this->registerHook('Director\\DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeString', 'string'); -$this->registerHook('Director\\DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeNumber', 'number'); -$this->registerHook('Director\\DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeTime', 'time'); -$this->registerHook('Director\\DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeDatalist', 'datalist'); -$this->registerHook('Director\\DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeSqlQuery', 'sqlquery'); +$this->provideHook('director/DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeString'); +$this->provideHook('director/DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeNumber'); +$this->provideHook('director/DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeTime'); +$this->provideHook('director/DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeDatalist'); +$this->provideHook('director/DataType', '\\Icinga\\Module\\Director\\DataType\\DataTypeSqlQuery');