Merge branch 'hotfix/44'

Closes #44
Closes #17

Author: heiglandreas

CHANGELOG.md

@@ -18,6 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#17](https://github.com/zendframework/zend-ldap/issues/17) Fixes HHVM builds
+- [#44](https://github.com/zendframework/zend-ldap/pull/40) Fixes broken builds
+  in PHP7 due to faulty sorting-test
 - [#40](https://github.com/zendframework/zend-ldap/pull/40) Fixes connection test
   that failed due to different failure messages in PHP5 and 7
 

test/SortTest.php

@@ -107,11 +107,17 @@ public function testCustomSorting()
 
         $iterator = new DefaultIterator($this->getLdap(), $search);
         $sortFunction = function ($a, $b) use ($lSorted) {
-            if (array_search($a, $lSorted) % 2 === 0) {
+            // Sort values by the number of "1" in their binary representation
+            // and when that is equals by their position in the alphabet.
+            $f = strlen(str_replace('0', '', decbin(bin2hex($a)))) -
+                 strlen(str_replace('0', '', decbin(bin2hex($b))));
+            if ($f < 0) {
                 return -1;
+            } elseif ($f > 0) {
+                return 1;
             }
+            return strnatcasecmp($a, $b);
 
-            return 1;
         };
         $iterator->setSortFunction($sortFunction);
 
@@ -125,20 +131,20 @@ public function testCustomSorting()
 
         $this->assertAttributeEquals([
             [
-                'resource' => $reflectionEntries[4]['resource'],
-                'sortValue' => 'a',
+                'resource' => $reflectionEntries[1]['resource'],
+                'sortValue' => 'd',
             ], [
                 'resource' => $reflectionEntries[0]['resource'],
                 'sortValue' => 'e',
             ], [
-                'resource' => $reflectionEntries[2]['resource'],
-                'sortValue' => 'c',
+                'resource' => $reflectionEntries[4]['resource'],
+                'sortValue' => 'a',
             ], [
                 'resource' => $reflectionEntries[3]['resource'],
                 'sortValue' => 'b',
             ], [
-                'resource' => $reflectionEntries[1]['resource'],
-                'sortValue' => 'd',
+                'resource' => $reflectionEntries[2]['resource'],
+                'sortValue' => 'c',
             ],
         ], 'entries', $iterator);
     }