Fixed broken Ldap search

symfony · csarrazi · Nov 23, 2015 · Nov 23, 2015 · Nov 23, 2015 · Nov 23, 2015
commit e55b65b3251008a4ea6d0083e2ad84bebb0ae959
diff --git a/src/Symfony/Component/Ldap/Search/Collection.php b/src/Symfony/Component/Ldap/Search/Collection.php
@@ -95,7 +95,16 @@ private function initialize()
         unset($entries['count']);
 
         $this->entries = array_map(function (array $entry) {
-            return new Entry($entry['dn'], $entry['attributes']);
+            $dn = $entry['dn'];
+            $attributes = array_diff_key($entry, array_flip(range(0, $entry['count'] - 1)) + [
+                'count' => null,
+                'dn' => null,
+            ]);
+            array_walk($attributes, function (&$value, $attribute) {
+                unset($value['count']);
+            });
+
+            return new Entry($dn, $attributes);
         }, $entries);
     }
 }
diff --git a/src/Symfony/Component/Ldap/Search/Query.php b/src/Symfony/Component/Ldap/Search/Query.php
@@ -44,6 +44,7 @@ public function __construct(ConnectionInterface $connection, $dn, $query, array
             'sizeLimit' => 0,
             'timeout' => 0,
             'deref' => LDAP_DEREF_NEVER,
+            'attrsOnly' => 0,
         ));
         $resolver->setAllowedValues('deref', [LDAP_DEREF_ALWAYS, LDAP_DEREF_NEVER, LDAP_DEREF_FINDING, LDAP_DEREF_SEARCHING]);
         $resolver->setNormalizer('filter', function (Options $options, $value) {