Resolved merge conflicts from commit 83ba3cf

src/ArrayObject/PhpReferenceCompatibility.php

@@ -23,11 +23,7 @@
  * are unable to unset multi-dimensional arrays because you
  * need to fetch the properties / lists as references.
  */
-abstract class PhpReferenceCompatibility implements
-    IteratorAggregate,
-    ArrayAccess,
-    Serializable,
-    Countable
+abstract class PhpReferenceCompatibility implements IteratorAggregate, ArrayAccess, Serializable, Countable
 {
     /**
      * Properties of the object have their normal functionality

src/Hydrator/AbstractHydrator.php

@@ -15,9 +15,7 @@
 use Zend\Stdlib\Hydrator\StrategyEnabledInterface;
 use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
 
-abstract class AbstractHydrator implements
-    HydratorInterface,
-    StrategyEnabledInterface
+abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInterface
 {
     /**
      * The list with strategies that this hydrator has.

src/Hydrator/Aggregate/AggregateHydrator.php

@@ -19,9 +19,7 @@
 /**
  * Aggregate hydrator that composes multiple hydrators via events
  */
-class AggregateHydrator implements
-    HydratorInterface,
-    EventManagerAwareInterface
+class AggregateHydrator implements HydratorInterface, EventManagerAwareInterface
 {
     const DEFAULT_PRIORITY = 1;
 

src/PriorityQueue.php

@@ -25,10 +25,7 @@
  * "inner" iterator in the form of an SplPriorityQueue object for performing
  * the actual iteration.
  */
-class PriorityQueue implements
-    Countable,
-    IteratorAggregate,
-    Serializable
+class PriorityQueue implements Countable, IteratorAggregate, Serializable
 {
     const EXTR_DATA     = 0x00000001;
     const EXTR_PRIORITY = 0x00000002;