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

Commit

Permalink
Merge branch 'hotfix/3127'
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Converter/Converter.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static function toLdap($value, $type = self::STANDARD)
if (is_string($value)) {
return $value;
} elseif (is_int($value) || is_float($value)) {
return (string)$value;
return (string) $value;
} elseif (is_bool($value)) {
return static::toldapBoolean($value);
} elseif (is_object($value)) {
Expand Down
2 changes: 1 addition & 1 deletion src/Dn.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static function fromString($dn, $caseFold = null)
if (empty($dn)) {
$dnArray = array();
} else {
$dnArray = static::explodeDn((string)$dn);
$dnArray = static::explodeDn((string) $dn);
}
return new self($dnArray, $caseFold);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Ldap.php
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ protected function createCollection(Collection\DefaultIterator $iterator, $colle
if ($collectionClass === null) {
return new Collection($iterator);
} else {
$collectionClass = (string)$collectionClass;
$collectionClass = (string) $collectionClass;
if (!class_exists($collectionClass)) {
throw new Exception\LdapException(null,
"Class '$collectionClass' can not be found");
Expand Down Expand Up @@ -1108,7 +1108,7 @@ public static function prepareLdapEntryArray(array &$entry)
} elseif (!is_scalar($v)) {
throw new Exception\InvalidArgumentException('Only scalar values allowed in LDAP data');
} else {
$v = (string)$v;
$v = (string) $v;
if (strlen($v) == 0) {
unset($value[$i]);
} else {
Expand All @@ -1123,7 +1123,7 @@ public static function prepareLdapEntryArray(array &$entry)
} elseif (!is_scalar($value)) {
throw new Exception\InvalidArgumentException('Only scalar values allowed in LDAP data');
} else {
$value = (string)$value;
$value = (string) $value;
if (strlen($value) == 0) {
$entry[$key] = array();
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/Ldif/Encoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ protected function _encode($value)
*/
protected function encodeString($string, &$base64 = null)
{
$string = (string)$string;
$string = (string) $string;
if (!is_numeric($string) && empty($string)) {
return '';
}
Expand Down

0 comments on commit c20864d

Please sign in to comment.