Rename namespace Icinga\Form to Icinga\Forms

refs #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\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;
 
 

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

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

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\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;
 

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

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;
 

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;

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

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
 {

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
 {

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

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

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

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

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

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