Resolved merge conflicts from commit 83ba3cf

src/Collection.php

@@ -15,9 +15,7 @@
 /**
  * Zend\Ldap\Collection wraps a list of LDAP entries.
  */
-class Collection implements
-    Iterator,
-    Countable
+class Collection implements Iterator, Countable
 {
     /**
      * Iterator

src/Collection/DefaultIterator.php

@@ -19,9 +19,7 @@
  * Zend\Ldap\Collection\DefaultIterator is the default collection iterator implementation
  * using ext/ldap
  */
-class DefaultIterator implements
-    Iterator,
-    Countable
+class DefaultIterator implements Iterator, Countable
 {
     const ATTRIBUTE_TO_LOWER = 1;
     const ATTRIBUTE_TO_UPPER = 2;

src/Node.php

@@ -16,9 +16,7 @@
 /**
  * Zend\Ldap\Node provides an object oriented view into a LDAP node.
  */
-class Node extends Node\AbstractNode implements
-    Iterator,
-    RecursiveIterator
+class Node extends Node\AbstractNode implements Iterator, RecursiveIterator
 {
     /**
      * Holds the node's new Dn if node is renamed.

src/Node/AbstractNode.php

@@ -17,9 +17,7 @@
 /**
  * This class provides a base implementation for LDAP nodes
  */
-abstract class AbstractNode implements
-    ArrayAccess,
-    Countable
+abstract class AbstractNode implements ArrayAccess, Countable
 {
     protected static $systemAttributes = array('createtimestamp', 'creatorsname',
                                                'entrycsn', 'entrydn', 'entryuuid', 'hassubordinates', 'modifiersname',

src/Node/ChildrenIterator.php

@@ -18,11 +18,7 @@
 /**
  * Zend\Ldap\Node\ChildrenIterator provides an iterator to a collection of children nodes.
  */
-class ChildrenIterator implements
-    Iterator,
-    Countable,
-    RecursiveIterator,
-    ArrayAccess
+class ChildrenIterator implements Iterator, Countable, RecursiveIterator, ArrayAccess
 {
     /**
      * An array of Zend\Ldap\Node objects

src/Node/Schema/AbstractItem.php

@@ -17,9 +17,7 @@
  * This class provides a base implementation for managing schema
  * items like objectClass and attributeType.
  */
-abstract class AbstractItem implements
-    ArrayAccess,
-    Countable
+abstract class AbstractItem implements ArrayAccess, Countable
 {
     /**
      * The underlying data