tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-20 20:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename namespace Icinga\Form to Icinga\Forms

Browse Source 
refs #7553
This commit is contained in:
Johannes Meyer 2014-11-14 10:57:14 +01:00
parent ea56e4f108
commit 775c20d9ad
42 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/AuthenticationController.php
View File

@ -6,7 +6,7 @@
use Icinga\Authentication\Backend\AutoLoginBackend; use Icinga\Authentication\Backend\AutoLoginBackend;
use Icinga\Web\Controller\ActionController; use Icinga\Web\Controller\ActionController;
use Icinga\Form\Authentication\LoginForm; use Icinga\Forms\Authentication\LoginForm;
use Icinga\Authentication\AuthChain; use Icinga\Authentication\AuthChain;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Application\Logger; use Icinga\Application\Logger;

10
application/controllers/ConfigController.php
View File

@ -8,11 +8,11 @@ use Icinga\Application\Modules\Module;
use Icinga\Web\Widget; use Icinga\Web\Widget;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Config; 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; use Icinga\Data\ResourceFactory;

2
application/controllers/DashboardController.php
View File

@ -8,7 +8,7 @@ use Icinga\Exception\ConfigurationError;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Exception\NotReadableError; use Icinga\Exception\NotReadableError;
use Icinga\File\Ini\IniWriter; use Icinga\File\Ini\IniWriter;
use Icinga\Form\Dashboard\AddUrlForm; use Icinga\Forms\Dashboard\AddUrlForm;
use Icinga\Web\Controller\ActionController; use Icinga\Web\Controller\ActionController;
use Icinga\Web\Url; use Icinga\Web\Url;
use Icinga\Web\Widget\Dashboard; use Icinga\Web\Widget\Dashboard;

2
application/controllers/PreferenceController.php
View File

@ -6,7 +6,7 @@ use Icinga\Web\Controller\BasePreferenceController;
use Icinga\Web\Url; use Icinga\Web\Url;
use Icinga\Web\Widget\Tab; use Icinga\Web\Widget\Tab;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Form\PreferenceForm; use Icinga\Forms\PreferenceForm;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\User\Preferences\PreferencesStore; use Icinga\User\Preferences\PreferencesStore;

2
application/forms/Authentication/LoginForm.php
View File

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

2
application/forms/Config/Authentication/AutologinBackendForm.php
View File

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

2
application/forms/Config/Authentication/DbBackendForm.php
View File

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

2
application/forms/Config/Authentication/LdapBackendForm.php
View File

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

10
application/forms/Config/AuthenticationBackendConfigForm.php
View File

@ -2,19 +2,19 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Form\Config; namespace Icinga\Forms\Config;
use InvalidArgumentException; use InvalidArgumentException;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Form\ConfigForm; use Icinga\Forms\ConfigForm;
use Icinga\Web\Notification; use Icinga\Web\Notification;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Application\Platform; use Icinga\Application\Platform;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Exception\ConfigurationError; 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 class AuthenticationBackendConfigForm extends ConfigForm
{ {

4
application/forms/Config/AuthenticationBackendReorderForm.php
View File

@ -2,12 +2,12 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Form\Config; namespace Icinga\Forms\Config;
use InvalidArgumentException; use InvalidArgumentException;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Notification; use Icinga\Web\Notification;
use Icinga\Form\ConfigForm; use Icinga\Forms\ConfigForm;
class AuthenticationBackendReorderForm extends ConfigForm class AuthenticationBackendReorderForm extends ConfigForm
{ {

2
application/forms/Config/General/ApplicationConfigForm.php
View File

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

2
application/forms/Config/General/LoggingConfigForm.php
View File

@ -2,7 +2,7 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Form\Config\General; namespace Icinga\Forms\Config\General;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;

8
application/forms/Config/GeneralConfigForm.php
View File

@ -2,13 +2,13 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Form\Config; namespace Icinga\Forms\Config;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Notification; 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 * Form class for application-wide and logging specific settings

2
application/forms/Config/Resource/DbResourceForm.php
View File

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

2
application/forms/Config/Resource/FileResourceForm.php
View File

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

2
application/forms/Config/Resource/LdapResourceForm.php
View File

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

2
application/forms/Config/Resource/LivestatusResourceForm.php
View File

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

12
application/forms/Config/ResourceConfigForm.php
View File

@ -2,16 +2,16 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Form\Config; namespace Icinga\Forms\Config;
use InvalidArgumentException; use InvalidArgumentException;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Notification; 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\Application\Platform;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;

2
application/forms/ConfigForm.php
View File

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

2
application/forms/ConfirmRemovalForm.php
View File

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

2
application/forms/Dashboard/AddUrlForm.php
View File

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

2
application/forms/LdapDiscoveryForm.php
View File

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

2
application/forms/PreferenceForm.php
View File

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

4
library/Icinga/Application/Web.php
View File

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

2
modules/monitoring/application/controllers/ConfigController.php
View File

@ -4,7 +4,7 @@
use Icinga\Web\Notification; use Icinga\Web\Notification;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Form\ConfirmRemovalForm; use Icinga\Forms\ConfirmRemovalForm;
use Icinga\Web\Controller\ModuleActionController; use Icinga\Web\Controller\ModuleActionController;
use Icinga\Module\Monitoring\Form\Config\BackendConfigForm; use Icinga\Module\Monitoring\Form\Config\BackendConfigForm;
use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm; use Icinga\Module\Monitoring\Form\Config\InstanceConfigForm;

2
modules/monitoring/application/forms/Config/BackendConfigForm.php
View File

@ -7,7 +7,7 @@ namespace Icinga\Module\Monitoring\Form\Config;
use InvalidArgumentException; use InvalidArgumentException;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Notification; use Icinga\Web\Notification;
use Icinga\Form\ConfigForm; use Icinga\Forms\ConfigForm;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;

2
modules/monitoring/application/forms/Config/InstanceConfigForm.php
View File

@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Form\Config;
use InvalidArgumentException; use InvalidArgumentException;
use Icinga\Exception\ConfigurationError; 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\LocalCommandFile;
use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile; use Icinga\Module\Monitoring\Command\Transport\RemoteCommandFile;
use Icinga\Module\Monitoring\Form\Config\Instance\LocalInstanceForm; use Icinga\Module\Monitoring\Form\Config\Instance\LocalInstanceForm;

2
modules/monitoring/application/forms/Config/SecurityConfigForm.php
View File

@ -6,7 +6,7 @@ namespace Icinga\Module\Monitoring\Form\Config;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Notification; use Icinga\Web\Notification;
use Icinga\Form\ConfigForm; use Icinga\Forms\ConfigForm;
/** /**
* Form for modifying security relevant settings * Form for modifying security relevant settings

2
modules/monitoring/application/forms/Setup/IdoResourcePage.php
View File

@ -5,7 +5,7 @@
namespace Icinga\Module\Monitoring\Form\Setup; namespace Icinga\Module\Monitoring\Form\Setup;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Form\Config\Resource\DbResourceForm; use Icinga\Forms\Config\Resource\DbResourceForm;
class IdoResourcePage extends Form class IdoResourcePage extends Form
{ {

2
modules/monitoring/application/forms/Setup/LivestatusResourcePage.php
View File

@ -5,7 +5,7 @@
namespace Icinga\Module\Monitoring\Form\Setup; namespace Icinga\Module\Monitoring\Form\Setup;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Form\Config\Resource\LivestatusResourceForm; use Icinga\Forms\Config\Resource\LivestatusResourceForm;
class LivestatusResourcePage extends Form class LivestatusResourcePage extends Form
{ {

6
modules/setup/application/forms/AuthBackendPage.php
View File

@ -6,9 +6,9 @@ namespace Icinga\Module\Setup\Form;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Web\Form; 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 * Wizard page to define authentication backend specific details

2
modules/setup/application/forms/DbResourcePage.php
View File

@ -6,7 +6,7 @@ namespace Icinga\Module\Setup\Form;
use PDOException; use PDOException;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Form\Config\Resource\DbResourceForm; use Icinga\Forms\Config\Resource\DbResourceForm;
use Icinga\Module\Setup\Utils\DbTool; use Icinga\Module\Setup\Utils\DbTool;
/** /**

2
modules/setup/application/forms/GeneralConfigPage.php
View File

@ -5,7 +5,7 @@
namespace Icinga\Module\Setup\Form; namespace Icinga\Module\Setup\Form;
use Icinga\Web\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 * Wizard page to define the application and logging configuration

2
modules/setup/application/forms/LdapDiscoveryPage.php
View File

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

2
modules/setup/application/forms/LdapResourcePage.php
View File

@ -5,7 +5,7 @@
namespace Icinga\Module\Setup\Form; namespace Icinga\Module\Setup\Form;
use Icinga\Web\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 * Wizard page to define the connection details for a LDAP resource

4
test/php/application/forms/Config/Authentication/DbBackendFormTest.php
View File

@ -2,7 +2,7 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{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 // Necessary as some of these tests disable phpunit's preservation
// of the global state (e.g. autoloaders are in the global state) // 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 Mockery;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Authentication\DbBackendForm; use Icinga\Forms\Config\Authentication\DbBackendForm;
class DbBackendFormTest extends BaseTestCase class DbBackendFormTest extends BaseTestCase
{ {

4
test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
View File

@ -2,7 +2,7 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{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 // Necessary as some of these tests disable phpunit's preservation
// of the global state (e.g. autoloaders are in the global state) // 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 Mockery;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Form\Config\Authentication\LdapBackendForm; use Icinga\Forms\Config\Authentication\LdapBackendForm;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;
class LdapBackendFormTest extends BaseTestCase class LdapBackendFormTest extends BaseTestCase

6
test/php/application/forms/Config/AuthenticationBackendReorderFormTest.php
View File

@ -2,12 +2,12 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Tests\Icinga\Form\Config; namespace Tests\Icinga\Forms\Config;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Application\Config; 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 class AuthenticationBackendConfigFormWithoutSave extends AuthenticationBackendConfigForm
{ {

4
test/php/application/forms/Config/Resource/DbResourceFormTest.php
View File

@ -2,7 +2,7 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{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 // Necessary as some of these tests disable phpunit's preservation
// of the global state (e.g. autoloaders are in the global state) // 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 Mockery;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Resource\DbResourceForm; use Icinga\Forms\Config\Resource\DbResourceForm;
class DbResourceFormTest extends BaseTestCase class DbResourceFormTest extends BaseTestCase
{ {

4
test/php/application/forms/Config/Resource/LdapResourceFormTest.php
View File

@ -2,7 +2,7 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{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 // Necessary as some of these tests disable phpunit's preservation
// of the global state (e.g. autoloaders are in the global state) // 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 Mockery;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Resource\LdapResourceForm; use Icinga\Forms\Config\Resource\LdapResourceForm;
class LdapResourceFormTest extends BaseTestCase class LdapResourceFormTest extends BaseTestCase
{ {

4
test/php/application/forms/Config/Resource/LivestatusResourceFormTest.php
View File

@ -2,7 +2,7 @@
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
// {{{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 // Necessary as some of these tests disable phpunit's preservation
// of the global state (e.g. autoloaders are in the global state) // 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 Mockery;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Resource\LivestatusResourceForm; use Icinga\Forms\Config\Resource\LivestatusResourceForm;
class LivestatusResourceFormTest extends BaseTestCase class LivestatusResourceFormTest extends BaseTestCase
{ {

2
test/php/bootstrap.php
View File

@ -29,7 +29,7 @@ require_once($libraryPath . '/Icinga/Application/Loader.php');
$loader = new Icinga\Application\Loader(); $loader = new Icinga\Application\Loader();
$loader->registerNamespace('Tests', $testLibraryPath); $loader->registerNamespace('Tests', $testLibraryPath);
$loader->registerNamespace('Icinga', $libraryPath . '/Icinga'); $loader->registerNamespace('Icinga', $libraryPath . '/Icinga');
$loader->registerNamespace('Icinga\\Form', $applicationPath . '/forms'); $loader->registerNamespace('Icinga\\Forms', $applicationPath . '/forms');
$modules = scandir($modulePath); $modules = scandir($modulePath);
foreach ($modules as $module) { foreach ($modules as $module) {