Changeset 1629

Show
Ignore:
Timestamp:
06/18/08 17:45:49 (4 months ago)
Author:
richi
Message:

ldap: minor fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/peer/ldap/stubLDAPConnection.php

    r1628 r1629  
    22/** 
    33 * Represents a LDAP connection. 
     4 * Currently modifying of content in a LDAP directory is not supported. 
    45 * 
    56 * @author      Richard Sternagel <richard.sternagel@1und1.de> 
    …… 
    1415/** 
    1516 * Represents a LDAP connection. 
     17 * Currently modifying of content in a LDAP directory is not supported. 
    1618 * 
    1719 * @author      Richard Sternagel <richard.sternagel@1und1.de> 
    …… 
    4244    protected $usesProtocolVersionDefault; 
    4345    /** 
    44      * ldap options (Keys are used for equality check, the values are actually superfluous). 
     46     * ldap options 
     47     * 
     48     * Keys are used for equality check, the values are actually superfluous). 
     49     * LDAP_OPT_NETWORK_TIMEOUT is not yet supported (requires >php5.3). 
    4550     * 
    4651     * @var  array(int, int) 
    …… 
    4853    protected static $options = array(LDAP_OPT_DEREF            => LDAP_OPT_DEREF, 
    4954                                      LDAP_OPT_SIZELIMIT        => LDAP_OPT_SIZELIMIT, 
    50                                       LDAP_OPT_NETWORK_TIMEOUT  => LDAP_OPT_NETWORK_TIMEOUT, 
    5155                                      LDAP_OPT_TIMELIMIT        => LDAP_OPT_TIMELIMIT, 
    5256                                      LDAP_OPT_PROTOCOL_VERSION => LDAP_OPT_PROTOCOL_VERSION, 
    …… 
    160164 
    161165        $success = @ldap_get_option($this->handle, $name, $retValue); 
    162         if($succes === false) { 
     166        if($success === false) { 
    163167            throw new stubConnectionException(ldap_error($this->handle)); 
    164168        } 

  • trunk/src/main/php/net/stubbles/peer/ldap/stubLDAPSearchResult.php

    r1625 r1629  
    7575            } 
    7676 
    77             // get objec class values 
     77            // get object class values 
    7878            if($name === 'objectClass') { 
    7979                $objectClass = $values; 
    …… 
    107107    public function getEntry() 
    108108    { 
    109         return ($this->current !== null ? $this->provideLDAPEntry($this->current()) : null); 
     109        return ($this->current() !== null ? $this->provideLDAPEntry($this->current()) : null); 
    110110    } 
    111111 

  • trunk/src/test/php/net/stubbles/peer/ldap/stubLDAPConnectionTestCase.php

    r1625 r1629  
    5656     * @test 
    5757     */ 
    58     public function searchSuccesfull() 
     58    public function searchSuccessfull() 
    5959    { 
    6060        $this->assertType('stubLDAPSearchResult', $this->ldap->bind()->search()); 

  • trunk/src/test/php/net/stubbles/peer/ldap/stubLDAPURLTestCase.php

    r1625 r1629  
    234234     * data provider for assurance of throwing stubMalformedURLException 
    235235     * 
    236      * @return array<array<string>> 
     236     * @return array<array<string>> 
    237237     */ 
    238238    public static function malformedUrlProvider() 
    …… 
    255255     * assure url roundtrip with ssl port 
    256256     * 
     257     * @param  string  $url 
     258     * 
    257259     * @test 
    258260     * @dataProvider       malformedUrlProvider