Merge branch 'bugfix/move-forms-to-forms-namespace-7553'

fixes #7553

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;

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\Forms\Config\GeneralConfigForm;
-use Icinga\Form\Config\AuthenticationBackendReorderForm;
+use Icinga\Forms\Config\AuthenticationBackendReorderForm;
-use Icinga\Form\Config\AuthenticationBackendConfigForm;
+use Icinga\Forms\Config\AuthenticationBackendConfigForm;
-use Icinga\Form\Config\ResourceConfigForm;
+use Icinga\Forms\Config\ResourceConfigForm;
-use Icinga\Form\ConfirmRemovalForm;
+use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Data\ResourceFactory;
 
 

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;

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;
 

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;

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;

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;

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;

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\Forms\Config\Authentication\DbBackendForm;
-use Icinga\Form\Config\Authentication\LdapBackendForm;
+use Icinga\Forms\Config\Authentication\LdapBackendForm;
-use Icinga\Form\Config\Authentication\AutologinBackendForm;
+use Icinga\Forms\Config\Authentication\AutologinBackendForm;
 
 class AuthenticationBackendConfigForm extends ConfigForm
 {

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
 {

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;

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;

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\Forms\ConfigForm;
-use Icinga\Form\Config\General\LoggingConfigForm;
+use Icinga\Forms\Config\General\LoggingConfigForm;
-use Icinga\Form\Config\General\ApplicationConfigForm;
+use Icinga\Forms\Config\General\ApplicationConfigForm;
 
 /**
  * Form class for application-wide and logging specific settings

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;

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;

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;

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;

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\Forms\ConfigForm;
-use Icinga\Form\Config\Resource\DbResourceForm;
+use Icinga\Forms\Config\Resource\DbResourceForm;
-use Icinga\Form\Config\Resource\FileResourceForm;
+use Icinga\Forms\Config\Resource\FileResourceForm;
-use Icinga\Form\Config\Resource\LdapResourceForm;
+use Icinga\Forms\Config\Resource\LdapResourceForm;
-use Icinga\Form\Config\Resource\LivestatusResourceForm;
+use Icinga\Forms\Config\Resource\LivestatusResourceForm;
 use Icinga\Application\Platform;
 use Icinga\Exception\ConfigurationError;
 

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;

application/forms/ConfirmRemovalForm.php

@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form;
+namespace Icinga\Forms;
 
 use Icinga\Web\Form;
 

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;

application/forms/LdapDiscoveryForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Form;
+namespace Icinga\Forms;
 
 use Icinga\Application\Config;
 use Icinga\Application\Logger;

application/forms/PreferenceForm.php

@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form;
+namespace Icinga\Forms;
 
 use Exception;
 use DateTimeZone;

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()
                 );
             }

library/Icinga/Application/Web.php

@@ -326,14 +326,14 @@ class Web extends ApplicationBootstrap
     }
 
     /**
-     * Setup an autoloader namespace for Icinga\Form
+     * Setup an autoloader namespace for Icinga\Forms
      *
      * @return  self
      */
     private function setupFormNamespace()
     {
         $this->getLoader()->registerNamespace(
-            'Icinga\\Form',
+            'Icinga\\Forms',
             $this->getApplicationDir('forms')
         );
         return $this;

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\Forms\Command\DisableNotificationWithExpireForm;
-use Icinga\Module\Monitoring\Form\Command\SingleArgumentCommandForm;
+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\Forms\Command\AcknowledgeForm;
-use Icinga\Module\Monitoring\Form\Command\CommentForm;
+use Icinga\Module\Monitoring\Forms\Command\CommentForm;
-use Icinga\Module\Monitoring\Form\Command\CommandForm;
+use Icinga\Module\Monitoring\Forms\Command\CommandForm;
-use Icinga\Module\Monitoring\Form\Command\CustomNotificationForm;
+use Icinga\Module\Monitoring\Forms\Command\CustomNotificationForm;
-use Icinga\Module\Monitoring\Form\Command\DelayNotificationForm;
+use Icinga\Module\Monitoring\Forms\Command\DelayNotificationForm;
-use Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm;
+use Icinga\Module\Monitoring\Forms\Command\RescheduleNextCheckForm;
-use Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm;
+use Icinga\Module\Monitoring\Forms\Command\ScheduleDowntimeForm;
-use Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm;
+use Icinga\Module\Monitoring\Forms\Command\SubmitPassiveCheckResultForm;
 use Icinga\Exception\IcingaException;
 
 /**

modules/monitoring/application/controllers/ConfigController.php

@@ -4,11 +4,11 @@
 
 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\Forms\Config\BackendConfigForm;
-use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm;
+use Icinga\Module\Monitoring\Forms\Config\InstanceConfigForm;
-use Icinga\Module\Monitoring\Form\Config\SecurityConfigForm;
+use Icinga\Module\Monitoring\Forms\Config\SecurityConfigForm;
 
 /**
  * Configuration controller for editing monitoring resources

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\Forms\Command\Object\AcknowledgeProblemCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostDowntimeCommandForm;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 

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\Forms\Command\Object\AcknowledgeProblemCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostCheckCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleHostCheckCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleHostDowntimeCommandForm;
+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;

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\Forms\Command\Object\DeleteCommentCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
+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\Forms\StatehistoryForm;
-use Icinga\Module\Monitoring\Form\EventOverviewForm;
+use Icinga\Module\Monitoring\Forms\EventOverviewForm;
 
 class Monitoring_ListController extends Controller
 {

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;
 

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\Forms\Command\Instance\DisableNotificationsExpireCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Instance\ToggleInstanceFeaturesCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Instance\ToggleInstanceFeaturesCommandForm;
 
 /**
  * Display process and performance information of the monitoring host and program-wide commands

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\Forms\Command\Object\AcknowledgeProblemCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\AddCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\AddCommentCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceDowntimeCommandForm;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 

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\Forms\Command\Object\AcknowledgeProblemCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceCheckCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ScheduleServiceCheckCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ScheduleServiceDowntimeCommandForm;
+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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

modules/monitoring/application/forms/Config/BackendConfigForm.php

@@ -2,12 +2,12 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Monitoring\Form\Config;
+namespace Icinga\Module\Monitoring\Forms\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;
 

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;
 

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;
 

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\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;
+use Icinga\Module\Monitoring\Forms\Config\Instance\LocalInstanceForm;
-use Icinga\Module\Monitoring\Form\Config\Instance\RemoteInstanceForm;
+use Icinga\Module\Monitoring\Forms\Config\Instance\RemoteInstanceForm;
 use Icinga\Web\Notification;
 use Icinga\Web\Request;
 

modules/monitoring/application/forms/Config/SecurityConfigForm.php

@@ -2,11 +2,11 @@
 // {{{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;
-use Icinga\Form\ConfigForm;
+use Icinga\Forms\ConfigForm;
 
 /**
  * Form for modifying security relevant settings

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;

modules/monitoring/application/forms/Setup/IdoResourcePage.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\Form\Config\Resource\DbResourceForm;
+use Icinga\Forms\Config\Resource\DbResourceForm;
 
 class IdoResourcePage extends Form
 {

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
 {

modules/monitoring/application/forms/Setup/LivestatusResourcePage.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\Form\Config\Resource\LivestatusResourceForm;
+use Icinga\Forms\Config\Resource\LivestatusResourceForm;
 
 class LivestatusResourcePage extends Form
 {

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
 {

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;
 

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;

modules/monitoring/library/Monitoring/MonitoringWizard.php

@@ -12,13 +12,13 @@ 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\Forms\Setup\WelcomePage;
-use Icinga\Module\Monitoring\Form\Setup\BackendPage;
+use Icinga\Module\Monitoring\Forms\Setup\BackendPage;
-use Icinga\Module\Monitoring\Form\Setup\InstancePage;
+use Icinga\Module\Monitoring\Forms\Setup\InstancePage;
-use Icinga\Module\Monitoring\Form\Setup\SecurityPage;
+use Icinga\Module\Monitoring\Forms\Setup\SecurityPage;
-use Icinga\Module\Monitoring\Form\Setup\IdoResourcePage;
+use Icinga\Module\Monitoring\Forms\Setup\IdoResourcePage;
-use Icinga\Module\Monitoring\Form\Setup\LivestatusResourcePage;
+use Icinga\Module\Monitoring\Forms\Setup\LivestatusResourcePage;
 
 /**
  * Monitoring Module Setup Wizard

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\Forms\Command\Object\AcknowledgeProblemCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\CheckNowCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\CheckNowCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\DeleteCommentCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\DeleteDowntimeCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ObjectsCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ObjectsCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\RemoveAcknowledgementCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\RemoveAcknowledgementCommandForm;
-use Icinga\Module\Monitoring\Form\Command\Object\ToggleObjectFeaturesCommandForm;
+use Icinga\Module\Monitoring\Forms\Command\Object\ToggleObjectFeaturesCommandForm;
 use Icinga\Web\Hook;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;

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;

modules/setup/application/forms/AuthBackendPage.php

@@ -2,13 +2,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Application\Config;
 use Icinga\Web\Form;
-use Icinga\Form\Config\Authentication\DbBackendForm;
+use Icinga\Forms\Config\Authentication\DbBackendForm;
-use Icinga\Form\Config\Authentication\LdapBackendForm;
+use Icinga\Forms\Config\Authentication\LdapBackendForm;
-use Icinga\Form\Config\Authentication\AutologinBackendForm;
+use Icinga\Forms\Config\Authentication\AutologinBackendForm;
 
 /**
  * Wizard page to define authentication backend specific details

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;

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;

modules/setup/application/forms/DbResourcePage.php

@@ -2,11 +2,11 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use PDOException;
 use Icinga\Web\Form;
-use Icinga\Form\Config\Resource\DbResourceForm;
+use Icinga\Forms\Config\Resource\DbResourceForm;
 use Icinga\Module\Setup\Utils\DbTool;
 
 /**

modules/setup/application/forms/GeneralConfigPage.php

@@ -2,10 +2,10 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 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

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;

modules/setup/application/forms/LdapDiscoveryPage.php

@@ -2,10 +2,10 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
-use Icinga\Form\LdapDiscoveryForm;
+use Icinga\Forms\LdapDiscoveryForm;
 
 /**
  * Wizard page to define the connection details for a LDAP resource

modules/setup/application/forms/LdapResourcePage.php

@@ -2,10 +2,10 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 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

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;

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;

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;

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;
 

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;

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\Forms\ModulePage;
-use Icinga\Module\Setup\Form\WelcomePage;
+use Icinga\Module\Setup\Forms\WelcomePage;
-use Icinga\Module\Setup\Form\SummaryPage;
+use Icinga\Module\Setup\Forms\SummaryPage;
-use Icinga\Module\Setup\Form\DbResourcePage;
+use Icinga\Module\Setup\Forms\DbResourcePage;
-use Icinga\Module\Setup\Form\PreferencesPage;
+use Icinga\Module\Setup\Forms\PreferencesPage;
-use Icinga\Module\Setup\Form\AuthBackendPage;
+use Icinga\Module\Setup\Forms\AuthBackendPage;
-use Icinga\Module\Setup\Form\AdminAccountPage;
+use Icinga\Module\Setup\Forms\AdminAccountPage;
-use Icinga\Module\Setup\Form\LdapDiscoveryPage;
+use Icinga\Module\Setup\Forms\LdapDiscoveryPage;
-use Icinga\Module\Setup\Form\LdapDiscoveryConfirmPage;
+use Icinga\Module\Setup\Forms\LdapDiscoveryConfirmPage;
-use Icinga\Module\Setup\Form\LdapResourcePage;
+use Icinga\Module\Setup\Forms\LdapResourcePage;
-use Icinga\Module\Setup\Form\RequirementsPage;
+use Icinga\Module\Setup\Forms\RequirementsPage;
-use Icinga\Module\Setup\Form\GeneralConfigPage;
+use Icinga\Module\Setup\Forms\GeneralConfigPage;
-use Icinga\Module\Setup\Form\AuthenticationPage;
+use Icinga\Module\Setup\Forms\AuthenticationPage;
-use Icinga\Module\Setup\Form\DatabaseCreationPage;
+use Icinga\Module\Setup\Forms\DatabaseCreationPage;
 use Icinga\Module\Setup\Steps\DatabaseStep;
 use Icinga\Module\Setup\Steps\GeneralConfigStep;
 use Icinga\Module\Setup\Steps\ResourceStep;

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
 {

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

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\Forms\Config\AuthenticationBackendConfigForm;
-use Icinga\Form\Config\AuthenticationBackendReorderForm;
+use Icinga\Forms\Config\AuthenticationBackendReorderForm;
 
 class AuthenticationBackendConfigFormWithoutSave extends AuthenticationBackendConfigForm
 {

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
 {

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
 {

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
 {

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) {
@@ -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);
     }
 }