Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Prepping for 2.2.0RC1.
  • Loading branch information
@weierophinney
weierophinney committed May 1, 2013
73 parents 4dc00f8 + e3a79a6 + 79495fe + 076734b + fb7cd20 + c20864d + 6004e35 + 67864ef + 7e47bfe + a90eaf9 + d6acc44 + 28a177e + 7c870c6 + a9a3bce + 8dbf37e + 1592ea0 + 639695d + 71b7690 + 95f6ca9 + 826a0e1 + 5998122 + 34263bb + 73b49a3 + a7937fe + 18bc286 + 7c2f341 + 3fd24f6 + 46b66eb + 5dc451e + 6cc63be + 36c3273 + d866e82 + 91a7d10 + d7310a9 + 024435b + 9d596bf + 205ad91 + 827e841 + aacf431 + 37d0971 + 4e0f2d8 + d00b2c8 + 2931e8c + 570af36 + fead52a + 4c9df22 + a6fe452 + 8ca93b9 + ec770ab + a20b5be + febd956 + faa4251 + 26b9ab2 + 99a6970 + b658520 + af1b50e + 8517056 + b91ed9e + fb19f47 + a79eb09 + 603dc92 + 4f43ff8 + 1a68958 + 8d10c77 + c7c620a + 9cc3538 + 125f523 + 74881b8 + a2576ca + c631a3a + 3ef543a + 3ee1aa8 + c5f0310 commit 8a81857
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 37 deletions.
12 changes: 6 additions & 6 deletions src/Attribute.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function setAttribute(array &$data, $attribName, $value, $append =
*
* @param array $data
* @param string $attribName
* @param integer $index
* @param int $index
* @return array|mixed
*/
public static function getAttribute(array $data, $attribName, $index = null)
Expand Down Expand Up @@ -283,7 +283,7 @@ public static function createPassword($password, $hashType = self::PASSWORD_HASH
*
* @param array $data
* @param string $attribName
* @param integer|array|\Traversable $value
* @param int|array|\Traversable $value
* @param bool $utc
* @param bool $append
*/
Expand All @@ -310,7 +310,7 @@ public static function setDateTimeAttribute(
}

/**
* @param integer $value
* @param int $value
* @param bool $utc
* @return string|null
*/
Expand All @@ -328,8 +328,8 @@ private static function valueToLdapDateTime($value, $utc)
*
* @param array $data
* @param string $attribName
* @param integer $index
* @return array|integer
* @param int $index
* @return array|int
*/
public static function getDateTimeAttribute(array $data, $attribName, $index = null)
{
Expand All @@ -353,7 +353,7 @@ public static function getDateTimeAttribute(array $data, $attribName, $index = n

/**
* @param string|DateTime $value
* @return integer|null
* @return int|null
*/
private static function valueFromLdapDateTime($value)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Collection implements \Iterator, \Countable
/**
* Current item number
*
* @var integer
* @var int
*/
protected $current = -1;

Expand Down
6 changes: 3 additions & 3 deletions src/Collection/DefaultIterator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DefaultIterator implements \Iterator, \Countable
/**
* Number of items in query result
*
* @var integer
* @var int
*/
protected $itemCount = -1;

Expand Down Expand Up @@ -124,7 +124,7 @@ public function getLDAP()
* or a valid callback accepting the attribute's name as it's only
* argument and returning the new attribute's name.
*
* @param integer|callable $attributeNameTreatment
* @param int|callable $attributeNameTreatment
* @return DefaultIterator Provides a fluent interface
*/
public function setAttributeNameTreatment($attributeNameTreatment)
Expand Down Expand Up @@ -159,7 +159,7 @@ public function setAttributeNameTreatment($attributeNameTreatment)
/**
* Returns the currently set attribute name treatment
*
* @return integer|callable
* @return int|callable
*/
public function getAttributeNameTreatment()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Converter/Converter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static function toLdap($value, $type = self::STANDARD)
* The date-entity <var>$date</var> can be either a timestamp, a
* DateTime Object, a string that is parseable by strtotime().
*
* @param integer|string|DateTime $date The date-entity
* @param int|string|DateTime $date The date-entity
* @param bool $asUtc Whether to return the LDAP-compatible date-string as UTC or as local value
* @return string
* @throws Exception\InvalidArgumentException
Expand Down Expand Up @@ -158,7 +158,7 @@ public static function toLdapDateTime($date, $asUtc = true)
* case-insensitive string 'true' to an LDAP-compatible 'TRUE'. All other
* other values are converted to an LDAP-compatible 'FALSE'.
*
* @param bool|integer|string $value The boolean value to encode
* @param bool|int|string $value The boolean value to encode
* @return string
*/
public static function toLdapBoolean($value)
Expand Down
20 changes: 10 additions & 10 deletions src/Ldap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public function getBaseDn()
}

/**
* @return integer Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
* @return int Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
* ACCTNAME_FORM_USERNAME indicating the form usernames should be canonicalized to.
*/
protected function getAccountCanonicalForm()
Expand Down Expand Up @@ -852,12 +852,12 @@ public function bind($username = null, $password = null)
*
* @param string|Filter\AbstractFilter|array $filter
* @param string|Dn|null $basedn
* @param integer $scope
* @param int $scope
* @param array $attributes
* @param string|null $sort
* @param string|null $collectionClass
* @param integer $sizelimit
* @param integer $timelimit
* @param int $sizelimit
* @param int $timelimit
* @return Collection
* @throws Exception\LdapException
*/
Expand Down Expand Up @@ -966,8 +966,8 @@ protected function createCollection(Collection\DefaultIterator $iterator, $colle
*
* @param string|Filter\AbstractFilter $filter
* @param string|Dn|null $basedn
* @param integer $scope
* @return integer
* @param int $scope
* @return int
* @throws Exception\LdapException
*/
public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
Expand All @@ -988,7 +988,7 @@ public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
* Count children for a given DN.
*
* @param string|Dn $dn
* @return integer
* @return int
* @throws Exception\LdapException
*/
public function countChildren($dn)
Expand Down Expand Up @@ -1024,12 +1024,12 @@ public function exists($dn)
*
* @param string|Filter\AbstractFilter|array $filter
* @param string|Dn|null $basedn
* @param integer $scope
* @param int $scope
* @param array $attributes
* @param string|null $sort
* @param bool $reverseSort
* @param integer $sizelimit
* @param integer $timelimit
* @param int $sizelimit
* @param int $timelimit
* @return array
* @throws Exception\LdapException
*/
Expand Down
7 changes: 5 additions & 2 deletions src/Ldif/Encoder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,17 @@ protected function _decode($string)
$items = array();
$item = array();
$last = null;
$inComment = false;
foreach (explode("\n", $string) as $line) {
$line = rtrim($line, "\x09\x0A\x0D\x00\x0B");
$matches = array();
if (substr($line, 0, 1) === ' ' && $last !== null) {
if (substr($line, 0, 1) === ' ' && $last !== null && !$inComment) {
$last[2] .= substr($line, 1);
} elseif (substr($line, 0, 1) === '#') {
$inComment = true;
continue;
} elseif (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^:<]*)$/i', $line, $matches)) {
} elseif (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^<]*)$/i', $line, $matches)) {
$inComment = false;
$name = strtolower($matches[1]);
$type = trim($matches[2]);
$value = $matches[3];
Expand Down
14 changes: 7 additions & 7 deletions src/Node.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ protected function _setAttribute($name, $value, $append)
* This is an offline method.
*
* @param string $name
* @param integer|array $value
* @param int|array $value
* @param bool $utc
* @return Node Provides a fluid interface
* @throws Exception\LdapException
Expand All @@ -708,7 +708,7 @@ public function setDateTimeAttribute($name, $value, $utc = false)
* This is an offline method.
*
* @param string $name
* @param integer|array $value
* @param int|array $value
* @param bool $utc
* @return Node Provides a fluid interface
* @throws Exception\LdapException
Expand All @@ -724,7 +724,7 @@ public function appendToDateTimeAttribute($name, $value, $utc = false)
* Checks if the attribute can be set and sets it accordingly.
*
* @param string $name
* @param integer|array $value
* @param int|array $value
* @param bool $utc
* @param bool $append
* @throws Exception\LdapException
Expand Down Expand Up @@ -920,7 +920,7 @@ public function reload(Ldap $ldap = null)
* This is an online method.
*
* @param string|Filter\AbstractFilter $filter
* @param integer $scope
* @param int $scope
* @param string $sort
* @return Node\Collection
* @throws Exception\LdapException
Expand All @@ -939,8 +939,8 @@ public function searchSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB, $sort =
* This is an online method.
*
* @param string|Filter\AbstractFilter $filter
* @param integer $scope
* @return integer
* @param int $scope
* @return int
* @throws Exception\LdapException
*/
public function countSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB)
Expand All @@ -953,7 +953,7 @@ public function countSubtree($filter, $scope = Ldap::SEARCH_SCOPE_SUB)
*
* This is an online method.
*
* @return integer
* @return int
* @throws Exception\LdapException
*/
public function countChildren()
Expand Down
6 changes: 3 additions & 3 deletions src/Node/AbstractNode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public function attributeHasValue($attribName, $value)
* This is an offline method.
*
* @param string $name
* @param integer $index
* @param int $index
* @return mixed
* @throws \Zend\Ldap\Exception\LdapException
*/
Expand All @@ -323,8 +323,8 @@ public function getAttribute($name, $index = null)
* This is an offline method.
*
* @param string $name
* @param integer $index
* @return array|integer
* @param int $index
* @return array|int
* @throws \Zend\Ldap\Exception\LdapException
*/
public function getDateTimeAttribute($name, $index = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Node/Schema/ObjectClass/ActiveDirectory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function getDescription()
/**
* Gets the objectClass type
*
* @return integer
* @return int
*/
public function getType()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Node/Schema/ObjectClass/ObjectClassInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function getDescription();
/**
* Gets the objectClass type
*
* @return integer
* @return int
*/
public function getType();

Expand Down
2 changes: 1 addition & 1 deletion src/Node/Schema/ObjectClass/OpenLdap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function getDescription()
/**
* Gets the objectClass type
*
* @return integer
* @return int
*/
public function getType()
{
Expand Down
38 changes: 38 additions & 0 deletions test/Ldif/SimpleDecoderTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,4 +370,42 @@ public function testRoundtripEncoding()
$expected = array_merge(array('dn' => $node->getDnString()), $node->getData(false));
$this->assertEquals($expected, $data);
}

public function testDecodeSimpleSingleItemWithUri()
{
$data =
"version: 1
dn: cn=test3,ou=example,dc=cno
objectclass: oc1
memberurl: ldap:///(&(cn=myName)(uid=something))";
$expected = array(
'dn' => 'cn=test3,ou=example,dc=cno',
'objectclass' => array('oc1'),
'memberurl' => array('ldap:///(&(cn=myName)(uid=something))'));
$actual = Ldif\Encoder::decode($data);
$this->assertEquals($expected, $actual);
}


public function testDecodeSimpleSingleItemWithMultilineComment()
{
$data =
"version: 1
dn: cn=test3,ou=example,dc=cno
objectclass: oc1
attr3:: w7bDpMO8
# This is a comment
on multiple lines
dn: cn=test4,ou=example,dc=cno
objectclass: oc1
attr3:: w7bDpMO8";

$expected = array(
'dn' => 'cn=test3,ou=example,dc=cno',
'objectclass' => array('oc1'),
'attr3' => array('öäü'));
$actual = Ldif\Encoder::decode($data);
$this->assertEquals($expected, $actual[0]);
}
}

0 comments on commit 8a81857

Please sign in to comment.