Remove error suppression

DaveRandom · DaveRandom · commit 0be571bbe3c1 · 2013-09-26T17:11:19.000+01:00
Don't suppress errors emitted by ext/ldap functions
diff --git a/src/LDAPi/Directory.php b/src/LDAPi/Directory.php
@@ -50,7 +50,7 @@ public function add($dn, array $entry)
     {
         $this->checkBound();
 
-        if (!@ldap_add($this->link, $dn, $entry)) {
+        if (!ldap_add($this->link, $dn, $entry)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -65,7 +65,7 @@ public function bind($dn = null, $password = null)
     {
         $this->checkConnected();
 
-        if (!@ldap_bind($this->link, $dn, $password)) {
+        if (!ldap_bind($this->link, $dn, $password)) {
             throw new BindFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -84,7 +84,7 @@ public function compare($dn, $attribute, $value)
     {
         $this->checkBound();
 
-        if (-1 === $result = @ldap_compare($this->link, $dn, $entry)) {
+        if (-1 === $result = ldap_compare($this->link, $dn, $entry)) {
             throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -103,7 +103,7 @@ public function connect($host, $port = 389)
             throw new AlreadyAvailableException('An active connection to the directory is already available');
         }
 
-        if (!$this->link = @ldap_connect($host, $port)) {
+        if (!$this->link = ldap_connect($host, $port)) {
             throw new ConnectFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -119,7 +119,7 @@ public function controlPagedResult($pageSize, $isCritical = false, $cookie = '')
     {
         $this->checkBound();
 
-        if (!@ldap_control_paged_result($this->link, $pageSize, $isCritical, $cookie)) {
+        if (!ldap_control_paged_result($this->link, $pageSize, $isCritical, $cookie)) {
             throw new PaginationFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -133,7 +133,7 @@ public function delete($dn)
     {
         $this->checkBound();
 
-        if (!@ldap_delete($this->link, $dn)) {
+        if (!ldap_delete($this->link, $dn)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -148,7 +148,7 @@ public function getOption($opt)
     {
         $this->checkConnected();
 
-        if (!@ldap_get_option($this->link, $opt, $value)) {
+        if (!ldap_get_option($this->link, $opt, $value)) {
             throw new OptionFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -171,7 +171,7 @@ public function listChildren($dn, $filter, array $attributes = null, $attrsOnly
     {
         $this->checkBound();
 
-        if (!$result = @ldap_list($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {
+        if (!$result = ldap_list($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {
             throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -188,7 +188,7 @@ public function modAdd($dn, array $entry)
     {
         $this->checkBound();
 
-        if (!@ldap_mod_add($this->link, $dn, $entry)) {
+        if (!ldap_mod_add($this->link, $dn, $entry)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -203,7 +203,7 @@ public function modDel($dn, array $entry)
     {
         $this->checkBound();
 
-        if (!@ldap_mod_del($this->link, $dn, $entry)) {
+        if (!ldap_mod_del($this->link, $dn, $entry)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -218,7 +218,7 @@ public function modReplace($dn, array $entry)
     {
         $this->checkBound();
 
-        if (!@ldap_mod_replace($this->link, $dn, $entry)) {
+        if (!ldap_mod_replace($this->link, $dn, $entry)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -233,7 +233,7 @@ public function modify($dn, array $entry)
     {
         $this->checkBound();
 
-        if (!@ldap_modify($this->link, $dn, $entry)) {
+        if (!ldap_modify($this->link, $dn, $entry)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -254,7 +254,7 @@ public function read($dn, $filter, array $attributes = null, $attrsOnly = false,
     {
         $this->checkBound();
 
-        if (!$result = @ldap_read($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {
+        if (!$result = ldap_read($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {
             throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -273,7 +273,7 @@ public function rename($dn, $newRDN, $newParent, $deleteOldRDN = true)
     {
         $this->checkBound();
 
-        if (!@ldap_rename($this->link, $dn, $newRDN, $newParent, $deleteOldRDN)) {
+        if (!ldap_rename($this->link, $dn, $newRDN, $newParent, $deleteOldRDN)) {
             throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -293,7 +293,7 @@ public function saslBind($dn = null, $password = null, $saslMech = null, $saslRe
     {
         $this->checkConnected();
 
-        if (!@ldap_sasl_bind($this->link, $dn, $password, $saslMech, $saslRealm, $saslAuthcId, $saslAuthzId, $props)) {
+        if (!ldap_sasl_bind($this->link, $dn, $password, $saslMech, $saslRealm, $saslAuthcId, $saslAuthzId, $props)) {
             throw new BindFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -316,7 +316,7 @@ public function search($dn, $filter, array $attributes = null, $attrsOnly = fals
     {
         $this->checkBound();
 
-        if (!$result = @ldap_search($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {
+        if (!$result = ldap_search($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {
             throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -333,7 +333,7 @@ public function setOption($opt, $value)
     {
         $this->checkConnected();
 
-        if (!@ldap_set_option($this->link, $opt, $value)) {
+        if (!ldap_set_option($this->link, $opt, $value)) {
             throw new OptionFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -347,7 +347,7 @@ public function setRebindProc(callable $callback)
     {
         $this->checkConnected();
 
-        if (!@ldap_set_rebind_proc($this->link, $callback)) {
+        if (!ldap_set_rebind_proc($this->link, $callback)) {
             throw new OptionFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -364,7 +364,7 @@ public function startTLS()
             throw new AlreadyAvailableException('An active bound connection to the directory is already available');
         }
 
-        if (!@ldap_start_tls($this->link)) {
+        if (!ldap_start_tls($this->link)) {
             throw new EncryptionFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
     }
@@ -376,7 +376,7 @@ public function unbind()
     {
         $this->checkBound();
 
-        @ldap_unbind($this->link);
+        ldap_unbind($this->link);
 
         $this->link = null;
         $this->bound = false;
diff --git a/src/LDAPi/Entry.php b/src/LDAPi/Entry.php
@@ -30,7 +30,7 @@ public function __construct($link, $entry)
      */
     public function nextEntry()
     {
-        if (!$entry = @ldap_next_entry($this->link, $this->entry)) {
+        if (!$entry = ldap_next_entry($this->link, $this->entry)) {
             if (0 !== $errNo = ldap_errno($this->link)) {
                 throw new EntryRetrievalFailureException(ldap_error($this->link), $errNo);
             }
@@ -47,7 +47,7 @@ public function nextEntry()
      */
     public function getValues($attribute)
     {
-        if (!$values = @ldap_get_values($this->link, $this->entry, $attribute)) {
+        if (!$values = ldap_get_values($this->link, $this->entry, $attribute)) {
             throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -60,7 +60,7 @@ public function getValues($attribute)
      */
     public function getAttributes()
     {
-        if (!$attributes = @ldap_get_attributes($this->link, $this->entry)) {
+        if (!$attributes = ldap_get_attributes($this->link, $this->entry)) {
             throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -73,7 +73,7 @@ public function getAttributes()
      */
     public function getDN()
     {
-        if (!$dn = @ldap_get_dn($this->link, $this->entry)) {
+        if (!$dn = ldap_get_dn($this->link, $this->entry)) {
             throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
diff --git a/src/LDAPi/Reference.php b/src/LDAPi/Reference.php
@@ -31,7 +31,7 @@ public function __construct($link, $reference)
      */
     public function nextReference()
     {
-        if (!$reference = @ldap_next_reference($this->link, $this->reference)) {
+        if (!$reference = ldap_next_reference($this->link, $this->reference)) {
             if (0 !== $errNo = ldap_errno($this->link)) {
                 throw new ReferenceRetrievalFailureException(ldap_error($this->link), $errNo);
             }
@@ -48,7 +48,7 @@ public function nextReference()
      */
     public function parse()
     {
-        if (!@ldap_parse_reference($this->link, $this->reference, $referrals)) {
+        if (!ldap_parse_reference($this->link, $this->reference, $referrals)) {
             throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
diff --git a/src/LDAPi/ResultSet.php b/src/LDAPi/ResultSet.php
@@ -26,7 +26,7 @@ public function __construct($link, $result)
 
     public function __destruct()
     {
-        @ldap_free_result($this->result);
+        ldap_free_result($this->result);
     }
 
     /**
@@ -36,7 +36,7 @@ public function __destruct()
      */
     public function controlPagedResult(&$estimated = null)
     {
-        if (!@ldap_control_paged_result_response($this->link, $this->result, $cookie, $estimated)) {
+        if (!ldap_control_paged_result_response($this->link, $this->result, $cookie, $estimated)) {
             throw new PaginationFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -49,7 +49,7 @@ public function controlPagedResult(&$estimated = null)
      */
     public function entryCount()
     {
-        if (!$result = @ldap_count_entries($this->link, $this->result)) {
+        if (!$result = ldap_count_entries($this->link, $this->result)) {
             throw new EntryCountRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -62,7 +62,7 @@ public function entryCount()
      */
     public function firstEntry()
     {
-        if (!$entry = @ldap_first_entry($this->link, $this->result)) {
+        if (!$entry = ldap_first_entry($this->link, $this->result)) {
             if (0 !== $errNo = ldap_errno($this->link)) {
                 throw new EntryRetrievalFailureException(ldap_error($this->link), $errNo);
             }
@@ -79,7 +79,7 @@ public function firstEntry()
      */
     public function firstReference()
     {
-        if (!$reference = @ldap_first_reference($this->link, $this->result)) {
+        if (!$reference = ldap_first_reference($this->link, $this->result)) {
             if (0 !== $errNo = ldap_errno($this->link)) {
                 throw new ReferenceRetrievalFailureException(ldap_error($this->link), $errNo);
             }
@@ -96,7 +96,7 @@ public function firstReference()
      */
     public function parse()
     {
-        if (!@ldap_parse_result($this->link, $this->result, $errCode, $matchedDN, $errMsg, $referrals)) {
+        if (!ldap_parse_result($this->link, $this->result, $errCode, $matchedDN, $errMsg, $referrals)) {
             throw new InformationRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 
@@ -114,7 +114,7 @@ public function parse()
      */
     public function getEntries()
     {
-        if (!$entries = @ldap_get_entries($this->link, $this->result)) {
+        if (!$entries = ldap_get_entries($this->link, $this->result)) {
             throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function add($dn, array $entry)`
`50`	`50`	`{`
`51`	`51`	`$this->checkBound();`
`52`	`52`
`53`		`- if (!@ldap_add($this->link, $dn, $entry)) {`
	`53`	`+ if (!ldap_add($this->link, $dn, $entry)) {`
`54`	`54`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -65,7 +65,7 @@ public function bind($dn = null, $password = null)`
`65`	`65`	`{`
`66`	`66`	`$this->checkConnected();`
`67`	`67`
`68`		`- if (!@ldap_bind($this->link, $dn, $password)) {`
	`68`	`+ if (!ldap_bind($this->link, $dn, $password)) {`
`69`	`69`	`throw new BindFailureException(ldap_error($this->link), ldap_errno($this->link));`
`70`	`70`	`}`
`71`	`71`
`@@ -84,7 +84,7 @@ public function compare($dn, $attribute, $value)`
`84`	`84`	`{`
`85`	`85`	`$this->checkBound();`
`86`	`86`
`87`		`- if (-1 === $result = @ldap_compare($this->link, $dn, $entry)) {`
	`87`	`+ if (-1 === $result = ldap_compare($this->link, $dn, $entry)) {`
`88`	`88`	`throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));`
`89`	`89`	`}`
`90`	`90`
`@@ -103,7 +103,7 @@ public function connect($host, $port = 389)`
`103`	`103`	`throw new AlreadyAvailableException('An active connection to the directory is already available');`
`104`	`104`	`}`
`105`	`105`
`106`		`- if (!$this->link = @ldap_connect($host, $port)) {`
	`106`	`+ if (!$this->link = ldap_connect($host, $port)) {`
`107`	`107`	`throw new ConnectFailureException(ldap_error($this->link), ldap_errno($this->link));`
`108`	`108`	`}`
`109`	`109`	`}`
`@@ -119,7 +119,7 @@ public function controlPagedResult($pageSize, $isCritical = false, $cookie = '')`
`119`	`119`	`{`
`120`	`120`	`$this->checkBound();`
`121`	`121`
`122`		`- if (!@ldap_control_paged_result($this->link, $pageSize, $isCritical, $cookie)) {`
	`122`	`+ if (!ldap_control_paged_result($this->link, $pageSize, $isCritical, $cookie)) {`
`123`	`123`	`throw new PaginationFailureException(ldap_error($this->link), ldap_errno($this->link));`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -133,7 +133,7 @@ public function delete($dn)`
`133`	`133`	`{`
`134`	`134`	`$this->checkBound();`
`135`	`135`
`136`		`- if (!@ldap_delete($this->link, $dn)) {`
	`136`	`+ if (!ldap_delete($this->link, $dn)) {`
`137`	`137`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -148,7 +148,7 @@ public function getOption($opt)`
`148`	`148`	`{`
`149`	`149`	`$this->checkConnected();`
`150`	`150`
`151`		`- if (!@ldap_get_option($this->link, $opt, $value)) {`
	`151`	`+ if (!ldap_get_option($this->link, $opt, $value)) {`
`152`	`152`	`throw new OptionFailureException(ldap_error($this->link), ldap_errno($this->link));`
`153`	`153`	`}`
`154`	`154`
`@@ -171,7 +171,7 @@ public function listChildren($dn, $filter, array $attributes = null, $attrsOnly`
`171`	`171`	`{`
`172`	`172`	`$this->checkBound();`
`173`	`173`
`174`		`- if (!$result = @ldap_list($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {`
	`174`	`+ if (!$result = ldap_list($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {`
`175`	`175`	`throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));`
`176`	`176`	`}`
`177`	`177`
`@@ -188,7 +188,7 @@ public function modAdd($dn, array $entry)`
`188`	`188`	`{`
`189`	`189`	`$this->checkBound();`
`190`	`190`
`191`		`- if (!@ldap_mod_add($this->link, $dn, $entry)) {`
	`191`	`+ if (!ldap_mod_add($this->link, $dn, $entry)) {`
`192`	`192`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`193`	`193`	`}`
`194`	`194`	`}`
`@@ -203,7 +203,7 @@ public function modDel($dn, array $entry)`
`203`	`203`	`{`
`204`	`204`	`$this->checkBound();`
`205`	`205`
`206`		`- if (!@ldap_mod_del($this->link, $dn, $entry)) {`
	`206`	`+ if (!ldap_mod_del($this->link, $dn, $entry)) {`
`207`	`207`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`208`	`208`	`}`
`209`	`209`	`}`
`@@ -218,7 +218,7 @@ public function modReplace($dn, array $entry)`
`218`	`218`	`{`
`219`	`219`	`$this->checkBound();`
`220`	`220`
`221`		`- if (!@ldap_mod_replace($this->link, $dn, $entry)) {`
	`221`	`+ if (!ldap_mod_replace($this->link, $dn, $entry)) {`
`222`	`222`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`223`	`223`	`}`
`224`	`224`	`}`
`@@ -233,7 +233,7 @@ public function modify($dn, array $entry)`
`233`	`233`	`{`
`234`	`234`	`$this->checkBound();`
`235`	`235`
`236`		`- if (!@ldap_modify($this->link, $dn, $entry)) {`
	`236`	`+ if (!ldap_modify($this->link, $dn, $entry)) {`
`237`	`237`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`238`	`238`	`}`
`239`	`239`	`}`
`@@ -254,7 +254,7 @@ public function read($dn, $filter, array $attributes = null, $attrsOnly = false,`
`254`	`254`	`{`
`255`	`255`	`$this->checkBound();`
`256`	`256`
`257`		`- if (!$result = @ldap_read($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {`
	`257`	`+ if (!$result = ldap_read($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {`
`258`	`258`	`throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));`
`259`	`259`	`}`
`260`	`260`
`@@ -273,7 +273,7 @@ public function rename($dn, $newRDN, $newParent, $deleteOldRDN = true)`
`273`	`273`	`{`
`274`	`274`	`$this->checkBound();`
`275`	`275`
`276`		`- if (!@ldap_rename($this->link, $dn, $newRDN, $newParent, $deleteOldRDN)) {`
	`276`	`+ if (!ldap_rename($this->link, $dn, $newRDN, $newParent, $deleteOldRDN)) {`
`277`	`277`	`throw new WriteFailureException(ldap_error($this->link), ldap_errno($this->link));`
`278`	`278`	`}`
`279`	`279`	`}`
`@@ -293,7 +293,7 @@ public function saslBind($dn = null, $password = null, $saslMech = null, $saslRe`
`293`	`293`	`{`
`294`	`294`	`$this->checkConnected();`
`295`	`295`
`296`		`- if (!@ldap_sasl_bind($this->link, $dn, $password, $saslMech, $saslRealm, $saslAuthcId, $saslAuthzId, $props)) {`
	`296`	`+ if (!ldap_sasl_bind($this->link, $dn, $password, $saslMech, $saslRealm, $saslAuthcId, $saslAuthzId, $props)) {`
`297`	`297`	`throw new BindFailureException(ldap_error($this->link), ldap_errno($this->link));`
`298`	`298`	`}`
`299`	`299`
`@@ -316,7 +316,7 @@ public function search($dn, $filter, array $attributes = null, $attrsOnly = fals`
`316`	`316`	`{`
`317`	`317`	`$this->checkBound();`
`318`	`318`
`319`		`- if (!$result = @ldap_search($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {`
	`319`	`+ if (!$result = ldap_search($this->link, $dn, $filter, (array)$attributes, (int)(bool)$attrsOnly, $sizeLimit, $timeLimit, $deRef)) {`
`320`	`320`	`throw new ReadFailureException(ldap_error($this->link), ldap_errno($this->link));`
`321`	`321`	`}`
`322`	`322`
`@@ -333,7 +333,7 @@ public function setOption($opt, $value)`
`333`	`333`	`{`
`334`	`334`	`$this->checkConnected();`
`335`	`335`
`336`		`- if (!@ldap_set_option($this->link, $opt, $value)) {`
	`336`	`+ if (!ldap_set_option($this->link, $opt, $value)) {`
`337`	`337`	`throw new OptionFailureException(ldap_error($this->link), ldap_errno($this->link));`
`338`	`338`	`}`
`339`	`339`	`}`
`@@ -347,7 +347,7 @@ public function setRebindProc(callable $callback)`
`347`	`347`	`{`
`348`	`348`	`$this->checkConnected();`
`349`	`349`
`350`		`- if (!@ldap_set_rebind_proc($this->link, $callback)) {`
	`350`	`+ if (!ldap_set_rebind_proc($this->link, $callback)) {`
`351`	`351`	`throw new OptionFailureException(ldap_error($this->link), ldap_errno($this->link));`
`352`	`352`	`}`
`353`	`353`	`}`
`@@ -364,7 +364,7 @@ public function startTLS()`
`364`	`364`	`throw new AlreadyAvailableException('An active bound connection to the directory is already available');`
`365`	`365`	`}`
`366`	`366`
`367`		`- if (!@ldap_start_tls($this->link)) {`
	`367`	`+ if (!ldap_start_tls($this->link)) {`
`368`	`368`	`throw new EncryptionFailureException(ldap_error($this->link), ldap_errno($this->link));`
`369`	`369`	`}`
`370`	`370`	`}`
`@@ -376,7 +376,7 @@ public function unbind()`
`376`	`376`	`{`
`377`	`377`	`$this->checkBound();`
`378`	`378`
`379`		`- @ldap_unbind($this->link);`
	`379`	`+ ldap_unbind($this->link);`
`380`	`380`
`381`	`381`	`$this->link = null;`
`382`	`382`	`$this->bound = false;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct($link, $entry)`
`30`	`30`	`*/`
`31`	`31`	`public function nextEntry()`
`32`	`32`	`{`
`33`		`- if (!$entry = @ldap_next_entry($this->link, $this->entry)) {`
	`33`	`+ if (!$entry = ldap_next_entry($this->link, $this->entry)) {`
`34`	`34`	`if (0 !== $errNo = ldap_errno($this->link)) {`
`35`	`35`	`throw new EntryRetrievalFailureException(ldap_error($this->link), $errNo);`
`36`	`36`	`}`
`@@ -47,7 +47,7 @@ public function nextEntry()`
`47`	`47`	`*/`
`48`	`48`	`public function getValues($attribute)`
`49`	`49`	`{`
`50`		`- if (!$values = @ldap_get_values($this->link, $this->entry, $attribute)) {`
	`50`	`+ if (!$values = ldap_get_values($this->link, $this->entry, $attribute)) {`
`51`	`51`	`throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`52`	`52`	`}`
`53`	`53`
`@@ -60,7 +60,7 @@ public function getValues($attribute)`
`60`	`60`	`*/`
`61`	`61`	`public function getAttributes()`
`62`	`62`	`{`
`63`		`- if (!$attributes = @ldap_get_attributes($this->link, $this->entry)) {`
	`63`	`+ if (!$attributes = ldap_get_attributes($this->link, $this->entry)) {`
`64`	`64`	`throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`65`	`65`	`}`
`66`	`66`
`@@ -73,7 +73,7 @@ public function getAttributes()`
`73`	`73`	`*/`
`74`	`74`	`public function getDN()`
`75`	`75`	`{`
`76`		`- if (!$dn = @ldap_get_dn($this->link, $this->entry)) {`
	`76`	`+ if (!$dn = ldap_get_dn($this->link, $this->entry)) {`
`77`	`77`	`throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct($link, $reference)`
`31`	`31`	`*/`
`32`	`32`	`public function nextReference()`
`33`	`33`	`{`
`34`		`- if (!$reference = @ldap_next_reference($this->link, $this->reference)) {`
	`34`	`+ if (!$reference = ldap_next_reference($this->link, $this->reference)) {`
`35`	`35`	`if (0 !== $errNo = ldap_errno($this->link)) {`
`36`	`36`	`throw new ReferenceRetrievalFailureException(ldap_error($this->link), $errNo);`
`37`	`37`	`}`
`@@ -48,7 +48,7 @@ public function nextReference()`
`48`	`48`	`*/`
`49`	`49`	`public function parse()`
`50`	`50`	`{`
`51`		`- if (!@ldap_parse_reference($this->link, $this->reference, $referrals)) {`
	`51`	`+ if (!ldap_parse_reference($this->link, $this->reference, $referrals)) {`
`52`	`52`	`throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct($link, $result)`
`26`	`26`
`27`	`27`	`public function __destruct()`
`28`	`28`	`{`
`29`		`- @ldap_free_result($this->result);`
	`29`	`+ ldap_free_result($this->result);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`@@ -36,7 +36,7 @@ public function __destruct()`
`36`	`36`	`*/`
`37`	`37`	`public function controlPagedResult(&$estimated = null)`
`38`	`38`	`{`
`39`		`- if (!@ldap_control_paged_result_response($this->link, $this->result, $cookie, $estimated)) {`
	`39`	`+ if (!ldap_control_paged_result_response($this->link, $this->result, $cookie, $estimated)) {`
`40`	`40`	`throw new PaginationFailureException(ldap_error($this->link), ldap_errno($this->link));`
`41`	`41`	`}`
`42`	`42`
`@@ -49,7 +49,7 @@ public function controlPagedResult(&$estimated = null)`
`49`	`49`	`*/`
`50`	`50`	`public function entryCount()`
`51`	`51`	`{`
`52`		`- if (!$result = @ldap_count_entries($this->link, $this->result)) {`
	`52`	`+ if (!$result = ldap_count_entries($this->link, $this->result)) {`
`53`	`53`	`throw new EntryCountRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`54`	`54`	`}`
`55`	`55`
`@@ -62,7 +62,7 @@ public function entryCount()`
`62`	`62`	`*/`
`63`	`63`	`public function firstEntry()`
`64`	`64`	`{`
`65`		`- if (!$entry = @ldap_first_entry($this->link, $this->result)) {`
	`65`	`+ if (!$entry = ldap_first_entry($this->link, $this->result)) {`
`66`	`66`	`if (0 !== $errNo = ldap_errno($this->link)) {`
`67`	`67`	`throw new EntryRetrievalFailureException(ldap_error($this->link), $errNo);`
`68`	`68`	`}`
`@@ -79,7 +79,7 @@ public function firstEntry()`
`79`	`79`	`*/`
`80`	`80`	`public function firstReference()`
`81`	`81`	`{`
`82`		`- if (!$reference = @ldap_first_reference($this->link, $this->result)) {`
	`82`	`+ if (!$reference = ldap_first_reference($this->link, $this->result)) {`
`83`	`83`	`if (0 !== $errNo = ldap_errno($this->link)) {`
`84`	`84`	`throw new ReferenceRetrievalFailureException(ldap_error($this->link), $errNo);`
`85`	`85`	`}`
`@@ -96,7 +96,7 @@ public function firstReference()`
`96`	`96`	`*/`
`97`	`97`	`public function parse()`
`98`	`98`	`{`
`99`		`- if (!@ldap_parse_result($this->link, $this->result, $errCode, $matchedDN, $errMsg, $referrals)) {`
	`99`	`+ if (!ldap_parse_result($this->link, $this->result, $errCode, $matchedDN, $errMsg, $referrals)) {`
`100`	`100`	`throw new InformationRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`101`	`101`	`}`
`102`	`102`
`@@ -114,7 +114,7 @@ public function parse()`
`114`	`114`	`*/`
`115`	`115`	`public function getEntries()`
`116`	`116`	`{`
`117`		`- if (!$entries = @ldap_get_entries($this->link, $this->result)) {`
	`117`	`+ if (!$entries = ldap_get_entries($this->link, $this->result)) {`
`118`	`118`	`throw new ValueRetrievalFailureException(ldap_error($this->link), ldap_errno($this->link));`
`119`	`119`	`}`
`120`	`120`