From de54ea263f9daad384d4837ec14fe4a191d37780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 12 Jun 2013 22:55:23 +0200
Subject: [PATCH] Resolved merge conflicts from commit 83ba3cf

---
 src/Collection.php                 | 4 +---
 src/Collection/DefaultIterator.php | 4 +---
 src/Node.php                       | 4 +---
 src/Node/AbstractNode.php          | 4 +---
 src/Node/ChildrenIterator.php      | 6 +-----
 src/Node/Schema/AbstractItem.php   | 4 +---
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/Collection.php b/src/Collection.php
index 454e8bfde..9f7bef654 100644
--- a/src/Collection.php
+++ b/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
diff --git a/src/Collection/DefaultIterator.php b/src/Collection/DefaultIterator.php
index 7457076b7..82b0ca7c3 100644
--- a/src/Collection/DefaultIterator.php
+++ b/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;
diff --git a/src/Node.php b/src/Node.php
index c1487f72b..dea86f187 100644
--- a/src/Node.php
+++ b/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.
diff --git a/src/Node/AbstractNode.php b/src/Node/AbstractNode.php
index 4ab27614d..a5162bc9c 100644
--- a/src/Node/AbstractNode.php
+++ b/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',
diff --git a/src/Node/ChildrenIterator.php b/src/Node/ChildrenIterator.php
index ef5041511..da67dbccb 100644
--- a/src/Node/ChildrenIterator.php
+++ b/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
diff --git a/src/Node/Schema/AbstractItem.php b/src/Node/Schema/AbstractItem.php
index 377ceb416..384c4d614 100644
--- a/src/Node/Schema/AbstractItem.php
+++ b/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