tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 16:54:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hooks: get rid of legacy pre 2.1 hook classes

Browse Source 
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.
This commit is contained in:
Thomas Gelf 2016-02-17 10:49:28 +01:00
parent 2a173b7cd3
commit 7b65efee23
13 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Director/DataType/DataTypeDatalist.php
View File

@ -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
{

2
library/Director/DataType/DataTypeNumber.php
View File

@ -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
{

2
library/Director/DataType/DataTypeSqlQuery.php
View File

@ -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

2
library/Director/DataType/DataTypeString.php
View File

@ -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
{

2
library/Director/DataType/DataTypeTime.php
View File

@ -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
{

2
library/Director/Web/Hook/DataTypeHook.php → library/Director/Hook/DataTypeHook.php
View File

@ -1,6 +1,6 @@
<?php
namespace Icinga\Module\Director\Web\Hook;
namespace Icinga\Module\Director\Hook;
use Icinga\Module\Director\Web\Form\QuickForm;

2
library/Director/Web/Hook/ImportSourceHook.php → library/Director/Hook/ImportSourceHook.php
View File

@ -1,6 +1,6 @@
<?php
namespace Icinga\Module\Director\Web\Hook;
namespace Icinga\Module\Director\Hook;
use Icinga\Module\Director\Web\Form\QuickForm;
use Icinga\Module\Director\Db;

2
library/Director/Web/Hook/PropertyModifierHook.php → library/Director/Hook/PropertyModifierHook.php
View File

@ -1,6 +1,6 @@
<?php
namespace Icinga\Module\Director\Web\Hook;
namespace Icinga\Module\Director\Hook;
use Icinga\Module\Director\Web\Form\QuickForm;
use Icinga\Module\Director\Db;

2
library/Director/Web/Hook/ShipConfigFilesHook.php → library/Director/Hook/ShipConfigFilesHook.php
View File

@ -1,6 +1,6 @@
<?php
namespace Icinga\Module\Director\Web\Hook;
namespace Icinga\Module\Director\Hook;
abstract class ShipConfigFilesHook
{

2
library/Director/Import/ImportSourceCoreApi.php
View File

@ -6,9 +6,9 @@ use Icinga\Application\Config;
use Icinga\Module\Director\Db;
use Icinga\Module\Director\Core\CoreApi;
use Icinga\Module\Director\Core\RestApiClient;
use Icinga\Module\Director\Hook\ImportSourceHook;
use Icinga\Module\Director\Util;
use Icinga\Module\Director\Web\Form\QuickForm;
use Icinga\Module\Director\Web\Hook\ImportSourceHook;
class ImportSourceCoreApi extends ImportSourceHook
{

2
library/Director/Import/ImportSourceLdap.php
View File

@ -3,9 +3,9 @@
namespace Icinga\Module\Director\Import;
use Icinga\Data\ResourceFactory;
use Icinga\Module\Director\Hook\ImportSourceHook;
use Icinga\Module\Director\Util;
use Icinga\Module\Director\Web\Form\QuickForm;
use Icinga\Module\Director\Web\Hook\ImportSourceHook;
class ImportSourceLdap extends ImportSourceHook
{

2
library/Director/Import/ImportSourceSql.php
View File

@ -3,9 +3,9 @@
namespace Icinga\Module\Director\Import;
use Icinga\Data\Db\DbConnection;
use Icinga\Module\Director\Hook\ImportSourceHook;
use Icinga\Module\Director\Util;
use Icinga\Module\Director\Web\Form\QuickForm;
use Icinga\Module\Director\Web\Hook\ImportSourceHook;
class ImportSourceSql extends ImportSourceHook
{

15
run.php
View File

@ -2,12 +2,13 @@
$this->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');