From 87a59675011a4cf284d8e44c4fb66042ad84c39f Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Wed, 27 Aug 2014 11:16:44 +0200 Subject: [PATCH] Remove leading backslashes from the targets of use statements - use \Exception; + use Exception; --- .../controllers/DashboardController.php | 2 +- application/controllers/StaticController.php | 2 +- .../Config/Authentication/BaseBackendForm.php | 4 ++-- .../Config/Authentication/DbBackendForm.php | 4 ++-- .../Config/Authentication/LdapBackendForm.php | 4 ++-- .../Config/Authentication/ReorderForm.php | 2 +- application/forms/Config/LoggingForm.php | 2 +- application/forms/Preference/GeneralForm.php | 18 +++++++++--------- application/views/helpers/FormDateTime.php | 2 +- .../views/helpers/FormTriStateCheckbox.php | 2 +- library/Icinga/Application/functions.php | 2 +- library/Icinga/Chart/Primitive/Rect.php | 4 ++-- .../Commandpipe/Transport/Transport.php | 2 +- library/Icinga/Protocol/Ldap/Connection.php | 2 +- .../Statusdat/View/MonitoringObjectList.php | 8 ++++---- .../User/Preferences/PreferencesStore.php | 2 +- .../Web/Form/Decorator/ConditionalHidden.php | 2 +- .../Icinga/Web/Form/Element/DateTimePicker.php | 6 +++--- .../Web/Form/Element/TriStateCheckbox.php | 4 ++-- .../Web/Form/Validator/DateFormatValidator.php | 2 +- .../Web/Form/Validator/DateTimeValidator.php | 6 +++--- .../Web/Form/Validator/TimeFormatValidator.php | 2 +- .../Web/Form/Validator/TriStateValidator.php | 2 +- .../Form/Validator/WritablePathValidator.php | 4 ++-- library/Icinga/Web/Hook/TopBarHook.php | 4 ++-- .../Icinga/Web/Session/SessionNamespace.php | 6 +++--- .../controllers/IcingawebController.php | 2 +- .../controllers/ModuleController.php | 2 +- modules/doc/run.php | 2 +- .../controllers/ConfigController.php | 2 +- .../controllers/MonitoringCommands.php | 2 +- .../controllers/TimelineController.php | 6 +++--- .../forms/Command/AcknowledgeForm.php | 8 ++++---- .../forms/Command/MultiCommandFlagForm.php | 8 ++++---- .../Command/SingleArgumentCommandForm.php | 2 +- .../Command/SubmitPassiveCheckResultForm.php | 2 +- .../forms/Config/Backend/CreateBackendForm.php | 2 +- .../Config/Instance/CreateInstanceForm.php | 4 ++-- .../forms/Config/Instance/EditInstanceForm.php | 4 ++-- .../views/helpers/ResolveMacros.php | 2 +- modules/monitoring/bin/action/list.inc.php | 2 +- .../Backend/Ido/Query/StatusSummaryQuery.php | 2 +- .../Exception/UnsupportedBackendException.php | 2 +- .../library/Monitoring/Timeline/TimeEntry.php | 2 +- .../library/Monitoring/Timeline/TimeLine.php | 8 ++++---- .../views/helpers/MonitoringFlagsTest.php | 2 +- .../views/helpers/MonitoringPropertiesTest.php | 2 +- .../views/helpers/ResolveMacrosTest.php | 4 ++-- .../Translation/Cli/TranslationCommand.php | 2 +- .../Config/Authentication/ReorderFormTest.php | 4 ++-- .../library/Icinga/Application/ConfigTest.php | 2 +- .../library/Icinga/Chart/GraphChartTest.php | 4 ++-- test/php/library/Icinga/Chart/PieChartTest.php | 4 ++-- .../Protocol/Commandpipe/CommandPipeTest.php | 2 +- .../library/Icinga/Protocol/Ldap/QueryTest.php | 2 +- 55 files changed, 96 insertions(+), 96 deletions(-) diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 108117959..dc48dd7f3 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_Config; +use Zend_Config; use Icinga\Web\Url; use Icinga\Logger\Logger; use Icinga\Config\PreservingIniWriter; diff --git a/application/controllers/StaticController.php b/application/controllers/StaticController.php index 3a15b1b1e..51b5fdb62 100644 --- a/application/controllers/StaticController.php +++ b/application/controllers/StaticController.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_Controller_Action_Exception as ActionException; +use Zend_Controller_Action_Exception as ActionException; use Icinga\Web\Controller\ActionController; use Icinga\Application\Icinga; use Icinga\Logger\Logger; diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php index 7a34f236a..f670b25c1 100644 --- a/application/forms/Config/Authentication/BaseBackendForm.php +++ b/application/forms/Config/Authentication/BaseBackendForm.php @@ -4,8 +4,8 @@ namespace Icinga\Form\Config\Authentication; -use \Zend_Config; -use \Zend_Form_Element_Checkbox; +use Zend_Config; +use Zend_Form_Element_Checkbox; use Icinga\Web\Form; use Icinga\Data\ResourceFactory; use Icinga\Web\Form\Decorator\HelpText; diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php index 2c57b82e2..82594280b 100644 --- a/application/forms/Config/Authentication/DbBackendForm.php +++ b/application/forms/Config/Authentication/DbBackendForm.php @@ -4,8 +4,8 @@ namespace Icinga\Form\Config\Authentication; -use \Exception; -use \Zend_Config; +use Exception; +use Zend_Config; use Icinga\Data\ResourceFactory; use Icinga\Authentication\DbConnection; use Icinga\Authentication\Backend\DbUserBackend; diff --git a/application/forms/Config/Authentication/LdapBackendForm.php b/application/forms/Config/Authentication/LdapBackendForm.php index ee90fa95c..89f446795 100644 --- a/application/forms/Config/Authentication/LdapBackendForm.php +++ b/application/forms/Config/Authentication/LdapBackendForm.php @@ -4,8 +4,8 @@ namespace Icinga\Form\Config\Authentication; -use \Exception; -use \Zend_Config; +use Exception; +use Zend_Config; use Icinga\Web\Form; use Icinga\Data\ResourceFactory; use Icinga\Authentication\Backend\LdapUserBackend; diff --git a/application/forms/Config/Authentication/ReorderForm.php b/application/forms/Config/Authentication/ReorderForm.php index a074febea..b4c3cd9b7 100644 --- a/application/forms/Config/Authentication/ReorderForm.php +++ b/application/forms/Config/Authentication/ReorderForm.php @@ -4,7 +4,7 @@ namespace Icinga\Form\Config\Authentication; -use \Zend_Config; +use Zend_Config; use Icinga\Web\Form; /** diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php index b3b4089c8..1fcb30fa5 100644 --- a/application/forms/Config/LoggingForm.php +++ b/application/forms/Config/LoggingForm.php @@ -4,7 +4,7 @@ namespace Icinga\Form\Config; -use \Zend_Config; +use Zend_Config; use Icinga\Web\Form; use Icinga\Application\Icinga; use Icinga\Web\Form\Validator\WritablePathValidator; diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php index 204ddc51d..5b9a1b95f 100644 --- a/application/forms/Preference/GeneralForm.php +++ b/application/forms/Preference/GeneralForm.php @@ -4,15 +4,15 @@ namespace Icinga\Form\Preference; -use \DateTimeZone; -use \Zend_Config; -use \Zend_Form_Element_Text; -use \Zend_Form_Element_Select; -use \Zend_View_Helper_DateFormat; -use \Icinga\Web\Form; -use \Icinga\Web\Form\Validator\TimeFormatValidator; -use \Icinga\Web\Form\Validator\DateFormatValidator; -use \Icinga\Util\Translator; +use DateTimeZone; +use Zend_Config; +use Zend_Form_Element_Text; +use Zend_Form_Element_Select; +use Zend_View_Helper_DateFormat; +use Icinga\Web\Form; +use Icinga\Web\Form\Validator\TimeFormatValidator; +use Icinga\Web\Form\Validator\DateFormatValidator; +use Icinga\Util\Translator; /** * General user preferences diff --git a/application/views/helpers/FormDateTime.php b/application/views/helpers/FormDateTime.php index 07d5fb930..19a9cc3c5 100644 --- a/application/views/helpers/FormDateTime.php +++ b/application/views/helpers/FormDateTime.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_View_Helper_FormElement; +use Zend_View_Helper_FormElement; /** * Helper to generate a "datetime" element diff --git a/application/views/helpers/FormTriStateCheckbox.php b/application/views/helpers/FormTriStateCheckbox.php index 695c9af56..b69114a11 100644 --- a/application/views/helpers/FormTriStateCheckbox.php +++ b/application/views/helpers/FormTriStateCheckbox.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_View_Helper_FormElement; +use Zend_View_Helper_FormElement; /** * Helper to generate a "datetime" element diff --git a/library/Icinga/Application/functions.php b/library/Icinga/Application/functions.php index cfa5620ba..422dfeab7 100644 --- a/library/Icinga/Application/functions.php +++ b/library/Icinga/Application/functions.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Icinga\Util\Translator; +use Icinga\Util\Translator; if (extension_loaded('gettext')) { function t($messageId) diff --git a/library/Icinga/Chart/Primitive/Rect.php b/library/Icinga/Chart/Primitive/Rect.php index 36b63912f..fc389e204 100644 --- a/library/Icinga/Chart/Primitive/Rect.php +++ b/library/Icinga/Chart/Primitive/Rect.php @@ -4,8 +4,8 @@ namespace Icinga\Chart\Primitive; -use \DomElement; -use \Icinga\Chart\Render\RenderContext; +use DomElement; +use Icinga\Chart\Render\RenderContext; use Icinga\Chart\Format; /** diff --git a/library/Icinga/Protocol/Commandpipe/Transport/Transport.php b/library/Icinga/Protocol/Commandpipe/Transport/Transport.php index c5a5b3883..59119cf13 100644 --- a/library/Icinga/Protocol/Commandpipe/Transport/Transport.php +++ b/library/Icinga/Protocol/Commandpipe/Transport/Transport.php @@ -4,7 +4,7 @@ namespace Icinga\Protocol\Commandpipe\Transport; -use \Zend_Config; +use Zend_Config; /** * Interface for Transport classes handling the concrete access to the command pipe diff --git a/library/Icinga/Protocol/Ldap/Connection.php b/library/Icinga/Protocol/Ldap/Connection.php index edd99d021..531a399c8 100644 --- a/library/Icinga/Protocol/Ldap/Connection.php +++ b/library/Icinga/Protocol/Ldap/Connection.php @@ -8,7 +8,7 @@ use Icinga\Protocol\Ldap\Exception as LdapException; use Icinga\Application\Platform; use Icinga\Application\Config; use Icinga\Logger\Logger; -use \Zend_Config; +use Zend_Config; /** * Backend class managing all the LDAP stuff for you. diff --git a/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php b/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php index 8c6fdf0bc..e9a7e1bc9 100644 --- a/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php +++ b/library/Icinga/Protocol/Statusdat/View/MonitoringObjectList.php @@ -4,10 +4,10 @@ namespace Icinga\Protocol\Statusdat\View; -use \Iterator; -use \Countable; -use \ArrayAccess; -use \Exception; +use Iterator; +use Countable; +use ArrayAccess; +use Exception; /** * Wrapper around an array of monitoring objects that can be enhanced with an optional diff --git a/library/Icinga/User/Preferences/PreferencesStore.php b/library/Icinga/User/Preferences/PreferencesStore.php index 749d054dc..b8121eb25 100644 --- a/library/Icinga/User/Preferences/PreferencesStore.php +++ b/library/Icinga/User/Preferences/PreferencesStore.php @@ -4,7 +4,7 @@ namespace Icinga\User\Preferences; -use \Zend_Config; +use Zend_Config; use Icinga\User; use Icinga\User\Preferences; use Icinga\Data\ResourceFactory; diff --git a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php index 5d29caee4..c24f637ba 100644 --- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php +++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php @@ -4,7 +4,7 @@ namespace Icinga\Web\Form\Decorator; -use \Zend_Form_Decorator_Abstract; +use Zend_Form_Decorator_Abstract; /** * Decorator to hide elements using a >noscript< tag instead of diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php index 911e26322..dd48bd7f2 100644 --- a/library/Icinga/Web/Form/Element/DateTimePicker.php +++ b/library/Icinga/Web/Form/Element/DateTimePicker.php @@ -5,9 +5,9 @@ namespace Icinga\Web\Form\Element; use Icinga\Web\Form\Validator\DateTimeValidator; -use \Zend_Form_Element_Text; -use \Zend_Form_Element; -use \Icinga\Util\DateTimeFactory; +use Zend_Form_Element_Text; +use Zend_Form_Element; +use Icinga\Util\DateTimeFactory; /** * Datetime form element which returns the input as Unix timestamp after the input has been proven valid. Utilizes diff --git a/library/Icinga/Web/Form/Element/TriStateCheckbox.php b/library/Icinga/Web/Form/Element/TriStateCheckbox.php index fb6ffb692..45763880d 100644 --- a/library/Icinga/Web/Form/Element/TriStateCheckbox.php +++ b/library/Icinga/Web/Form/Element/TriStateCheckbox.php @@ -4,8 +4,8 @@ namespace Icinga\Web\Form\Element; -use \Icinga\Web\Form\Validator\TriStateValidator; -use \Zend_Form_Element_Xhtml; +use Icinga\Web\Form\Validator\TriStateValidator; +use Zend_Form_Element_Xhtml; /** * A checkbox that can display three different states: diff --git a/library/Icinga/Web/Form/Validator/DateFormatValidator.php b/library/Icinga/Web/Form/Validator/DateFormatValidator.php index 2b2a413fd..b11629cbf 100644 --- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php +++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php @@ -4,7 +4,7 @@ namespace Icinga\Web\Form\Validator; -use \Zend_Validate_Abstract; +use Zend_Validate_Abstract; /** * Validator that checks if a textfield contains a correct date format diff --git a/library/Icinga/Web/Form/Validator/DateTimeValidator.php b/library/Icinga/Web/Form/Validator/DateTimeValidator.php index 952ac6c86..f1952f7d4 100644 --- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php +++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php @@ -4,9 +4,9 @@ namespace Icinga\Web\Form\Validator; -use \Icinga\Util\DateTimeFactory; -use \Zend_Validate_Abstract; -use \Icinga\Exception\ProgrammingError; +use Icinga\Util\DateTimeFactory; +use Zend_Validate_Abstract; +use Icinga\Exception\ProgrammingError; /** * Validator that checks if a textfield contains a correct date format diff --git a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php index 1715f7fdb..a02581cfa 100644 --- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php +++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php @@ -4,7 +4,7 @@ namespace Icinga\Web\Form\Validator; -use \Zend_Validate_Abstract; +use Zend_Validate_Abstract; /** * Validator that checks if a textfield contains a correct time format diff --git a/library/Icinga/Web/Form/Validator/TriStateValidator.php b/library/Icinga/Web/Form/Validator/TriStateValidator.php index f05f35b27..e51e00e21 100644 --- a/library/Icinga/Web/Form/Validator/TriStateValidator.php +++ b/library/Icinga/Web/Form/Validator/TriStateValidator.php @@ -4,7 +4,7 @@ namespace Icinga\Web\Form\Validator; -use \Zend_Validate_Abstract; +use Zend_Validate_Abstract; class TriStateValidator extends Zend_Validate_Abstract { diff --git a/library/Icinga/Web/Form/Validator/WritablePathValidator.php b/library/Icinga/Web/Form/Validator/WritablePathValidator.php index 1381da9c7..8387c5cf5 100644 --- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php +++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php @@ -4,8 +4,8 @@ namespace Icinga\Web\Form\Validator; -use \Zend_Validate_Abstract; -use \Icinga\Application\Config as IcingaConfig; +use Zend_Validate_Abstract; +use Icinga\Application\Config as IcingaConfig; /** * Validator that interprets the value as a path and checks if it's writable diff --git a/library/Icinga/Web/Hook/TopBarHook.php b/library/Icinga/Web/Hook/TopBarHook.php index 695d81109..fb637015d 100644 --- a/library/Icinga/Web/Hook/TopBarHook.php +++ b/library/Icinga/Web/Hook/TopBarHook.php @@ -4,8 +4,8 @@ namespace Icinga\Web\Hook; -use \Icinga\Web\Request; -use \Zend_View; +use Icinga\Web\Request; +use Zend_View; /** * Hook to extend topbar items diff --git a/library/Icinga/Web/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php index 8862d343f..682991aed 100644 --- a/library/Icinga/Web/Session/SessionNamespace.php +++ b/library/Icinga/Web/Session/SessionNamespace.php @@ -4,9 +4,9 @@ namespace Icinga\Web\Session; -use \Exception; -use \ArrayIterator; -use \IteratorAggregate; +use Exception; +use ArrayIterator; +use IteratorAggregate; /** * Container for session values diff --git a/modules/doc/application/controllers/IcingawebController.php b/modules/doc/application/controllers/IcingawebController.php index 967a2b768..ecbe3a6ee 100644 --- a/modules/doc/application/controllers/IcingawebController.php +++ b/modules/doc/application/controllers/IcingawebController.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_Controller_Action_Exception; +use Zend_Controller_Action_Exception; use Icinga\Application\Icinga; use Icinga\Module\Doc\DocController; diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php index 40913368c..fa6c69d19 100644 --- a/modules/doc/application/controllers/ModuleController.php +++ b/modules/doc/application/controllers/ModuleController.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_Controller_Action_Exception; +use Zend_Controller_Action_Exception; use Icinga\Application\Icinga; use Icinga\Module\Doc\DocController; use Icinga\Module\Doc\Exception\DocException; diff --git a/modules/doc/run.php b/modules/doc/run.php index 7392e4c22..5edb69093 100644 --- a/modules/doc/run.php +++ b/modules/doc/run.php @@ -1,6 +1,6 @@ isCli()) { diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php index f0982c29a..f0322dc3f 100644 --- a/modules/monitoring/application/controllers/ConfigController.php +++ b/modules/monitoring/application/controllers/ConfigController.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Exception; +use Exception; use Icinga\Config\PreservingIniWriter; use Icinga\Web\Controller\ModuleActionController; diff --git a/modules/monitoring/application/controllers/MonitoringCommands.php b/modules/monitoring/application/controllers/MonitoringCommands.php index faa04114e..16b713d4c 100644 --- a/modules/monitoring/application/controllers/MonitoringCommands.php +++ b/modules/monitoring/application/controllers/MonitoringCommands.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Icinga\Module\Monitoring\Command\Meta; +use Icinga\Module\Monitoring\Command\Meta; /** * Class MonitoringCommands diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php index 3fa621f3e..2f9b1339d 100644 --- a/modules/monitoring/application/controllers/TimelineController.php +++ b/modules/monitoring/application/controllers/TimelineController.php @@ -2,9 +2,9 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \DateTime; -use \DateInterval; -use \Zend_Config; +use DateTime; +use DateInterval; +use Zend_Config; use Icinga\Web\Url; use Icinga\Util\Format; use Icinga\Application\Config; diff --git a/modules/monitoring/application/forms/Command/AcknowledgeForm.php b/modules/monitoring/application/forms/Command/AcknowledgeForm.php index 364c3c20a..4ac4901b0 100644 --- a/modules/monitoring/application/forms/Command/AcknowledgeForm.php +++ b/modules/monitoring/application/forms/Command/AcknowledgeForm.php @@ -4,10 +4,10 @@ namespace Icinga\Module\Monitoring\Form\Command; -use \Icinga\Web\Form\Element\DateTimePicker; -use \Icinga\Protocol\Commandpipe\Comment; -use \Icinga\Util\DateTimeFactory; -use \Icinga\Module\Monitoring\Command\AcknowledgeCommand; +use Icinga\Web\Form\Element\DateTimePicker; +use Icinga\Protocol\Commandpipe\Comment; +use Icinga\Util\DateTimeFactory; +use Icinga\Module\Monitoring\Command\AcknowledgeCommand; /** * Form for problem acknowledgements diff --git a/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php b/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php index 6d49580a0..e413848c8 100644 --- a/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php +++ b/modules/monitoring/application/forms/Command/MultiCommandFlagForm.php @@ -4,10 +4,10 @@ namespace Icinga\Module\Monitoring\Form\Command; -use \Icinga\Web\Form\Element\TriStateCheckbox; -use \Icinga\Web\Form; -use \Zend_Form_Element_Hidden; -use \Zend_Form; +use Icinga\Web\Form\Element\TriStateCheckbox; +use Icinga\Web\Form; +use Zend_Form_Element_Hidden; +use Zend_Form; /** * A form to edit multiple command flags of multiple commands at once. When some commands have diff --git a/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php b/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php index 7333ccdac..d7228ebdf 100644 --- a/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php +++ b/modules/monitoring/application/forms/Command/SingleArgumentCommandForm.php @@ -5,7 +5,7 @@ namespace Icinga\Module\Monitoring\Form\Command; use Zend_Controller_Request_Abstract; -use \Zend_Form_Element_Hidden; +use Zend_Form_Element_Hidden; use Icinga\Module\Monitoring\Command\AcknowledgeCommand; use Icinga\Module\Monitoring\Command\SingleArgumentCommand; diff --git a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php index de2965565..c2c9151f3 100644 --- a/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php +++ b/modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Form\Command; -use \Icinga\Exception\ProgrammingError; +use Icinga\Exception\ProgrammingError; /** * Form for submitting passive check results diff --git a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php index 513dea238..6acc210ae 100644 --- a/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php +++ b/modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Form\Config\Backend; -use \Zend_Config; +use Zend_Config; /** * Extended EditBackendForm for creating new Backends diff --git a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php index 705804bb9..077e02183 100644 --- a/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Monitoring\Form\Config\Instance; -use \Icinga\Web\Form; -use \Zend_Config; +use Icinga\Web\Form; +use Zend_Config; /** * Form for creating new instances diff --git a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php index e2a091c0f..f74b091df 100644 --- a/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php +++ b/modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php @@ -4,8 +4,8 @@ namespace Icinga\Module\Monitoring\Form\Config\Instance; -use \Zend_Config; -use \Icinga\Web\Form; +use Zend_Config; +use Icinga\Web\Form; /** * Form for editing existing instances diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php index b0f007b19..24471449c 100644 --- a/modules/monitoring/application/views/helpers/ResolveMacros.php +++ b/modules/monitoring/application/views/helpers/ResolveMacros.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Zend_View_Helper_Abstract; +use Zend_View_Helper_Abstract; use Icinga\Module\Monitoring\Object\AbstractObject; class Zend_View_Helper_ResolveMacros extends Zend_View_Helper_Abstract diff --git a/modules/monitoring/bin/action/list.inc.php b/modules/monitoring/bin/action/list.inc.php index 65a0ca61d..01fd35131 100644 --- a/modules/monitoring/bin/action/list.inc.php +++ b/modules/monitoring/bin/action/list.inc.php @@ -2,7 +2,7 @@ // {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}} -use \Icinga\Module\Monitoring\Backend; +use Icinga\Module\Monitoring\Backend; use Icinga\Util\Format; $backend = Backend::getInstance($params->shift('backend')); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php index ce61c8f1b..75db67b55 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Backend\Ido\Query; -use \Zend_Db_Select; +use Zend_Db_Select; class StatusSummaryQuery extends IdoQuery { diff --git a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php index b0cd1b445..3e1468e36 100644 --- a/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php +++ b/modules/monitoring/library/Monitoring/Exception/UnsupportedBackendException.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Exception; -use \Exception; +use Exception; class UnsupportedBackendException extends Exception { diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php index 615999bdb..bd83a42cd 100644 --- a/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php +++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Monitoring\Timeline; -use \DateTime; +use DateTime; use Icinga\Web\Url; use Icinga\Exception\ProgrammingError; diff --git a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php index fa5af9141..2b0158bf1 100644 --- a/modules/monitoring/library/Monitoring/Timeline/TimeLine.php +++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php @@ -4,10 +4,10 @@ namespace Icinga\Module\Monitoring\Timeline; -use \DateTime; -use \Exception; -use \ArrayIterator; -use \IteratorAggregate; +use DateTime; +use Exception; +use ArrayIterator; +use IteratorAggregate; use Icinga\Data\Filter\Filter; use Icinga\Web\Hook; use Icinga\Web\Session; diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php index 961aefca5..f50b07893 100644 --- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php +++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php @@ -4,7 +4,7 @@ namespace Tests\Icinga\Module\Monitoring\Application\Views\Helpers; -use \Zend_View_Helper_MonitoringFlags; +use Zend_View_Helper_MonitoringFlags; use Icinga\Test\BaseTestCase; require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/MonitoringFlags.php'); diff --git a/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php b/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php index aa13df35e..5a476aaef 100644 --- a/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php +++ b/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php @@ -4,7 +4,7 @@ namespace Test\Modules\Monitoring\Application\Views\Helpers; -use \Zend_View_Helper_MonitoringProperties; +use Zend_View_Helper_MonitoringProperties; use Icinga\Test\BaseTestCase; require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/MonitoringProperties.php'); diff --git a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php index 374578947..a14f64ae7 100644 --- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php +++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php @@ -4,8 +4,8 @@ namespace Tests\Icinga\Modules\Monitoring\Application\Views\Helpers; -use \Mockery; -use \Zend_View_Helper_ResolveMacros; +use Mockery; +use Zend_View_Helper_ResolveMacros; use Icinga\Test\BaseTestCase; require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/ResolveMacros.php'); diff --git a/modules/translation/library/Translation/Cli/TranslationCommand.php b/modules/translation/library/Translation/Cli/TranslationCommand.php index 417d9d6ed..b3cfc6de4 100644 --- a/modules/translation/library/Translation/Cli/TranslationCommand.php +++ b/modules/translation/library/Translation/Cli/TranslationCommand.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Translation\Cli; -use \Exception; +use Exception; use Icinga\Cli\Command; /** diff --git a/test/php/application/forms/Config/Authentication/ReorderFormTest.php b/test/php/application/forms/Config/Authentication/ReorderFormTest.php index a61efc48a..808806f1a 100644 --- a/test/php/application/forms/Config/Authentication/ReorderFormTest.php +++ b/test/php/application/forms/Config/Authentication/ReorderFormTest.php @@ -4,8 +4,8 @@ namespace Tests\Icinga\Form\Config\Authentication; -use \Mockery; -use \Zend_Config; +use Mockery; +use Zend_Config; use Icinga\Test\BaseTestCase; use Icinga\Form\Config\Authentication\ReorderForm; diff --git a/test/php/library/Icinga/Application/ConfigTest.php b/test/php/library/Icinga/Application/ConfigTest.php index bc39afecd..e99b17b2e 100644 --- a/test/php/library/Icinga/Application/ConfigTest.php +++ b/test/php/library/Icinga/Application/ConfigTest.php @@ -5,7 +5,7 @@ namespace Tests\Icinga\Application; use Icinga\Test\BaseTestCase; -use \Icinga\Application\Config as IcingaConfig; +use Icinga\Application\Config as IcingaConfig; class ConfigTest extends BaseTestCase { diff --git a/test/php/library/Icinga/Chart/GraphChartTest.php b/test/php/library/Icinga/Chart/GraphChartTest.php index 25870791a..6a7f73864 100644 --- a/test/php/library/Icinga/Chart/GraphChartTest.php +++ b/test/php/library/Icinga/Chart/GraphChartTest.php @@ -4,8 +4,8 @@ namespace Tests\Icinga\Chart; -use \DOMXPath; -use \DOMDocument; +use DOMXPath; +use DOMDocument; use Icinga\Chart\GridChart; use Icinga\Test\BaseTestCase; diff --git a/test/php/library/Icinga/Chart/PieChartTest.php b/test/php/library/Icinga/Chart/PieChartTest.php index c09f29e57..756fdf6e6 100644 --- a/test/php/library/Icinga/Chart/PieChartTest.php +++ b/test/php/library/Icinga/Chart/PieChartTest.php @@ -4,8 +4,8 @@ namespace Tests\Icinga\Chart; -use \DOMXPath; -use \DOMDocument; +use DOMXPath; +use DOMDocument; use Icinga\Chart\PieChart; use Icinga\Test\BaseTestCase; diff --git a/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php b/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php index 0ec9a4da6..7d3fd94f6 100644 --- a/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php +++ b/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php @@ -4,7 +4,7 @@ namespace Tests\Icinga\Protocol\Commandpipe; -use \Zend_Config; +use Zend_Config; use Icinga\Test\BaseTestCase; use Icinga\Protocol\Commandpipe\Comment; use Icinga\Protocol\Commandpipe\CommandPipe; diff --git a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php index 0fa155202..b710a0934 100644 --- a/test/php/library/Icinga/Protocol/Ldap/QueryTest.php +++ b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php @@ -4,7 +4,7 @@ namespace Tests\Icinga\Protocol\Ldap; -use \Zend_Config; +use Zend_Config; use Icinga\Test\BaseTestCase; use Icinga\Protocol\Ldap\Connection;