From 775c20d9ad9ef7e74309a822ae15538fecb408aa Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Nov 2014 10:57:14 +0100 Subject: [PATCH 1/4] Rename namespace Icinga\Form to Icinga\Forms refs #7553 --- application/controllers/AuthenticationController.php | 2 +- application/controllers/ConfigController.php | 10 +++++----- application/controllers/DashboardController.php | 2 +- application/controllers/PreferenceController.php | 2 +- application/forms/Authentication/LoginForm.php | 2 +- .../Config/Authentication/AutologinBackendForm.php | 2 +- .../forms/Config/Authentication/DbBackendForm.php | 2 +- .../forms/Config/Authentication/LdapBackendForm.php | 2 +- .../forms/Config/AuthenticationBackendConfigForm.php | 10 +++++----- .../Config/AuthenticationBackendReorderForm.php | 4 ++-- .../forms/Config/General/ApplicationConfigForm.php | 2 +- .../forms/Config/General/LoggingConfigForm.php | 2 +- application/forms/Config/GeneralConfigForm.php | 8 ++++---- application/forms/Config/Resource/DbResourceForm.php | 2 +- .../forms/Config/Resource/FileResourceForm.php | 2 +- .../forms/Config/Resource/LdapResourceForm.php | 2 +- .../forms/Config/Resource/LivestatusResourceForm.php | 2 +- application/forms/Config/ResourceConfigForm.php | 12 ++++++------ application/forms/ConfigForm.php | 2 +- application/forms/ConfirmRemovalForm.php | 2 +- application/forms/Dashboard/AddUrlForm.php | 2 +- application/forms/LdapDiscoveryForm.php | 2 +- application/forms/PreferenceForm.php | 2 +- library/Icinga/Application/Web.php | 4 ++-- .../application/controllers/ConfigController.php | 2 +- .../application/forms/Config/BackendConfigForm.php | 2 +- .../application/forms/Config/InstanceConfigForm.php | 2 +- .../application/forms/Config/SecurityConfigForm.php | 2 +- .../application/forms/Setup/IdoResourcePage.php | 2 +- .../forms/Setup/LivestatusResourcePage.php | 2 +- modules/setup/application/forms/AuthBackendPage.php | 6 +++--- modules/setup/application/forms/DbResourcePage.php | 2 +- .../setup/application/forms/GeneralConfigPage.php | 2 +- .../setup/application/forms/LdapDiscoveryPage.php | 2 +- modules/setup/application/forms/LdapResourcePage.php | 2 +- .../Config/Authentication/DbBackendFormTest.php | 4 ++-- .../Config/Authentication/LdapBackendFormTest.php | 4 ++-- .../Config/AuthenticationBackendReorderFormTest.php | 6 +++--- .../forms/Config/Resource/DbResourceFormTest.php | 4 ++-- .../forms/Config/Resource/LdapResourceFormTest.php | 4 ++-- .../Config/Resource/LivestatusResourceFormTest.php | 4 ++-- test/php/bootstrap.php | 2 +- 42 files changed, 69 insertions(+), 69 deletions(-) diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index 441a84dee..820718c0c 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -6,7 +6,7 @@ use Icinga\Authentication\Backend\AutoLoginBackend; use Icinga\Web\Controller\ActionController; -use Icinga\Form\Authentication\LoginForm; +use Icinga\Forms\Authentication\LoginForm; use Icinga\Authentication\AuthChain; use Icinga\Application\Config; use Icinga\Application\Logger; diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index a681c4255..11d011bc0 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -8,11 +8,11 @@ use Icinga\Application\Modules\Module; use Icinga\Web\Widget; use Icinga\Application\Icinga; use Icinga\Application\Config; -use Icinga\Form\Config\GeneralConfigForm; -use Icinga\Form\Config\AuthenticationBackendReorderForm; -use Icinga\Form\Config\AuthenticationBackendConfigForm; -use Icinga\Form\Config\ResourceConfigForm; -use Icinga\Form\ConfirmRemovalForm; +use Icinga\Forms\Config\GeneralConfigForm; +use Icinga\Forms\Config\AuthenticationBackendReorderForm; +use Icinga\Forms\Config\AuthenticationBackendConfigForm; +use Icinga\Forms\Config\ResourceConfigForm; +use Icinga\Forms\ConfirmRemovalForm; use Icinga\Data\ResourceFactory; diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 51435d727..d357231ca 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -8,7 +8,7 @@ use Icinga\Exception\ConfigurationError; use Icinga\Exception\IcingaException; use Icinga\Exception\NotReadableError; use Icinga\File\Ini\IniWriter; -use Icinga\Form\Dashboard\AddUrlForm; +use Icinga\Forms\Dashboard\AddUrlForm; use Icinga\Web\Controller\ActionController; use Icinga\Web\Url; use Icinga\Web\Widget\Dashboard; diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php index 442c27ba8..378a5aa34 100644 --- a/application/controllers/PreferenceController.php +++ b/application/controllers/PreferenceController.php @@ -6,7 +6,7 @@ use Icinga\Web\Controller\BasePreferenceController; use Icinga\Web\Url; use Icinga\Web\Widget\Tab; use Icinga\Application\Config; -use Icinga\Form\PreferenceForm; +use Icinga\Forms\PreferenceForm; use Icinga\Exception\ConfigurationError; use Icinga\User\Preferences\PreferencesStore; diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php index 0afc56749..a6d69d15a 100644 --- a/application/forms/Authentication/LoginForm.php +++ b/application/forms/Authentication/LoginForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Authentication; +namespace Icinga\Forms\Authentication; use Icinga\Web\Form; use Icinga\Web\Url; diff --git a/application/forms/Config/Authentication/AutologinBackendForm.php b/application/forms/Config/Authentication/AutologinBackendForm.php index 0a53de6bd..1725ea3c9 100644 --- a/application/forms/Config/Authentication/AutologinBackendForm.php +++ b/application/forms/Config/Authentication/AutologinBackendForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Authentication; +namespace Icinga\Forms\Config\Authentication; use Zend_Validate_Callback; use Icinga\Web\Form; diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php index 0ffaa2a1e..14570b0ae 100644 --- a/application/forms/Config/Authentication/DbBackendForm.php +++ b/application/forms/Config/Authentication/DbBackendForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Authentication; +namespace Icinga\Forms\Config\Authentication; use Exception; use Icinga\Application\Config; diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php index 84298e3c6..b865395d9 100644 --- a/application/forms/Config/Authentication/LdapBackendForm.php +++ b/application/forms/Config/Authentication/LdapBackendForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Authentication; +namespace Icinga\Forms\Config\Authentication; use Exception; use Icinga\Application\Config; diff --git a/application/forms/Config/AuthenticationBackendConfigForm.php b/application/forms/Config/AuthenticationBackendConfigForm.php index 33e0b1a3a..8038b5347 100644 --- a/application/forms/Config/AuthenticationBackendConfigForm.php +++ b/application/forms/Config/AuthenticationBackendConfigForm.php @@ -2,19 +2,19 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config; +namespace Icinga\Forms\Config; use InvalidArgumentException; use Icinga\Web\Request; -use Icinga\Form\ConfigForm; +use Icinga\Forms\ConfigForm; use Icinga\Web\Notification; use Icinga\Application\Config; use Icinga\Application\Platform; use Icinga\Data\ResourceFactory; use Icinga\Exception\ConfigurationError; -use Icinga\Form\Config\Authentication\DbBackendForm; -use Icinga\Form\Config\Authentication\LdapBackendForm; -use Icinga\Form\Config\Authentication\AutologinBackendForm; +use Icinga\Forms\Config\Authentication\DbBackendForm; +use Icinga\Forms\Config\Authentication\LdapBackendForm; +use Icinga\Forms\Config\Authentication\AutologinBackendForm; class AuthenticationBackendConfigForm extends ConfigForm { diff --git a/application/forms/Config/AuthenticationBackendReorderForm.php b/application/forms/Config/AuthenticationBackendReorderForm.php index 3b5e70866..90eeb6b90 100644 --- a/application/forms/Config/AuthenticationBackendReorderForm.php +++ b/application/forms/Config/AuthenticationBackendReorderForm.php @@ -2,12 +2,12 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config; +namespace Icinga\Forms\Config; use InvalidArgumentException; use Icinga\Web\Request; use Icinga\Web\Notification; -use Icinga\Form\ConfigForm; +use Icinga\Forms\ConfigForm; class AuthenticationBackendReorderForm extends ConfigForm { diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php index bc236ae81..df8531250 100644 --- a/application/forms/Config/General/ApplicationConfigForm.php +++ b/application/forms/Config/General/ApplicationConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\General; +namespace Icinga\Forms\Config\General; use DateTimeZone; use Icinga\Application\Icinga; diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php index bddb648cd..deed06011 100644 --- a/application/forms/Config/General/LoggingConfigForm.php +++ b/application/forms/Config/General/LoggingConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\General; +namespace Icinga\Forms\Config\General; use Icinga\Application\Icinga; use Icinga\Application\Logger; diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php index 0b55704c2..70d131695 100644 --- a/application/forms/Config/GeneralConfigForm.php +++ b/application/forms/Config/GeneralConfigForm.php @@ -2,13 +2,13 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config; +namespace Icinga\Forms\Config; use Icinga\Web\Request; use Icinga\Web\Notification; -use Icinga\Form\ConfigForm; -use Icinga\Form\Config\General\LoggingConfigForm; -use Icinga\Form\Config\General\ApplicationConfigForm; +use Icinga\Forms\ConfigForm; +use Icinga\Forms\Config\General\LoggingConfigForm; +use Icinga\Forms\Config\General\ApplicationConfigForm; /** * Form class for application-wide and logging specific settings diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php index 43075579e..46339fc6e 100644 --- a/application/forms/Config/Resource/DbResourceForm.php +++ b/application/forms/Config/Resource/DbResourceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Resource; +namespace Icinga\Forms\Config\Resource; use Exception; use Icinga\Application\Config; diff --git a/application/forms/Config/Resource/FileResourceForm.php b/application/forms/Config/Resource/FileResourceForm.php index 2814e9a72..8e2920313 100644 --- a/application/forms/Config/Resource/FileResourceForm.php +++ b/application/forms/Config/Resource/FileResourceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Resource; +namespace Icinga\Forms\Config\Resource; use Icinga\Web\Form; use Icinga\Web\Form\Validator\ReadablePathValidator; diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php index 237df62bf..01dd16e80 100644 --- a/application/forms/Config/Resource/LdapResourceForm.php +++ b/application/forms/Config/Resource/LdapResourceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Resource; +namespace Icinga\Forms\Config\Resource; use Exception; use Icinga\Application\Config; diff --git a/application/forms/Config/Resource/LivestatusResourceForm.php b/application/forms/Config/Resource/LivestatusResourceForm.php index 27925e370..5766caaec 100644 --- a/application/forms/Config/Resource/LivestatusResourceForm.php +++ b/application/forms/Config/Resource/LivestatusResourceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config\Resource; +namespace Icinga\Forms\Config\Resource; use Exception; use Icinga\Application\Config; diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php index a269885cf..10a853874 100644 --- a/application/forms/Config/ResourceConfigForm.php +++ b/application/forms/Config/ResourceConfigForm.php @@ -2,16 +2,16 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Config; +namespace Icinga\Forms\Config; use InvalidArgumentException; use Icinga\Web\Request; use Icinga\Web\Notification; -use Icinga\Form\ConfigForm; -use Icinga\Form\Config\Resource\DbResourceForm; -use Icinga\Form\Config\Resource\FileResourceForm; -use Icinga\Form\Config\Resource\LdapResourceForm; -use Icinga\Form\Config\Resource\LivestatusResourceForm; +use Icinga\Forms\ConfigForm; +use Icinga\Forms\Config\Resource\DbResourceForm; +use Icinga\Forms\Config\Resource\FileResourceForm; +use Icinga\Forms\Config\Resource\LdapResourceForm; +use Icinga\Forms\Config\Resource\LivestatusResourceForm; use Icinga\Application\Platform; use Icinga\Exception\ConfigurationError; diff --git a/application/forms/ConfigForm.php b/application/forms/ConfigForm.php index d1f2ed1dd..fcf674cad 100644 --- a/application/forms/ConfigForm.php +++ b/application/forms/ConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form; +namespace Icinga\Forms; use Exception; use Icinga\Web\Form; diff --git a/application/forms/ConfirmRemovalForm.php b/application/forms/ConfirmRemovalForm.php index 86a2eb02a..02d7263df 100644 --- a/application/forms/ConfirmRemovalForm.php +++ b/application/forms/ConfirmRemovalForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form; +namespace Icinga\Forms; use Icinga\Web\Form; diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php index 564ff3d7a..7f5a217d1 100644 --- a/application/forms/Dashboard/AddUrlForm.php +++ b/application/forms/Dashboard/AddUrlForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Dashboard; +namespace Icinga\Forms\Dashboard; use Icinga\Application\Config; use Icinga\Web\Widget\Dashboard; diff --git a/application/forms/LdapDiscoveryForm.php b/application/forms/LdapDiscoveryForm.php index eccf43ae0..9e5af79ac 100644 --- a/application/forms/LdapDiscoveryForm.php +++ b/application/forms/LdapDiscoveryForm.php @@ -1,6 +1,6 @@ getLoader()->registerNamespace( - 'Icinga\\Form', + 'Icinga\\Forms', $this->getApplicationDir('forms') ); return $this; diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php index cfdd73360..bae10ed17 100644 --- a/modules/monitoring/application/controllers/ConfigController.php +++ b/modules/monitoring/application/controllers/ConfigController.php @@ -4,7 +4,7 @@ use Icinga\Web\Notification; use Icinga\Data\ResourceFactory; -use Icinga\Form\ConfirmRemovalForm; +use Icinga\Forms\ConfirmRemovalForm; use Icinga\Web\Controller\ModuleActionController; use Icinga\Module\Monitoring\Form\Config\BackendConfigForm; use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm; diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php index e18e882ca..237542d74 100644 --- a/modules/monitoring/application/forms/Config/BackendConfigForm.php +++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php @@ -7,7 +7,7 @@ namespace Icinga\Module\Monitoring\Form\Config; use InvalidArgumentException; use Icinga\Web\Request; use Icinga\Web\Notification; -use Icinga\Form\ConfigForm; +use Icinga\Forms\ConfigForm; use Icinga\Application\Config; use Icinga\Exception\ConfigurationError; diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php index 2971cb663..fcfbabd82 100644 --- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php +++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php @@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Form\Config; use InvalidArgumentException; use Icinga\Exception\ConfigurationError; -use Icinga\Form\ConfigForm; +use Icinga\Forms\ConfigForm; use Icinga\Module\Monitoring\Command\Transport\LocalCommandFile; use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile; use Icinga\Module\Monitoring\Form\Config\Instance\LocalInstanceForm; diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php index c7e8d7efb..14911bbd4 100644 --- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php +++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php @@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Form\Config; use Icinga\Web\Request; use Icinga\Web\Notification; -use Icinga\Form\ConfigForm; +use Icinga\Forms\ConfigForm; /** * Form for modifying security relevant settings diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php index c6fd33c46..7c839e8d2 100644 --- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php +++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Form\Setup; use Icinga\Web\Form; -use Icinga\Form\Config\Resource\DbResourceForm; +use Icinga\Forms\Config\Resource\DbResourceForm; class IdoResourcePage extends Form { diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php index abecd0b73..884760eb1 100644 --- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php +++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Form\Setup; use Icinga\Web\Form; -use Icinga\Form\Config\Resource\LivestatusResourceForm; +use Icinga\Forms\Config\Resource\LivestatusResourceForm; class LivestatusResourcePage extends Form { diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php index dd3e12361..8cfd88981 100644 --- a/modules/setup/application/forms/AuthBackendPage.php +++ b/modules/setup/application/forms/AuthBackendPage.php @@ -6,9 +6,9 @@ namespace Icinga\Module\Setup\Form; use Icinga\Application\Config; use Icinga\Web\Form; -use Icinga\Form\Config\Authentication\DbBackendForm; -use Icinga\Form\Config\Authentication\LdapBackendForm; -use Icinga\Form\Config\Authentication\AutologinBackendForm; +use Icinga\Forms\Config\Authentication\DbBackendForm; +use Icinga\Forms\Config\Authentication\LdapBackendForm; +use Icinga\Forms\Config\Authentication\AutologinBackendForm; /** * Wizard page to define authentication backend specific details diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php index 45d256e0f..ef29ba0af 100644 --- a/modules/setup/application/forms/DbResourcePage.php +++ b/modules/setup/application/forms/DbResourcePage.php @@ -6,7 +6,7 @@ namespace Icinga\Module\Setup\Form; use PDOException; use Icinga\Web\Form; -use Icinga\Form\Config\Resource\DbResourceForm; +use Icinga\Forms\Config\Resource\DbResourceForm; use Icinga\Module\Setup\Utils\DbTool; /** diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php index e8bb6f2bc..84d4e9c46 100644 --- a/modules/setup/application/forms/GeneralConfigPage.php +++ b/modules/setup/application/forms/GeneralConfigPage.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; -use Icinga\Form\Config\General\LoggingConfigForm; +use Icinga\Forms\Config\General\LoggingConfigForm; /** * Wizard page to define the application and logging configuration diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php index 6aa2f43d8..289176c4c 100644 --- a/modules/setup/application/forms/LdapDiscoveryPage.php +++ b/modules/setup/application/forms/LdapDiscoveryPage.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; -use Icinga\Form\LdapDiscoveryForm; +use Icinga\Forms\LdapDiscoveryForm; /** * Wizard page to define the connection details for a LDAP resource diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php index b55a4e65b..c02846f58 100644 --- a/modules/setup/application/forms/LdapResourcePage.php +++ b/modules/setup/application/forms/LdapResourcePage.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; -use Icinga\Form\Config\Resource\LdapResourceForm; +use Icinga\Forms\Config\Resource\LdapResourceForm; /** * Wizard page to define the connection details for a LDAP resource diff --git a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php index 60d5a0506..3157f4e0e 100644 --- a/test/php/application/forms/Config/Authentication/DbBackendFormTest.php +++ b/test/php/application/forms/Config/Authentication/DbBackendFormTest.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Tests\Icinga\Form\Config\Authentication; +namespace Tests\Icinga\Forms\Config\Authentication; // Necessary as some of these tests disable phpunit's preservation // of the global state (e.g. autoloaders are in the global state) @@ -11,7 +11,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); use Mockery; use Icinga\Application\Config; use Icinga\Test\BaseTestCase; -use Icinga\Form\Config\Authentication\DbBackendForm; +use Icinga\Forms\Config\Authentication\DbBackendForm; class DbBackendFormTest extends BaseTestCase { diff --git a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php index ac7834489..6126cbb9c 100644 --- a/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php +++ b/test/php/application/forms/Config/Authentication/LdapBackendFormTest.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Tests\Icinga\Form\Config\Authentication; +namespace Tests\Icinga\Forms\Config\Authentication; // Necessary as some of these tests disable phpunit's preservation // of the global state (e.g. autoloaders are in the global state) @@ -11,7 +11,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); use Mockery; use Icinga\Test\BaseTestCase; use Icinga\Application\Config; -use Icinga\Form\Config\Authentication\LdapBackendForm; +use Icinga\Forms\Config\Authentication\LdapBackendForm; use Icinga\Exception\AuthenticationException; class LdapBackendFormTest extends BaseTestCase diff --git a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php index c79b12fd9..936bf9366 100644 --- a/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php +++ b/test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php @@ -2,12 +2,12 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Tests\Icinga\Form\Config; +namespace Tests\Icinga\Forms\Config; use Icinga\Test\BaseTestCase; use Icinga\Application\Config; -use Icinga\Form\Config\AuthenticationBackendConfigForm; -use Icinga\Form\Config\AuthenticationBackendReorderForm; +use Icinga\Forms\Config\AuthenticationBackendConfigForm; +use Icinga\Forms\Config\AuthenticationBackendReorderForm; class AuthenticationBackendConfigFormWithoutSave extends AuthenticationBackendConfigForm { diff --git a/test/php/application/forms/Config/Resource/DbResourceFormTest.php b/test/php/application/forms/Config/Resource/DbResourceFormTest.php index 1ee39a4fa..d6e7fc447 100644 --- a/test/php/application/forms/Config/Resource/DbResourceFormTest.php +++ b/test/php/application/forms/Config/Resource/DbResourceFormTest.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Tests\Icinga\Form\Config\Resource; +namespace Tests\Icinga\Forms\Config\Resource; // Necessary as some of these tests disable phpunit's preservation // of the global state (e.g. autoloaders are in the global state) @@ -10,7 +10,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); use Mockery; use Icinga\Test\BaseTestCase; -use Icinga\Form\Config\Resource\DbResourceForm; +use Icinga\Forms\Config\Resource\DbResourceForm; class DbResourceFormTest extends BaseTestCase { diff --git a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php index 66f274b30..211b9bb02 100644 --- a/test/php/application/forms/Config/Resource/LdapResourceFormTest.php +++ b/test/php/application/forms/Config/Resource/LdapResourceFormTest.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Tests\Icinga\Form\Config\Resource; +namespace Tests\Icinga\Forms\Config\Resource; // Necessary as some of these tests disable phpunit's preservation // of the global state (e.g. autoloaders are in the global state) @@ -10,7 +10,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); use Mockery; use Icinga\Test\BaseTestCase; -use Icinga\Form\Config\Resource\LdapResourceForm; +use Icinga\Forms\Config\Resource\LdapResourceForm; class LdapResourceFormTest extends BaseTestCase { diff --git a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php index 556a0fd27..f6fae6b08 100644 --- a/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php +++ b/test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Tests\Icinga\Form\Config\Resource; +namespace Tests\Icinga\Forms\Config\Resource; // Necessary as some of these tests disable phpunit's preservation // of the global state (e.g. autoloaders are in the global state) @@ -10,7 +10,7 @@ require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); use Mockery; use Icinga\Test\BaseTestCase; -use Icinga\Form\Config\Resource\LivestatusResourceForm; +use Icinga\Forms\Config\Resource\LivestatusResourceForm; class LivestatusResourceFormTest extends BaseTestCase { diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php index fd74e49d6..fd8fc6d66 100644 --- a/test/php/bootstrap.php +++ b/test/php/bootstrap.php @@ -29,7 +29,7 @@ require_once($libraryPath . '/Icinga/Application/Loader.php'); $loader = new Icinga\Application\Loader(); $loader->registerNamespace('Tests', $testLibraryPath); $loader->registerNamespace('Icinga', $libraryPath . '/Icinga'); -$loader->registerNamespace('Icinga\\Form', $applicationPath . '/forms'); +$loader->registerNamespace('Icinga\\Forms', $applicationPath . '/forms'); $modules = scandir($modulePath); foreach ($modules as $module) { From d64ec0aa3c0604bb85081db3094026098694d7bb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Nov 2014 11:01:16 +0100 Subject: [PATCH 2/4] Rename Icinga\Module\Setup\Form to Icinga\Module\Setup\Forms refs #7553 --- .../library/Monitoring/MonitoringWizard.php | 2 +- .../application/forms/AdminAccountPage.php | 2 +- .../application/forms/AuthBackendPage.php | 2 +- .../application/forms/AuthenticationPage.php | 2 +- .../forms/DatabaseCreationPage.php | 2 +- .../application/forms/DbResourcePage.php | 2 +- .../application/forms/GeneralConfigPage.php | 2 +- .../forms/LdapDiscoveryConfirmPage.php | 2 +- .../application/forms/LdapDiscoveryPage.php | 2 +- .../application/forms/LdapResourcePage.php | 2 +- .../setup/application/forms/ModulePage.php | 2 +- .../application/forms/PreferencesPage.php | 2 +- .../application/forms/RequirementsPage.php | 2 +- .../setup/application/forms/SummaryPage.php | 2 +- .../setup/application/forms/WelcomePage.php | 2 +- modules/setup/library/Setup/WebWizard.php | 28 +++++++++---------- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php index 6ccd4b22b..1baac1787 100644 --- a/modules/monitoring/library/Monitoring/MonitoringWizard.php +++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php @@ -12,7 +12,7 @@ use Icinga\Module\Setup\SetupWizard; use Icinga\Module\Setup\Requirements; use Icinga\Module\Setup\Utils\MakeDirStep; use Icinga\Module\Setup\Utils\EnableModuleStep; -use Icinga\Module\Setup\Form\SummaryPage; +use Icinga\Module\Setup\Forms\SummaryPage; use Icinga\Module\Monitoring\Form\Setup\WelcomePage; use Icinga\Module\Monitoring\Form\Setup\BackendPage; use Icinga\Module\Monitoring\Form\Setup\InstancePage; diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php index dee501113..f338d9449 100644 --- a/modules/setup/application/forms/AdminAccountPage.php +++ b/modules/setup/application/forms/AdminAccountPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Exception; use LogicException; diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php index 8cfd88981..0c58906be 100644 --- a/modules/setup/application/forms/AuthBackendPage.php +++ b/modules/setup/application/forms/AuthBackendPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Application\Config; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php index c1d9fa339..4b0f9bee7 100644 --- a/modules/setup/application/forms/AuthenticationPage.php +++ b/modules/setup/application/forms/AuthenticationPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; use Icinga\Application\Platform; diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php index 4b5bdca0e..ec4a77ee1 100644 --- a/modules/setup/application/forms/DatabaseCreationPage.php +++ b/modules/setup/application/forms/DatabaseCreationPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use PDOException; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php index ef29ba0af..4a6535324 100644 --- a/modules/setup/application/forms/DbResourcePage.php +++ b/modules/setup/application/forms/DbResourcePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use PDOException; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php index 84d4e9c46..309c1784d 100644 --- a/modules/setup/application/forms/GeneralConfigPage.php +++ b/modules/setup/application/forms/GeneralConfigPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; use Icinga\Forms\Config\General\LoggingConfigForm; diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php index f50cf18f1..a192fac72 100644 --- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php +++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Application\Config; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php index 289176c4c..ec41842d0 100644 --- a/modules/setup/application/forms/LdapDiscoveryPage.php +++ b/modules/setup/application/forms/LdapDiscoveryPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; use Icinga\Forms\LdapDiscoveryForm; diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php index c02846f58..49bed69c3 100644 --- a/modules/setup/application/forms/LdapResourcePage.php +++ b/modules/setup/application/forms/LdapResourcePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; use Icinga\Forms\Config\Resource\LdapResourceForm; diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php index e1e951bcb..06d3cf621 100644 --- a/modules/setup/application/forms/ModulePage.php +++ b/modules/setup/application/forms/ModulePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use InvalidArgumentException; use Icinga\Application\Icinga; diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php index 0916d930a..9a6f31448 100644 --- a/modules/setup/application/forms/PreferencesPage.php +++ b/modules/setup/application/forms/PreferencesPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; use Icinga\Application\Platform; diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php index 076c2eba0..ec4405459 100644 --- a/modules/setup/application/forms/RequirementsPage.php +++ b/modules/setup/application/forms/RequirementsPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; use Icinga\Module\Setup\Requirements; diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php index 103a7aadf..14ad93c56 100644 --- a/modules/setup/application/forms/SummaryPage.php +++ b/modules/setup/application/forms/SummaryPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php index 8f32280eb..5da607683 100644 --- a/modules/setup/application/forms/WelcomePage.php +++ b/modules/setup/application/forms/WelcomePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Setup\Form; +namespace Icinga\Module\Setup\Forms; use Icinga\Application\Icinga; use Icinga\Web\Form; diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php index 469f25e02..46dd7624f 100644 --- a/modules/setup/library/Setup/WebWizard.php +++ b/modules/setup/library/Setup/WebWizard.php @@ -10,20 +10,20 @@ use Icinga\Web\Wizard; use Icinga\Web\Request; use Icinga\Application\Config; use Icinga\Application\Platform; -use Icinga\Module\Setup\Form\ModulePage; -use Icinga\Module\Setup\Form\WelcomePage; -use Icinga\Module\Setup\Form\SummaryPage; -use Icinga\Module\Setup\Form\DbResourcePage; -use Icinga\Module\Setup\Form\PreferencesPage; -use Icinga\Module\Setup\Form\AuthBackendPage; -use Icinga\Module\Setup\Form\AdminAccountPage; -use Icinga\Module\Setup\Form\LdapDiscoveryPage; -use Icinga\Module\Setup\Form\LdapDiscoveryConfirmPage; -use Icinga\Module\Setup\Form\LdapResourcePage; -use Icinga\Module\Setup\Form\RequirementsPage; -use Icinga\Module\Setup\Form\GeneralConfigPage; -use Icinga\Module\Setup\Form\AuthenticationPage; -use Icinga\Module\Setup\Form\DatabaseCreationPage; +use Icinga\Module\Setup\Forms\ModulePage; +use Icinga\Module\Setup\Forms\WelcomePage; +use Icinga\Module\Setup\Forms\SummaryPage; +use Icinga\Module\Setup\Forms\DbResourcePage; +use Icinga\Module\Setup\Forms\PreferencesPage; +use Icinga\Module\Setup\Forms\AuthBackendPage; +use Icinga\Module\Setup\Forms\AdminAccountPage; +use Icinga\Module\Setup\Forms\LdapDiscoveryPage; +use Icinga\Module\Setup\Forms\LdapDiscoveryConfirmPage; +use Icinga\Module\Setup\Forms\LdapResourcePage; +use Icinga\Module\Setup\Forms\RequirementsPage; +use Icinga\Module\Setup\Forms\GeneralConfigPage; +use Icinga\Module\Setup\Forms\AuthenticationPage; +use Icinga\Module\Setup\Forms\DatabaseCreationPage; use Icinga\Module\Setup\Steps\DatabaseStep; use Icinga\Module\Setup\Steps\GeneralConfigStep; use Icinga\Module\Setup\Steps\ResourceStep; From 3166c518e15fe29a022b43f89d8e4427b3cde4c5 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Nov 2014 11:17:22 +0100 Subject: [PATCH 3/4] Rename Icinga\Module\Monitoring\Form to Icinga\Module\Moni...\Forms refs #7553 --- .../controllers/CommandController.php | 20 +++++++++---------- .../controllers/ConfigController.php | 6 +++--- .../controllers/HostController.php | 8 ++++---- .../controllers/HostsController.php | 12 +++++------ .../controllers/ListController.php | 8 ++++---- .../controllers/MultiController.php | 2 +- .../controllers/ProcessController.php | 4 ++-- .../controllers/ServiceController.php | 8 ++++---- .../controllers/ServicesController.php | 12 +++++------ .../application/forms/Command/CommandForm.php | 2 +- .../DisableNotificationsExpireCommandForm.php | 4 ++-- .../ToggleInstanceFeaturesCommandForm.php | 4 ++-- .../Object/AcknowledgeProblemCommandForm.php | 2 +- .../Command/Object/AddCommentCommandForm.php | 2 +- .../Command/Object/CheckNowCommandForm.php | 2 +- .../Object/DeleteCommentCommandForm.php | 2 +- .../Object/DeleteDowntimeCommandForm.php | 2 +- .../Command/Object/ObjectsCommandForm.php | 4 ++-- .../RemoveAcknowledgementCommandForm.php | 2 +- .../Object/ScheduleHostCheckCommandForm.php | 2 +- .../ScheduleHostDowntimeCommandForm.php | 2 +- .../ScheduleServiceCheckCommandForm.php | 2 +- .../ScheduleServiceDowntimeCommandForm.php | 2 +- .../ToggleObjectFeaturesCommandForm.php | 2 +- .../forms/Config/BackendConfigForm.php | 2 +- .../Config/Instance/LocalInstanceForm.php | 2 +- .../Config/Instance/RemoteInstanceForm.php | 2 +- .../forms/Config/InstanceConfigForm.php | 6 +++--- .../forms/Config/SecurityConfigForm.php | 2 +- .../application/forms/Setup/BackendPage.php | 2 +- .../forms/Setup/IdoResourcePage.php | 2 +- .../application/forms/Setup/InstancePage.php | 4 ++-- .../forms/Setup/LivestatusResourcePage.php | 2 +- .../application/forms/Setup/SecurityPage.php | 4 ++-- .../application/forms/Setup/WelcomePage.php | 2 +- .../application/forms/StatehistoryForm.php | 2 +- .../library/Monitoring/MonitoringWizard.php | 12 +++++------ .../Controller/MonitoredObjectController.php | 14 ++++++------- 38 files changed, 87 insertions(+), 87 deletions(-) diff --git a/modules/monitoring/application/controllers/CommandController.php b/modules/monitoring/application/controllers/CommandController.php index 6f45a388b..d2615104a 100644 --- a/modules/monitoring/application/controllers/CommandController.php +++ b/modules/monitoring/application/controllers/CommandController.php @@ -5,8 +5,8 @@ use Icinga\Application\Icinga; use Icinga\Application\Config; use Icinga\Application\Logger; -use Icinga\Module\Monitoring\Form\Command\DisableNotificationWithExpireForm; -use Icinga\Module\Monitoring\Form\Command\SingleArgumentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\DisableNotificationWithExpireForm; +use Icinga\Module\Monitoring\Forms\Command\SingleArgumentCommandForm; use Icinga\Web\Form; use Icinga\Web\Url; use Icinga\Web\Notification; @@ -14,14 +14,14 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Protocol\Commandpipe\CommandPipe; use Icinga\Exception\ConfigurationError; use Icinga\Exception\MissingParameterException; -use Icinga\Module\Monitoring\Form\Command\AcknowledgeForm; -use Icinga\Module\Monitoring\Form\Command\CommentForm; -use Icinga\Module\Monitoring\Form\Command\CommandForm; -use Icinga\Module\Monitoring\Form\Command\CustomNotificationForm; -use Icinga\Module\Monitoring\Form\Command\DelayNotificationForm; -use Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm; -use Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm; -use Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm; +use Icinga\Module\Monitoring\Forms\Command\AcknowledgeForm; +use Icinga\Module\Monitoring\Forms\Command\CommentForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CustomNotificationForm; +use Icinga\Module\Monitoring\Forms\Command\DelayNotificationForm; +use Icinga\Module\Monitoring\Forms\Command\RescheduleNextCheckForm; +use Icinga\Module\Monitoring\Forms\Command\ScheduleDowntimeForm; +use Icinga\Module\Monitoring\Forms\Command\SubmitPassiveCheckResultForm; use Icinga\Exception\IcingaException; /** diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php index bae10ed17..1e961d26e 100644 --- a/modules/monitoring/application/controllers/ConfigController.php +++ b/modules/monitoring/application/controllers/ConfigController.php @@ -6,9 +6,9 @@ use Icinga\Web\Notification; use Icinga\Data\ResourceFactory; use Icinga\Forms\ConfirmRemovalForm; use Icinga\Web\Controller\ModuleActionController; -use Icinga\Module\Monitoring\Form\Config\BackendConfigForm; -use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm; -use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm; +use Icinga\Module\Monitoring\Forms\Config\BackendConfigForm; +use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm; +use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm; /** * Configuration controller for editing monitoring resources diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php index f77d11deb..0a4a727ed 100644 --- a/modules/monitoring/application/controllers/HostController.php +++ b/modules/monitoring/application/controllers/HostController.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController; diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php index d34a8ba2f..fe34c1d6f 100644 --- a/modules/monitoring/application/controllers/HostsController.php +++ b/modules/monitoring/application/controllers/HostsController.php @@ -4,12 +4,12 @@ use Icinga\Data\Filter\Filter; use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\HostList; diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 15b90079e..c25bf5047 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -4,8 +4,8 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\Backend; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm; use Icinga\Web\Url; use Icinga\Web\Hook; use Icinga\Web\Widget\Tabextension\DashboardAction; @@ -17,8 +17,8 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid; use Icinga\Data\Filter\Filter; use Icinga\Web\Widget; use Icinga\Module\Monitoring\Web\Widget\SelectBox; -use Icinga\Module\Monitoring\Form\StatehistoryForm; -use Icinga\Module\Monitoring\Form\EventOverviewForm; +use Icinga\Module\Monitoring\Forms\StatehistoryForm; +use Icinga\Module\Monitoring\Forms\EventOverviewForm; class Monitoring_ListController extends Controller { diff --git a/modules/monitoring/application/controllers/MultiController.php b/modules/monitoring/application/controllers/MultiController.php index 52dfcf07f..52d927ffb 100644 --- a/modules/monitoring/application/controllers/MultiController.php +++ b/modules/monitoring/application/controllers/MultiController.php @@ -4,7 +4,7 @@ use Icinga\Module\Monitoring\Controller; use Icinga\Web\Widget\Chart\InlinePie; -use Icinga\Module\Monitoring\Form\Command\MultiCommandFlagForm; +use Icinga\Module\Monitoring\Forms\Command\MultiCommandFlagForm; use Icinga\Web\Widget; use Icinga\Data\Filter\Filter; diff --git a/modules/monitoring/application/controllers/ProcessController.php b/modules/monitoring/application/controllers/ProcessController.php index 98cba000f..e843d8ecd 100644 --- a/modules/monitoring/application/controllers/ProcessController.php +++ b/modules/monitoring/application/controllers/ProcessController.php @@ -3,8 +3,8 @@ // {{{ICINGA_LICENSE_HEADER}}} use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Instance\DisableNotificationsExpireCommandForm; -use Icinga\Module\Monitoring\Form\Command\Instance\ToggleInstanceFeaturesCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Instance\DisableNotificationsExpireCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Instance\ToggleInstanceFeaturesCommandForm; /** * Display process and performance information of the monitoring host and program-wide commands diff --git a/modules/monitoring/application/controllers/ServiceController.php b/modules/monitoring/application/controllers/ServiceController.php index ea29aa54a..c6d0e4e2f 100644 --- a/modules/monitoring/application/controllers/ServiceController.php +++ b/modules/monitoring/application/controllers/ServiceController.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController; diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php index 11b983d45..d4b0cef4d 100644 --- a/modules/monitoring/application/controllers/ServicesController.php +++ b/modules/monitoring/application/controllers/ServicesController.php @@ -4,12 +4,12 @@ use Icinga\Data\Filter\Filter; use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm; use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; use Icinga\Module\Monitoring\Object\ServiceList; diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php index da797e60c..807e1e6ca 100644 --- a/modules/monitoring/application/forms/Command/CommandForm.php +++ b/modules/monitoring/application/forms/Command/CommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command; +namespace Icinga\Module\Monitoring\Forms\Command; use Icinga\Module\Monitoring\Backend\MonitoringBackend; use Icinga\Module\Monitoring\Command\Transport\CommandTransport; diff --git a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php index 0bbfbe4f8..2cb1b83ba 100644 --- a/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php +++ b/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php @@ -2,12 +2,12 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Instance; +namespace Icinga\Module\Monitoring\Forms\Command\Instance; use DateTime; use DateInterval; use Icinga\Module\Monitoring\Command\Instance\DisableNotificationsExpireCommand; -use Icinga\Module\Monitoring\Form\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php index 883a11a35..ed2d7e719 100644 --- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php +++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Instance; +namespace Icinga\Module\Monitoring\Forms\Command\Instance; use Icinga\Module\Monitoring\Command\Instance\ToggleInstanceFeatureCommand; -use Icinga\Module\Monitoring\Form\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Web\Notification; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php index 7bdfbd8cc..34ac138b1 100644 --- a/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use DateTime; use DateInterval; diff --git a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php index a89353d52..70b216da6 100644 --- a/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\AddCommentCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php index c8c3caac5..b8f708de0 100644 --- a/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/CheckNowCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand; use Icinga\Module\Monitoring\Command\Object\ScheduleServiceCheckCommand; diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php index 4c7df0141..d0edef274 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteCommentCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php index ae712eddb..3dced5072 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\DeleteDowntimeCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php index bf603a7b5..1dbf07840 100644 --- a/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ObjectsCommandForm.php @@ -2,9 +2,9 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; -use Icinga\Module\Monitoring\Form\Command\CommandForm; +use Icinga\Module\Monitoring\Forms\Command\CommandForm; use Icinga\Module\Monitoring\Object\MonitoredObject; /** diff --git a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php index 6ccd0633d..41cde9b43 100644 --- a/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\RemoveAcknowledgementCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php index 89d39716c..4e2bd62a9 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\ScheduleHostCheckCommand; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php index 25caa0f20..db4262f68 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\PropagateHostDowntimeCommand; use Icinga\Module\Monitoring\Command\Object\ScheduleHostDowntimeCommand; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php index dd0ad9f3e..5641557d6 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceCheckCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use DateTime; use DateInterval; diff --git a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php index a7d5f028b..93a45c5c4 100644 --- a/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use DateTime; use DateInterval; diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php index 8e5e5408c..ebaad32c8 100644 --- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Command\Object; +namespace Icinga\Module\Monitoring\Forms\Command\Object; use Icinga\Module\Monitoring\Command\Object\ToggleObjectFeatureCommand; use Icinga\Module\Monitoring\Object\MonitoredObject; diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php index 237542d74..e3c68fc67 100644 --- a/modules/monitoring/application/forms/Config/BackendConfigForm.php +++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config; +namespace Icinga\Module\Monitoring\Forms\Config; use InvalidArgumentException; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php index 029da3d35..ac1139268 100644 --- a/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/LocalInstanceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config\Instance; +namespace Icinga\Module\Monitoring\Forms\Config\Instance; use Icinga\Web\Form; diff --git a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php index e2d6840eb..c93436ab2 100644 --- a/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/RemoteInstanceForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config\Instance; +namespace Icinga\Module\Monitoring\Forms\Config\Instance; use Icinga\Web\Form; diff --git a/modules/monitoring/application/forms/Config/InstanceConfigForm.php b/modules/monitoring/application/forms/Config/InstanceConfigForm.php index fcfbabd82..8515c522e 100644 --- a/modules/monitoring/application/forms/Config/InstanceConfigForm.php +++ b/modules/monitoring/application/forms/Config/InstanceConfigForm.php @@ -2,15 +2,15 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config; +namespace Icinga\Module\Monitoring\Forms\Config; use InvalidArgumentException; use Icinga\Exception\ConfigurationError; use Icinga\Forms\ConfigForm; use Icinga\Module\Monitoring\Command\Transport\LocalCommandFile; use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile; -use Icinga\Module\Monitoring\Form\Config\Instance\LocalInstanceForm; -use Icinga\Module\Monitoring\Form\Config\Instance\RemoteInstanceForm; +use Icinga\Module\Monitoring\Forms\Config\Instance\LocalInstanceForm; +use Icinga\Module\Monitoring\Forms\Config\Instance\RemoteInstanceForm; use Icinga\Web\Notification; use Icinga\Web\Request; diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php index 14911bbd4..4d8230bfd 100644 --- a/modules/monitoring/application/forms/Config/SecurityConfigForm.php +++ b/modules/monitoring/application/forms/Config/SecurityConfigForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Config; +namespace Icinga\Module\Monitoring\Forms\Config; use Icinga\Web\Request; use Icinga\Web\Notification; diff --git a/modules/monitoring/application/forms/Setup/BackendPage.php b/modules/monitoring/application/forms/Setup/BackendPage.php index c5506111c..4bee056ca 100644 --- a/modules/monitoring/application/forms/Setup/BackendPage.php +++ b/modules/monitoring/application/forms/Setup/BackendPage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; use Icinga\Application\Platform; diff --git a/modules/monitoring/application/forms/Setup/IdoResourcePage.php b/modules/monitoring/application/forms/Setup/IdoResourcePage.php index 7c839e8d2..189d65fea 100644 --- a/modules/monitoring/application/forms/Setup/IdoResourcePage.php +++ b/modules/monitoring/application/forms/Setup/IdoResourcePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; use Icinga\Forms\Config\Resource\DbResourceForm; diff --git a/modules/monitoring/application/forms/Setup/InstancePage.php b/modules/monitoring/application/forms/Setup/InstancePage.php index af1b6df61..dccfd1d91 100644 --- a/modules/monitoring/application/forms/Setup/InstancePage.php +++ b/modules/monitoring/application/forms/Setup/InstancePage.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; -use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm; +use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm; class InstancePage extends Form { diff --git a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php index 884760eb1..4faa17416 100644 --- a/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php +++ b/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; use Icinga\Forms\Config\Resource\LivestatusResourceForm; diff --git a/modules/monitoring/application/forms/Setup/SecurityPage.php b/modules/monitoring/application/forms/Setup/SecurityPage.php index 42eed4d70..0c7d3d1de 100644 --- a/modules/monitoring/application/forms/Setup/SecurityPage.php +++ b/modules/monitoring/application/forms/Setup/SecurityPage.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; -use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm; +use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm; class SecurityPage extends Form { diff --git a/modules/monitoring/application/forms/Setup/WelcomePage.php b/modules/monitoring/application/forms/Setup/WelcomePage.php index c329c71aa..d910e2e01 100644 --- a/modules/monitoring/application/forms/Setup/WelcomePage.php +++ b/modules/monitoring/application/forms/Setup/WelcomePage.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form\Setup; +namespace Icinga\Module\Monitoring\Forms\Setup; use Icinga\Web\Form; diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php index 3008724c3..9fa1bdc26 100644 --- a/modules/monitoring/application/forms/StatehistoryForm.php +++ b/modules/monitoring/application/forms/StatehistoryForm.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Module\Monitoring\Form; +namespace Icinga\Module\Monitoring\Forms; use \Zend_Form; use Icinga\Web\Form; diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php index 1baac1787..0ac4c7f63 100644 --- a/modules/monitoring/library/Monitoring/MonitoringWizard.php +++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php @@ -13,12 +13,12 @@ use Icinga\Module\Setup\Requirements; use Icinga\Module\Setup\Utils\MakeDirStep; use Icinga\Module\Setup\Utils\EnableModuleStep; use Icinga\Module\Setup\Forms\SummaryPage; -use Icinga\Module\Monitoring\Form\Setup\WelcomePage; -use Icinga\Module\Monitoring\Form\Setup\BackendPage; -use Icinga\Module\Monitoring\Form\Setup\InstancePage; -use Icinga\Module\Monitoring\Form\Setup\SecurityPage; -use Icinga\Module\Monitoring\Form\Setup\IdoResourcePage; -use Icinga\Module\Monitoring\Form\Setup\LivestatusResourcePage; +use Icinga\Module\Monitoring\Forms\Setup\WelcomePage; +use Icinga\Module\Monitoring\Forms\Setup\BackendPage; +use Icinga\Module\Monitoring\Forms\Setup\InstancePage; +use Icinga\Module\Monitoring\Forms\Setup\SecurityPage; +use Icinga\Module\Monitoring\Forms\Setup\IdoResourcePage; +use Icinga\Module\Monitoring\Forms\Setup\LivestatusResourcePage; /** * Monitoring Module Setup Wizard diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index 856496ca8..380b1d277 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -5,13 +5,13 @@ namespace Icinga\Module\Monitoring\Web\Controller; use Icinga\Module\Monitoring\Controller; -use Icinga\Module\Monitoring\Form\Command\Object\AcknowledgeProblemCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm; -use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\AcknowledgeProblemCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm; +use Icinga\Module\Monitoring\Forms\Command\Object\ToggleObjectFeaturesCommandForm; use Icinga\Web\Hook; use Icinga\Web\Url; use Icinga\Web\Widget\Tabextension\DashboardAction; From 586b4f463b214b26c72b62ae501c4e6e79a564ca Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Nov 2014 11:30:44 +0100 Subject: [PATCH 4/4] Let our module autloader know that we renamed our form namespaces refs #7553 --- library/Icinga/Application/Modules/Module.php | 2 +- test/php/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index 461cec59a..443a39e32 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -763,7 +763,7 @@ class Module $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName, $moduleLibraryDir); if (is_dir($this->getFormDir())) { $this->app->getLoader()->registerNamespace( - 'Icinga\\Module\\' . $moduleName. '\\Form', + 'Icinga\\Module\\' . $moduleName. '\\Forms', $this->getFormDir() ); } diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php index fd8fc6d66..a692d2be4 100644 --- a/test/php/bootstrap.php +++ b/test/php/bootstrap.php @@ -51,7 +51,7 @@ foreach ($modules as $module) { $moduleFormPath = $modulePath . '/' . $module . '/application/forms'; if (is_dir($moduleFormPath)) { - $loader->registerNamespace($moduleNamespace . '\\Form', $moduleFormPath); + $loader->registerNamespace($moduleNamespace . '\\Forms', $moduleFormPath); } }