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

Ldap\Exception: Rename to LdapException 

refs #8954
This commit is contained in:
Johannes Meyer 2015-06-24 09:19:41 +02:00
parent 5dea14f04b
commit 3c47ef6826
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Authentication/User/LdapUserBackend.php
View File

@ -9,7 +9,7 @@ use Icinga\Exception\AuthenticationException;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Repository\LdapRepository; use Icinga\Repository\LdapRepository;
use Icinga\Repository\RepositoryQuery; use Icinga\Repository\RepositoryQuery;
use Icinga\Protocol\Ldap\Exception as LdapException; use Icinga\Protocol\Ldap\LdapException;
use Icinga\Protocol\Ldap\Expression; use Icinga\Protocol\Ldap\Expression;
use Icinga\User; use Icinga\User;

2
library/Icinga/Protocol/Ldap/LdapConnection.php
View File

@ -11,7 +11,7 @@ use Icinga\Data\ConfigObject;
use Icinga\Data\Selectable; use Icinga\Data\Selectable;
use Icinga\Data\Sortable; use Icinga\Data\Sortable;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Protocol\Ldap\Exception as LdapException; use Icinga\Protocol\Ldap\LdapException;
/** /**
* Encapsulate LDAP connections and query creation * Encapsulate LDAP connections and query creation

4
library/Icinga/Protocol/Ldap/Exception.php → library/Icinga/Protocol/Ldap/LdapException.php
View File

@ -6,9 +6,9 @@ namespace Icinga\Protocol\Ldap;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
/** /**
* Class Exception * Class LdapException
* @package Icinga\Protocol\Ldap * @package Icinga\Protocol\Ldap
*/ */
class Exception extends IcingaException class LdapException extends IcingaException
{ {
} }

6
library/Icinga/Protocol/Ldap/LdapQuery.php
View File

@ -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 * @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) * (i.e. it's not possible to fetch a unique DN)
*/ */
public function fetchDn() public function fetchDn()
@ -199,12 +199,12 @@ class LdapQuery extends SimpleQuery
* *
* @return string * @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() protected function renderFilter()
{ {
if (! isset($this->filters['objectClass'])) { if (! isset($this->filters['objectClass'])) {
throw new Exception('Object class is mandatory'); throw new LdapException('Object class is mandatory');
} }
$parts = array(); $parts = array();