tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Autoloader: Rename module namespace

This commit is contained in:
Marius Hein 2013-07-15 12:16:14 +02:00
parent e049d8f3c4
commit 6742696e09
41 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Icinga/Application/Loader.php
View File

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

13
library/Icinga/Application/Modules/Module.php
View File

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

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

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

6
modules/monitoring/application/controllers/ShowController.php
View File

@ -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 Icinga\Monitoring\Object\Service;
use Monitoring\Object\Host;
use Monitoring\Object\Service;
class Monitoring_ShowController extends ModuleActionController
{

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

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

2
modules/monitoring/application/views/helpers/Perfdata.php
View File

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

2
modules/monitoring/application/views/scripts/show/history.phtml
View File

@ -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,

2
modules/monitoring/bin/action/list.inc.php
View File

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

4
modules/monitoring/library/Monitoring/Backend.php
View File

@ -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];

4
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
View File

@ -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)

4
modules/monitoring/library/Monitoring/Backend/Ido.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

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

4
modules/monitoring/library/Monitoring/Backend/Livestatus.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Environment.php
View File

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

4
modules/monitoring/library/Monitoring/Object/AbstractObject.php
View File

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

2
modules/monitoring/library/Monitoring/Object/Host.php
View File

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

2
modules/monitoring/library/Monitoring/Object/Service.php
View File

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

2
modules/monitoring/library/Monitoring/Plugin.php
View File

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

2
modules/monitoring/library/Monitoring/Plugin/Perfdata.php
View File

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

2
modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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',

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

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

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

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