Merge branch '#ZF2-151' of github.com:robertboloc/zf2 into #ZF2-151

zendframework · Oct 9, 2012 · 2777cb2 · 2777cb2
commit 2777cb2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/Collection/DefaultIterator.php b/src/Collection/DefaultIterator.php
@@ -144,7 +144,7 @@ public function setAttributeNameTreatment($attributeNameTreatment)
                 $this->attributeNameTreatment = $attributeNameTreatment;
             }
         } else {
-            $attributeNameTreatment = (int)$attributeNameTreatment;
+            $attributeNameTreatment = (int) $attributeNameTreatment;
             switch ($attributeNameTreatment) {
                 case self::ATTRIBUTE_TO_LOWER:
                 case self::ATTRIBUTE_TO_UPPER:

diff --git a/src/Dn.php b/src/Dn.php
@@ -140,7 +140,7 @@ public function getRdnString($caseFold = null)
      */
     public function getParentDn($levelUp = 1)
     {
-        $levelUp = (int)$levelUp;
+        $levelUp = (int) $levelUp;
         if ($levelUp < 1 || $levelUp >= count($this->dn)) {
             throw new Exception\LdapException(null, 'Cannot retrieve parent DN with given $levelUp');
         }
@@ -161,7 +161,7 @@ public function get($index, $length = 1, $caseFold = null)
     {
         $caseFold = self::sanitizeCaseFold($caseFold, $this->caseFold);
         $this->assertIndex($index);
-        $length = (int)$length;
+        $length = (int) $length;
         if ($length <= 0) {
             $length = 1;
         }
@@ -198,7 +198,7 @@ public function set($index, array $value)
     public function remove($index, $length = 1)
     {
         $this->assertIndex($index);
-        $length = (int)$length;
+        $length = (int) $length;
         if ($length <= 0) {
             $length = 1;
         }
@@ -381,7 +381,7 @@ public function __toString()
      */
     public function offsetExists($offset)
     {
-        $offset = (int)$offset;
+        $offset = (int) $offset;
         if ($offset < 0 || $offset >= count($this->dn)) {
             return false;
         }

diff --git a/src/Ldap.php b/src/Ldap.php
@@ -256,7 +256,7 @@ public function setOptions($options)
                     case 'port':
                     case 'accountCanonicalForm':
                     case 'networkTimeout':
-                        $permittedOptions[$key] = (int)$val;
+                        $permittedOptions[$key] = (int) $val;
                         break;
                     case 'useSsl':
                     case 'bindRequiresDn':
@@ -672,22 +672,22 @@ public function connect($host = null, $port = null, $useSsl = null, $useStartTls
         if ($port === null) {
             $port = $this->getPort();
         } else {
-            $port = (int)$port;
+            $port = (int) $port;
         }
         if ($useSsl === null) {
             $useSsl = $this->getUseSsl();
         } else {
-            $useSsl = (bool)$useSsl;
+            $useSsl = (bool) $useSsl;
         }
         if ($useStartTls === null) {
             $useStartTls = $this->getUseStartTls();
         } else {
-            $useStartTls = (bool)$useStartTls;
+            $useStartTls = (bool) $useStartTls;
         }
         if ($networkTimeout === null) {
             $networkTimeout = $this->getNetworkTimeout();
         } else {
-            $networkTimeout = (int)$networkTimeout;
+            $networkTimeout = (int) $networkTimeout;
         }
 
         if (!$host) {
@@ -890,7 +890,7 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
                         break;
                     case 'sizelimit':
                     case 'timelimit':
-                        $$key = (int)$value;
+                        $$key = (int) $value;
                         break;
                 }
             }
@@ -1054,7 +1054,7 @@ public function searchEntries($filter, $basedn = null, $scope = self::SEARCH_SCO
         }
         $result = $this->search($filter, $basedn, $scope, $attributes, $sort, null, $sizelimit, $timelimit);
         $items  = $result->toArray();
-        if ((bool)$reverseSort === true) {
+        if ((bool) $reverseSort === true) {
             $items = array_reverse($items, false);
         }
 
@@ -1383,7 +1383,7 @@ public function move($from, $to, $recursively = false, $alwaysEmulate = false)
      */
     public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
     {
-        $emulate = (bool)$alwaysEmulate;
+        $emulate = (bool) $alwaysEmulate;
         if (!function_exists('ldap_rename')) {
             $emulate = true;
         } elseif ($recursively) {

diff --git a/src/Node/Schema/AttributeType/OpenLdap.php b/src/Node/Schema/AttributeType/OpenLdap.php
@@ -77,7 +77,7 @@ public function getMaxLength()
                 return $parent->getMaxLength();
             }
         } else {
-            return (int)$maxLength;
+            return (int) $maxLength;
         }
     }