Controllers: namespace all of them

application/controllers/CommandController.php

@@ -1,10 +1,11 @@
 <?php
 
-use Icinga\Module\Director\Web\Controller\ObjectController;
+namespace Icinga\Module\Director\Controllers;
 
+use Icinga\Module\Director\Web\Controller\ObjectController;
 use Icinga\Data\Filter\Filter;
 
-class Director_CommandController extends ObjectController
+class CommandController extends ObjectController
 {
     public function init()
     {

application/controllers/CommandsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_CommandsController extends ObjectsController
+class CommandsController extends ObjectsController
 {
 }

application/controllers/CommandtemplatesController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_CommandtemplatesController extends ObjectsController
+class CommandtemplatesController extends ObjectsController
 {
 }

application/controllers/ConfigController.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
@@ -8,7 +10,7 @@ use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\Core\CoreApi;
 use Icinga\Web\Notification;
 
-class Director_ConfigController extends ActionController
+class ConfigController extends ActionController
 {
     public function deployAction()
     {

application/controllers/DatafieldController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_DatafieldController extends ActionController
+class DatafieldController extends ActionController
 {
     public function addAction()
     {

application/controllers/DatalistController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_DatalistController extends ActionController
+class DatalistController extends ActionController
 {
     public function addAction()
     {

application/controllers/DatalistentryController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_DatalistentryController extends ActionController
+class DatalistentryController extends ActionController
 {
     public function addAction()
     {

application/controllers/DeploymentController.php

@@ -1,10 +1,12 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\DirectorDeploymentLog;
 use Icinga\Module\Director\Util;
 
-class Director_DeploymentController extends ActionController
+class DeploymentController extends ActionController
 {
     public function showAction()
     {

application/controllers/EndpointController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_EndpointController extends ObjectController
+class EndpointController extends ObjectController
 {
 }

application/controllers/EndpointsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_EndpointsController extends ObjectsController
+class EndpointsController extends ObjectsController
 {
 }

application/controllers/HostController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_HostController extends ObjectController
+class HostController extends ObjectController
 {
 }

application/controllers/HostgroupController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_HostgroupController extends ObjectController
+class HostgroupController extends ObjectController
 {
 }

application/controllers/HostgroupsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_HostgroupsController extends ObjectsController
+class HostgroupsController extends ObjectsController
 {
 }

application/controllers/HostsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_HostsController extends ObjectsController
+class HostsController extends ObjectsController
 {
 }

application/controllers/HosttemplatesController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_HosttemplatesController extends ObjectsController
+class HosttemplatesController extends ObjectsController
 {
 }

application/controllers/ImportrunController.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Web\Hook\ImportSourceHook;
 use Icinga\Module\Director\Util;
@@ -8,7 +10,7 @@ use Icinga\Module\Director\Import\Import;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
-class Director_ImportrunController extends ActionController
+class ImportrunController extends ActionController
 {
     public function indexAction()
     {

application/controllers/ImportsourceController.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Web\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\ImportSource;
@@ -8,7 +10,7 @@ use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 
-class Director_ImportsourceController extends ActionController
+class ImportsourceController extends ActionController
 {
     public function addAction()
     {

application/controllers/InspectController.php

@@ -1,10 +1,12 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\Core\CoreApi;
 
-class Director_InspectController extends ActionController
+class InspectController extends ActionController
 {
     public function typesAction()
     {

application/controllers/ListController.php

@@ -1,11 +1,13 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Core\RestApiClient;
 use Icinga\Module\Director\Core\CoreApi;
 use Exception;
 
-class Director_ListController extends ActionController
+class ListController extends ActionController
 {
     public function activitylogAction()
     {

application/controllers/SchemaController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_SchemaController extends ActionController
+class SchemaController extends ActionController
 {
     protected $schema;
 

application/controllers/ServiceController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_ServiceController extends ObjectController
+class ServiceController extends ObjectController
 {
     public function init()
     {

application/controllers/ServicegroupController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_ServicegroupController extends ObjectController
+class ServicegroupController extends ObjectController
 {
 }

application/controllers/ServicegroupsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ServicegroupsController extends ObjectsController
+class ServicegroupsController extends ObjectsController
 {
 }

application/controllers/ServicesController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ServicesController extends ObjectsController
+class ServicesController extends ObjectsController
 {
 }

application/controllers/ServicetemplatesController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ServicetemplatesController extends ObjectsController
+class ServicetemplatesController extends ObjectsController
 {
 }

application/controllers/SettingsController.php

@@ -1,9 +1,11 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Forms\ConfigForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_SettingsController extends ActionController
+class SettingsController extends ActionController
 {
     public function indexAction()
     {

application/controllers/ShowController.php

@@ -1,12 +1,14 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\IcingaConfig\IcingaConfig;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\ConfigDiff;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_ShowController extends ActionController
+class ShowController extends ActionController
 {
     public function activitylogAction()
     {

application/controllers/SyncpropertyController.php

@@ -1,12 +1,14 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\SyncProperty;
 use Icinga\Module\Director\Sync\Sync;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
-class Director_SyncpropertyController extends ActionController
+class SyncpropertyController extends ActionController
 {
     public function addAction()
     {

application/controllers/SyncruleController.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 use Icinga\Module\Director\Objects\SyncRule;
 use Icinga\Module\Director\Import\Sync;
@@ -7,7 +9,7 @@ use Icinga\Data\Filter\Filter;
 use Icinga\Exception\InvalidPropertyException;
 use Icinga\Web\Notification;
 
-class Director_SyncruleController extends ActionController
+class SyncruleController extends ActionController
 {
     public function addAction()
     {

application/controllers/TimeperiodController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_TimeperiodController extends ObjectController
+class TimeperiodController extends ObjectController
 {
 }

application/controllers/TimeperiodsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_TimeperiodsController extends ObjectsController
+class TimeperiodsController extends ObjectsController
 {
 }

application/controllers/UserController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_UserController extends ObjectController
+class UserController extends ObjectController
 {
 }

application/controllers/UsergroupController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_UsergroupController extends ObjectController
+class UsergroupController extends ObjectController
 {
 }

application/controllers/UsergroupsController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_UsergroupsController extends ObjectsController
+class UsergroupsController extends ObjectsController
 {
 }

application/controllers/UsersController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_UsersController extends ObjectsController
+class UsersController extends ObjectsController
 {
 }

application/controllers/WelcomeController.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ActionController;
 
-class Director_WelcomeController extends ActionController
+class WelcomeController extends ActionController
 {
     public function indexAction()
     {

application/controllers/ZoneController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectController;
 
-class Director_ZoneController extends ObjectController
+class ZoneController extends ObjectController
 {
 }

application/controllers/ZonesController.php

@@ -1,7 +1,9 @@
 <?php
 
+namespace Icinga\Module\Director\Controllers;
+
 use Icinga\Module\Director\Web\Controller\ObjectsController;
 
-class Director_ZonesController extends ObjectsController
+class ZonesController extends ObjectsController
 {
 }