From 21ed823da767d45990bfe1d79964d15e42fe21d0 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 10 Nov 2014 16:31:40 +0100 Subject: [PATCH] Adjust namespace declarations refs #7163 --- library/Icinga/Application/Modules/Module.php | 2 +- .../Monitoring/Installation/BackendStep.php | 2 +- .../Monitoring/Installation/InstanceStep.php | 2 +- .../Monitoring/Installation/SecurityStep.php | 2 +- .../library/Monitoring/MonitoringWizard.php | 12 ++--- .../application/clicommands/SetupCommand.php | 2 +- .../controllers/SetupController.php | 2 +- .../application/forms/AdminAccountPage.php | 2 +- .../application/forms/AuthBackendPage.php | 2 +- .../application/forms/AuthenticationPage.php | 2 +- .../forms/DatabaseCreationPage.php | 4 +- .../application/forms/DbResourcePage.php | 4 +- .../application/forms/GeneralConfigPage.php | 2 +- .../forms/LdapDiscoveryConfirmPage.php | 6 +-- .../application/forms/LdapDiscoveryPage.php | 5 +- .../application/forms/LdapResourcePage.php | 2 +- .../setup/application/forms/ModulePage.php | 2 +- .../application/forms/PreferencesPage.php | 2 +- .../application/forms/RequirementsPage.php | 4 +- .../setup/application/forms/SummaryPage.php | 2 +- .../setup/application/forms/WelcomePage.php | 4 +- .../scripts/form/setup-requirements.phtml | 2 +- .../Setup/Exception/SetupException.php | 2 +- modules/setup/library/Setup/Requirements.php | 2 +- modules/setup/library/Setup/Setup.php | 4 +- modules/setup/library/Setup/SetupWizard.php | 2 +- modules/setup/library/Setup/Step.php | 2 +- .../Setup/Steps/AuthenticationStep.php | 4 +- .../library/Setup/Steps/DatabaseStep.php | 8 ++-- .../library/Setup/Steps/GeneralConfigStep.php | 4 +- .../library/Setup/Steps/ResourceStep.php | 4 +- modules/setup/library/Setup/Utils/DbTool.php | 2 +- .../library/Setup/Utils/EnableModuleStep.php | 3 +- .../setup/library/Setup/Utils/MakeDirStep.php | 4 +- .../Web/Form/Validator/TokenValidator.php | 2 +- modules/setup/library/Setup/WebWizard.php | 47 +++++++++---------- 36 files changed, 77 insertions(+), 82 deletions(-) diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php index 3ac5985630..dca9198ad7 100644 --- a/library/Icinga/Application/Modules/Module.php +++ b/library/Icinga/Application/Modules/Module.php @@ -18,7 +18,7 @@ use Icinga\Web\Menu; use Icinga\Web\Widget; use Icinga\Web\Widget\Dashboard\Pane; -use Icinga\Web\Setup\SetupWizard; +use Icinga\Module\Setup\SetupWizard; use Icinga\Util\File; use Icinga\Exception\ProgrammingError; use Icinga\Exception\IcingaException; diff --git a/modules/monitoring/library/Monitoring/Installation/BackendStep.php b/modules/monitoring/library/Monitoring/Installation/BackendStep.php index ae48269b94..3dd373a8bf 100644 --- a/modules/monitoring/library/Monitoring/Installation/BackendStep.php +++ b/modules/monitoring/library/Monitoring/Installation/BackendStep.php @@ -6,7 +6,7 @@ use Exception; use Zend_Config; -use Icinga\Web\Setup\Step; +use Icinga\Module\Setup\Step; use Icinga\Application\Config; use Icinga\File\Ini\IniWriter; diff --git a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php b/modules/monitoring/library/Monitoring/Installation/InstanceStep.php index fa9b58f181..e96b8adc00 100644 --- a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php +++ b/modules/monitoring/library/Monitoring/Installation/InstanceStep.php @@ -6,7 +6,7 @@ use Exception; use Zend_Config; -use Icinga\Web\Setup\Step; +use Icinga\Module\Setup\Step; use Icinga\Application\Config; use Icinga\File\Ini\IniWriter; diff --git a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php b/modules/monitoring/library/Monitoring/Installation/SecurityStep.php index ad580db7f0..f584c3e018 100644 --- a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php +++ b/modules/monitoring/library/Monitoring/Installation/SecurityStep.php @@ -6,7 +6,7 @@ use Exception; use Zend_Config; -use Icinga\Web\Setup\Step; +use Icinga\Module\Setup\Step; use Icinga\Application\Config; use Icinga\File\Ini\IniWriter; diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php index ba497112d3..9c6e70875c 100644 --- a/modules/monitoring/library/Monitoring/MonitoringWizard.php +++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php @@ -7,15 +7,15 @@ use Icinga\Web\Form; use Icinga\Web\Wizard; use Icinga\Web\Request; -use Icinga\Web\Setup\Setup; -use Icinga\Web\Setup\MakeDirStep; -use Icinga\Web\Setup\EnableModuleStep; -use Icinga\Web\Setup\SetupWizard; -use Icinga\Web\Setup\Requirements; +use Icinga\Module\Setup\Setup; +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\Monitoring\Installation\BackendStep; use Icinga\Module\Monitoring\Installation\InstanceStep; use Icinga\Module\Monitoring\Installation\SecurityStep; -use Icinga\Form\Setup\SummaryPage; +use Icinga\Module\Setup\Form\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/clicommands/SetupCommand.php b/modules/setup/application/clicommands/SetupCommand.php index fe44ec0dcd..c4d3a73bc1 100644 --- a/modules/setup/application/clicommands/SetupCommand.php +++ b/modules/setup/application/clicommands/SetupCommand.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Clicommands; +namespace Icinga\Module\Setup\Clicommands; use Icinga\Cli\Command; diff --git a/modules/setup/application/controllers/SetupController.php b/modules/setup/application/controllers/SetupController.php index e0e9f68b02..dbd342d46f 100644 --- a/modules/setup/application/controllers/SetupController.php +++ b/modules/setup/application/controllers/SetupController.php @@ -2,8 +2,8 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use Icinga\Application\WebWizard; use Icinga\Web\Controller\ActionController; +use Icinga\Module\Setup\WebWizard; class SetupController extends ActionController { diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php index c2e23090ad..fc1153b89e 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\Form\Setup; +namespace Icinga\Module\Setup\Form; use Exception; use Zend_Config; diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php index 3eda9349da..22e3d93eaf 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\Form\Setup; +namespace Icinga\Module\Setup\Form; use Zend_Config; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php index 475203737a..0c35d7f057 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\Form\Setup; +namespace Icinga\Module\Setup\Form; 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 57303a604a..0bc33628d9 100644 --- a/modules/setup/application/forms/DatabaseCreationPage.php +++ b/modules/setup/application/forms/DatabaseCreationPage.php @@ -2,12 +2,12 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Setup; +namespace Icinga\Module\Setup\Form; use PDOException; use Icinga\Web\Form; use Icinga\Web\Form\Element\Note; -use Icinga\Web\Setup\DbTool; +use Icinga\Module\Setup\Utils\DbTool; /** * Wizard page to define a database user that is able to create databases and tables diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php index 5cdb00a43a..4724aa5d5a 100644 --- a/modules/setup/application/forms/DbResourcePage.php +++ b/modules/setup/application/forms/DbResourcePage.php @@ -2,13 +2,13 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Setup; +namespace Icinga\Module\Setup\Form; use PDOException; use Icinga\Web\Form; -use Icinga\Web\Setup\DbTool; use Icinga\Web\Form\Element\Note; use Icinga\Form\Config\Resource\DbResourceForm; +use Icinga\Module\Setup\Utils\DbTool; /** * Wizard page to define connection details for a database resource diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php index e6b073c0bd..377095bead 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\Form\Setup; +namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; use Icinga\Web\Form\Element\Note; diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php index a7d867f86f..120b8ba81f 100644 --- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php +++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php @@ -2,14 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Setup; +namespace Icinga\Module\Setup\Form; -use Icinga\Protocol\Dns; use Icinga\Web\Form; use Icinga\Web\Form\Element\Note; -use Icinga\Form\LdapDiscoveryForm; -use Icinga\Form\Config\Resource\LdapResourceForm; -use Icinga\Web\Request; /** * Wizard page to define the connection details for a LDAP resource diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php index 1ee5ee03af..9d825863f0 100644 --- a/modules/setup/application/forms/LdapDiscoveryPage.php +++ b/modules/setup/application/forms/LdapDiscoveryPage.php @@ -2,14 +2,11 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Setup; +namespace Icinga\Module\Setup\Form; -use Icinga\Protocol\Dns; use Icinga\Web\Form; use Icinga\Web\Form\Element\Note; use Icinga\Form\LdapDiscoveryForm; -use Icinga\Form\Config\Resource\LdapResourceForm; -use Icinga\Web\Request; /** * 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 4a31502db0..c70e1f8841 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\Form\Setup; +namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; use Icinga\Web\Form\Element\Note; diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php index f5b07ba5d3..e1e951bcbc 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\Form\Setup; +namespace Icinga\Module\Setup\Form; use InvalidArgumentException; use Icinga\Application\Icinga; diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php index 25db67df09..5edd50dc24 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\Form\Setup; +namespace Icinga\Module\Setup\Form; 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 f9d5ec754e..076c2eba06 100644 --- a/modules/setup/application/forms/RequirementsPage.php +++ b/modules/setup/application/forms/RequirementsPage.php @@ -2,10 +2,10 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Setup; +namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; -use Icinga\Web\Setup\Requirements; +use Icinga\Module\Setup\Requirements; /** * Wizard page to list setup requirements diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php index 7a53e9c8ce..103a7aadfb 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\Form\Setup; +namespace Icinga\Module\Setup\Form; use Icinga\Web\Form; diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php index 941d745486..30695ce193 100644 --- a/modules/setup/application/forms/WelcomePage.php +++ b/modules/setup/application/forms/WelcomePage.php @@ -2,11 +2,11 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Form\Setup; +namespace Icinga\Module\Setup\Form; use Icinga\Application\Icinga; use Icinga\Web\Form; -use Icinga\Web\Form\Validator\TokenValidator; +use Icinga\Module\Setup\Web\Form\Validator\TokenValidator; /** * Wizard page to authenticate and welcome the user diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml index 6cf9b777bd..153d68b418 100644 --- a/modules/setup/application/views/scripts/form/setup-requirements.phtml +++ b/modules/setup/application/views/scripts/form/setup-requirements.phtml @@ -1,7 +1,7 @@ getRequirements(); diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php index 2124cb1819..538589fd8f 100644 --- a/modules/setup/library/Setup/Exception/SetupException.php +++ b/modules/setup/library/Setup/Exception/SetupException.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Exception; +namespace Icinga\Module\Setup\Exception; /** * Class SetupException diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php index ce4642cbdb..4b3d411cb5 100644 --- a/modules/setup/library/Setup/Requirements.php +++ b/modules/setup/library/Setup/Requirements.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup; use ArrayIterator; use IteratorAggregate; diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php index 53583d53c4..ec5117c9a1 100644 --- a/modules/setup/library/Setup/Setup.php +++ b/modules/setup/library/Setup/Setup.php @@ -2,11 +2,11 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup; use ArrayIterator; use IteratorAggregate; -use Icinga\Exception\SetupException; +use Icinga\Module\Setup\Exception\SetupException; /** * Container for multiple configuration steps diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php index aefaab9fa4..754207276e 100644 --- a/modules/setup/library/Setup/SetupWizard.php +++ b/modules/setup/library/Setup/SetupWizard.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup; /** * Interface for wizards providing a setup and requirements diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php index 40f252a2a2..720597fd15 100644 --- a/modules/setup/library/Setup/Step.php +++ b/modules/setup/library/Setup/Step.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup; /** * Class to implement functionality for a single setup step diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php index ea2e096ccb..69616b9b9b 100644 --- a/modules/setup/library/Setup/Steps/AuthenticationStep.php +++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php @@ -2,15 +2,15 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Installation; +namespace Icinga\Module\Setup\Steps; use Exception; use Zend_Config; -use Icinga\Web\Setup\Step; use Icinga\Application\Config; use Icinga\File\Ini\IniWriter; use Icinga\Data\ResourceFactory; use Icinga\Authentication\Backend\DbUserBackend; +use Icinga\Module\Setup\Step; class AuthenticationStep extends Step { diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php index b918b6a236..db0e2c76aa 100644 --- a/modules/setup/library/Setup/Steps/DatabaseStep.php +++ b/modules/setup/library/Setup/Steps/DatabaseStep.php @@ -2,14 +2,14 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Installation; +namespace Icinga\Module\Setup\Steps; use Exception; use PDOException; -use Icinga\Web\Setup\Step; -use Icinga\Web\Setup\DbTool; use Icinga\Application\Icinga; -use Icinga\Exception\SetupException; +use Icinga\Module\Setup\Step; +use Icinga\Module\Setup\Utils\DbTool; +use Icinga\Module\Setup\Exception\SetupException; class DatabaseStep extends Step { diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php index 0a777e8f47..9a151bebf0 100644 --- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php +++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php @@ -2,14 +2,14 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Installation; +namespace Icinga\Module\Setup\Steps; use Exception; use Zend_Config; use Icinga\Application\Logger; -use Icinga\Web\Setup\Step; use Icinga\Application\Config; use Icinga\File\Ini\IniWriter; +use Icinga\Module\Setup\Step; class GeneralConfigStep extends Step { diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php index 606d7c6a7a..82f2edecbb 100644 --- a/modules/setup/library/Setup/Steps/ResourceStep.php +++ b/modules/setup/library/Setup/Steps/ResourceStep.php @@ -2,13 +2,13 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Installation; +namespace Icinga\Module\Setup\Steps; use Exception; use Zend_Config; -use Icinga\Web\Setup\Step; use Icinga\Application\Config; use Icinga\File\Ini\IniWriter; +use Icinga\Module\Setup\Step; class ResourceStep extends Step { diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php index 3732c7f6e6..344b98d8a7 100644 --- a/modules/setup/library/Setup/Utils/DbTool.php +++ b/modules/setup/library/Setup/Utils/DbTool.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup\Utils; use PDO; use PDOException; diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php index 76286e512d..f5dc002d0e 100644 --- a/modules/setup/library/Setup/Utils/EnableModuleStep.php +++ b/modules/setup/library/Setup/Utils/EnableModuleStep.php @@ -2,10 +2,11 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup\Utils; use Exception; use Icinga\Application\Icinga; +use Icinga\Module\Setup\Step; class EnableModuleStep extends Step { diff --git a/modules/setup/library/Setup/Utils/MakeDirStep.php b/modules/setup/library/Setup/Utils/MakeDirStep.php index 2ff4c8b708..993b760930 100644 --- a/modules/setup/library/Setup/Utils/MakeDirStep.php +++ b/modules/setup/library/Setup/Utils/MakeDirStep.php @@ -2,7 +2,9 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Setup; +namespace Icinga\Module\Setup\Utils; + +use Icinga\Module\Setup\Step; class MakeDirStep extends Step { diff --git a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php index 3f80981ba2..69dcd1e267 100644 --- a/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php +++ b/modules/setup/library/Setup/Web/Form/Validator/TokenValidator.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Web\Form\Validator; +namespace Icinga\Module\Setup\Web\Form\Validator; use Exception; use Zend_Validate_Abstract; diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php index a7b53f035d..d19b4f6b25 100644 --- a/modules/setup/library/Setup/WebWizard.php +++ b/modules/setup/library/Setup/WebWizard.php @@ -2,35 +2,34 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -namespace Icinga\Application; +namespace Icinga\Module\Setup; use PDOException; -use Icinga\Form\Setup\ModulePage; -use Icinga\Form\Setup\WelcomePage; -use Icinga\Form\Setup\SummaryPage; -use Icinga\Form\Setup\DbResourcePage; -use Icinga\Form\Setup\PreferencesPage; -use Icinga\Form\Setup\AuthBackendPage; -use Icinga\Form\Setup\AdminAccountPage; -use Icinga\Form\Setup\LdapDiscoveryPage; -use Icinga\Form\Setup\LdapDiscoveryConfirmPage; -use Icinga\Form\Setup\LdapResourcePage; -use Icinga\Form\Setup\RequirementsPage; -use Icinga\Form\Setup\GeneralConfigPage; -use Icinga\Form\Setup\AuthenticationPage; -use Icinga\Form\Setup\DatabaseCreationPage; -use Icinga\Installation\DatabaseStep; -use Icinga\Installation\GeneralConfigStep; -use Icinga\Installation\ResourceStep; -use Icinga\Installation\AuthenticationStep; use Icinga\Web\Form; use Icinga\Web\Wizard; use Icinga\Web\Request; -use Icinga\Web\Setup\Setup; -use Icinga\Web\Setup\DbTool; -use Icinga\Web\Setup\MakeDirStep; -use Icinga\Web\Setup\SetupWizard; -use Icinga\Web\Setup\Requirements; +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\Steps\DatabaseStep; +use Icinga\Module\Setup\Steps\GeneralConfigStep; +use Icinga\Module\Setup\Steps\ResourceStep; +use Icinga\Module\Setup\Steps\AuthenticationStep; +use Icinga\Module\Setup\Utils\MakeDirStep; +use Icinga\Module\Setup\Utils\DbTool; /** * Icinga Web 2 Setup Wizard