Autoloader: Rename module namespace

library/Icinga/Application/Loader.php

@@ -40,6 +40,9 @@ class Loader
      */
     private $namespaces = array();
 
+    /**
+     * Detach spl autoload method from stack
+     */
     public function __destruct()
     {
         $this->unRegister();

library/Icinga/Application/Modules/Module.php

@@ -30,6 +30,11 @@ use Icinga\Application\Config;
 use Icinga\Web\Hook;
 use Zend_Controller_Router_Route as Route;
 
+/**
+ * Module handling
+ *
+ * Register modules and initialize it
+ */
 class Module
 {
     /**
@@ -112,6 +117,11 @@ class Module
         return true;
     }
 
+    /**
+     * Test for an enabled module by name
+     * @param string $name
+     * @return boolean
+     */
     public static function exists($name)
     {
         return Icinga::app()->moduleManager()->hasEnabled($name);
@@ -215,9 +225,6 @@ class Module
 
             $this->app->getLoader()->registerNamespace($moduleName, $moduleLibraryDir);
 
-            // TODO(mh): Old namespace for convenience (#4409). Should be removed immediately
-            $this->app->getLoader()->registerNamespace('Icinga\\'. $moduleName, $moduleLibraryDir);
-
             $this->app->getLoader()->registerNamespace($moduleName. '\\Form', $this->getFormDir());
         }
 

modules/monitoring/application/controllers/ListController.php

@@ -3,7 +3,7 @@
 use Icinga\Web\ModuleActionController;
 use Icinga\Web\Hook;
 use Icinga\File\Csv;
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 
 class Monitoring_ListController extends ModuleActionController
 {

modules/monitoring/application/controllers/ShowController.php

@@ -1,10 +1,10 @@
 <?php
 
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 use Icinga\Web\ModuleActionController;
 use Icinga\Web\Hook;
-use Icinga\Monitoring\Object\Host;
+use Monitoring\Object\Host;
-use Icinga\Monitoring\Object\Service;
+use Monitoring\Object\Service;
 
 class Monitoring_ShowController extends ModuleActionController
 {

modules/monitoring/application/controllers/SoapController.php

@@ -2,7 +2,7 @@
 
 use Icinga\Web\ModuleActionController;
 use Icinga\Web\Url;
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 use Zend_Soap_Server as ZfSoapServer;
 use Zend_Soap_AutoDiscover as ZfSoapAutoDiscover;
 

modules/monitoring/application/views/helpers/Perfdata.php

@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Monitoring\Plugin\PerfdataSet;
+use Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {

modules/monitoring/application/views/scripts/show/history.phtml

@@ -27,7 +27,7 @@ $row_class = array_key_exists($event->state, $states) ? $states[$event->state] :
 <? if (! $object): ?>
 <td><?= $this->escape($event->host_name) ?></td>
 <? endif ?>
-<? if (! $object instanceof Icinga\Monitoring\Object\Service): ?>
+<? if (! $object instanceof Monitoring\Object\Service): ?>
 <td><? if ($object): ?>
 <?= $this->qlink(
     $event->service_description,

modules/monitoring/bin/action/list.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-use Icinga\Monitoring\Backend;
+use Monitoring\Backend;
 use Icinga\Util\Format;
 
 $backend = Backend::getInstance($params->shift('backend'));

modules/monitoring/library/Monitoring/Backend.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring;
+namespace Monitoring;
 
 use Icinga\Application\Config as IcingaConfig;
 use Icinga\Authentication\Manager as AuthManager;
@@ -62,7 +62,7 @@ class Backend
             $config = self::$backendConfigs[$name];
             $type = $config->type;
             $type[0] = strtoupper($type[0]);
-            $class = '\\Icinga\\Monitoring\\Backend\\' . $type;
+            $class = '\\Monitoring\\Backend\\' . $type;
             self::$instances[$name] = new $class($config);
         }
         return self::$instances[$name];

modules/monitoring/library/Monitoring/Backend/AbstractBackend.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend;
+namespace Monitoring\Backend;
 
 use Icinga\Data\DatasourceInterface;
 use Icinga\Exception\ProgrammingError;
@@ -66,7 +66,7 @@ class AbstractBackend implements DatasourceInterface
 
     protected function tableToClassName($virtual_table)
     {
-        return 'Icinga\\Monitoring\\View\\'
+        return 'Monitoring\\View\\'
              // . $this->getName()
              // . '\\'
              . ucfirst($virtual_table)

modules/monitoring/library/Monitoring/Backend/Ido.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Icinga\Monitoring\Backend;
+namespace Monitoring\Backend;
 
 use Icinga\Data\Db\Connection;
 
 /**
  * This class provides an easy-to-use interface to the IDO database
  *
- * You should usually not directly use this class but go through Icinga\Monitoring\Backend.
+ * You should usually not directly use this class but go through Monitoring\Backend.
  *
  * New MySQL indexes:
  * <code>

modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 use Icinga\Data\Db\Query;
 use Icinga\Application\Benchmark;

modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class CommentQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ContactQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ContactgroupQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class CustomvarQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 use Icinga\Exception\ProgrammingError;
 

modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class HostgroupQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class HoststatusQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ServicegroupQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class ServicestatusQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Ido\Query;
+namespace Monitoring\Backend\Ido\Query;
 
 class StatusQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Livestatus.php

@@ -3,9 +3,9 @@
 /**
  * Icinga Livestatus Backend
  *
- * @package Icinga\Monitoring
+ * @package Monitoring
  */
-namespace Icinga\Monitoring\Backend;
+namespace Monitoring\Backend;
 
 use Icinga\Protocol\Livestatus\Connection;
 

modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Livestatus\Query;
+namespace Monitoring\Backend\Livestatus\Query;
 
 use Icinga\Data\AbstractQuery;
 

modules/monitoring/library/Monitoring/Environment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring;
+namespace Monitoring;
 
 use Icinga\Application\Config;
 use Icinga\Web\Session;

modules/monitoring/library/Monitoring/Object/AbstractObject.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Icinga\Monitoring\Object;
+namespace Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
-use Icinga\Monitoring\Backend\AbstractBackend;
+use Monitoring\Backend\AbstractBackend;
 
 abstract class AbstractObject
 {

modules/monitoring/library/Monitoring/Object/Host.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Object;
+namespace Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
 

modules/monitoring/library/Monitoring/Object/Service.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Object;
+namespace Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
 

modules/monitoring/library/Monitoring/Plugin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring;
+namespace Monitoring;
 
 require_once ICINGA_LIBDIR . '/Icinga/Application/Cli.php';
 

modules/monitoring/library/Monitoring/Plugin/Perfdata.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Plugin;
+namespace Monitoring\Plugin;
 
 class Perfdata
 {

modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Plugin;
+namespace Monitoring\Plugin;
 
 class PerfdataSet
 {

modules/monitoring/library/Monitoring/View/CommentView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class CommentView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/ContactView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class ContactView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/ContactgroupView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class ContactgroupView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/CustomvarView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class CustomvarView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/EventHistoryView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class EventHistoryView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/HostgroupView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class HostgroupView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/HoststatusView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class HoststatusView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/MonitoringView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 use Icinga\Data\AbstractQuery;
 use Icinga\Data\Filter;
@@ -13,11 +13,11 @@ use Icinga\Data\Filter;
  *
  * You should not directly instantiate such a view but always go through the
  * Monitoring Backend. Using the Backend's select() method selecting from
- * 'virtualtable' returns a Icinga\Monitoring\View\VirtualtableView instance.
+ * 'virtualtable' returns a Monitoring\View\VirtualtableView instance.
  *
  * Usage example:
  * <code>
- * use Icinga\Monitoring\Backend;
+ * use Monitoring\Backend;
  * $backend = Backend::getInstance();
  * $query = $backend->select()->from('viewname', array(
  *     'one_column',

modules/monitoring/library/Monitoring/View/ServicegroupView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class ServicegroupView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/StatusView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\View;
+namespace Monitoring\View;
 
 class StatusView extends MonitoringView
 {