Moving code to where it actually belongs

src/Datasource/QueryTrait.php

@@ -413,10 +413,6 @@ protected function _decorateResults($result) {
 			$result = new $decorator($result);
 		}
 
-		if ($this->bufferResults()) {
-			$result = new $decorator($result->buffered());
-		}
-
 		return $result;
 	}
 

src/ORM/Query.php

@@ -34,6 +34,7 @@ class Query extends DatabaseQuery implements JsonSerializable {
 	use QueryTrait {
 		cache as private _cache;
 		all as private _all;
+		_decorateResults as private _applyDecorators;
 		__call as private _call;
 	}
 
@@ -804,4 +805,21 @@ public function autoFields($value = null) {
 		return $this;
 	}
 
+/**
+ * Decorates the results iterator with MapReduce routines and formatters
+ *
+ * @param \Traversable $result Original results
+ * @return \Cake\Datasource\ResultSetDecorator
+ */
+	protected function _decorateResults($result) {
+		$result = $this->_applyDecorators($result);
+
+		if ($this->bufferResults()) {
+			$class = $this->_decoratorClass();
+			$result = new $class($result->buffered());
+		}
+
+		return $result;
+	}
+
 }