From 3c47ef68263c263029b4d9fb6725914122c55a64 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 24 Jun 2015 09:19:41 +0200
Subject: [PATCH] Ldap\Exception: Rename to LdapException

refs #8954
---
 library/Icinga/Authentication/User/LdapUserBackend.php      | 2 +-
 library/Icinga/Protocol/Ldap/LdapConnection.php             | 2 +-
 .../Protocol/Ldap/{Exception.php => LdapException.php}      | 4 ++--
 library/Icinga/Protocol/Ldap/LdapQuery.php                  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename library/Icinga/Protocol/Ldap/{Exception.php => LdapException.php} (74%)

diff --git a/library/Icinga/Authentication/User/LdapUserBackend.php b/library/Icinga/Authentication/User/LdapUserBackend.php
index 981ed9331..948dcbe39 100644
--- a/library/Icinga/Authentication/User/LdapUserBackend.php
+++ b/library/Icinga/Authentication/User/LdapUserBackend.php
@@ -9,7 +9,7 @@ use Icinga\Exception\AuthenticationException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Repository\LdapRepository;
 use Icinga\Repository\RepositoryQuery;
-use Icinga\Protocol\Ldap\Exception as LdapException;
+use Icinga\Protocol\Ldap\LdapException;
 use Icinga\Protocol\Ldap\Expression;
 use Icinga\User;
 
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 188db07b0..de7cc1e04 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -11,7 +11,7 @@ use Icinga\Data\ConfigObject;
 use Icinga\Data\Selectable;
 use Icinga\Data\Sortable;
 use Icinga\Exception\ProgrammingError;
-use Icinga\Protocol\Ldap\Exception as LdapException;
+use Icinga\Protocol\Ldap\LdapException;
 
 /**
  * Encapsulate LDAP connections and query creation
diff --git a/library/Icinga/Protocol/Ldap/Exception.php b/library/Icinga/Protocol/Ldap/LdapException.php
similarity index 74%
rename from library/Icinga/Protocol/Ldap/Exception.php
rename to library/Icinga/Protocol/Ldap/LdapException.php
index de7a10651..aec4a88db 100644
--- a/library/Icinga/Protocol/Ldap/Exception.php
+++ b/library/Icinga/Protocol/Ldap/LdapException.php
@@ -6,9 +6,9 @@ namespace Icinga\Protocol\Ldap;
 use Icinga\Exception\IcingaException;
 
 /**
- * Class Exception
+ * Class LdapException
  * @package Icinga\Protocol\Ldap
  */
-class Exception extends IcingaException
+class LdapException extends IcingaException
 {
 }
diff --git a/library/Icinga/Protocol/Ldap/LdapQuery.php b/library/Icinga/Protocol/Ldap/LdapQuery.php
index 52a628f63..1af5467d7 100644
--- a/library/Icinga/Protocol/Ldap/LdapQuery.php
+++ b/library/Icinga/Protocol/Ldap/LdapQuery.php
@@ -186,7 +186,7 @@ class LdapQuery extends SimpleQuery
      *
      * @return  string|false    The distinguished name or false in case it's not possible to fetch a result
      *
-     * @throws  Exception       In case the query returns multiple results
+     * @throws  LdapException   In case the query returns multiple results
      *                          (i.e. it's not possible to fetch a unique DN)
      */
     public function fetchDn()
@@ -199,12 +199,12 @@ class LdapQuery extends SimpleQuery
      *
      * @return  string
      *
-     * @throws  Exception   In case the objectClass filter does not exist
+     * @throws  LdapException   In case the objectClass filter does not exist
      */
     protected function renderFilter()
     {
         if (! isset($this->filters['objectClass'])) {
-            throw new Exception('Object class is mandatory');
+            throw new LdapException('Object class is mandatory');
         }
 
         $parts = array();