Moving some code around

Cake/ORM/ResultCollectionTrait.php

@@ -16,8 +16,8 @@
  */
 namespace Cake\ORM;
 
+use \Cake\Utility\CollectionTrait;
 use \Iterator;
-use \JsonSerializable;
 use \Serializable;
 
 /**
@@ -26,14 +26,7 @@
  */
 trait ResultCollectionTrait {
 
-/**
- * Returns an array representation of the results
- *
- * @return array
- */
-	public function toArray() {
-		return iterator_to_array($this);
-	}
+	use CollectionTrait;
 
 /**
  * Serialize a resultset.
@@ -58,15 +51,4 @@ public function unserialize($serialized) {
 		$this->_results = unserialize($serialized);
 	}
 
-/**
- * Convert a result set into JSON.
- *
- * Part of JsonSerializable interface.
- *
- * @return array The data to convert to JSON
- */
-	public function jsonSerialize() {
-		return $this->toArray();
-	}
-
 }

Cake/Test/TestCase/Utility/CollectionTest.php

@@ -17,6 +17,10 @@
 use Cake\TestSuite\TestCase;
 use Cake\Utility\Collection;
 
+/**
+ * CollectionTest
+ *
+ */
 class CollectionTest extends TestCase {
 
 /**

Cake/Utility/Collection.php

@@ -23,13 +23,14 @@
 use Cake\Utility\MapReduce;
 use InvalidArgumentException;
 use IteratorIterator;
+use \JsonSerializable;
 use LimitIterator;
 
 /**
  * A collection is an immutable list of elements with a handful of functions to
  * iterate, group, transform and extract information from it.
  */
-class Collection extends IteratorIterator {
+class Collection extends IteratorIterator implements JsonSerializable {
 
 	use CollectionTrait;
 

Cake/Utility/CollectionTrait.php

@@ -22,7 +22,6 @@
 use Cake\Utility\MapReduce;
 use LimitIterator;
 
-
 /**
  * Offers a handful of method to manipulate iterators
  */
@@ -528,6 +527,26 @@ public function sample($size = 10) {
 		return new Collection(new LimitIterator($this, 0, $size));
 	}
 
+/**
+ * Returns an array representation of the results
+ *
+ * @return array
+ */
+	public function toArray() {
+		return iterator_to_array($this);
+	}
+
+/**
+ * Convert a result set into JSON.
+ *
+ * Part of JsonSerializable interface.
+ *
+ * @return array The data to convert to JSON
+ */
+	public function jsonSerialize() {
+		return $this->toArray();
+	}
+
 /**
  * Returns a callable that can be used to extract a property or column from
  * an array or object based on a dot separated path.