Renaming reformatting function to better express its purpose, also

making it a real method instead of a closure as there was no need for it
to be one

Author: lorenzo

lib/Cake/ORM/Query.php

@@ -245,28 +245,35 @@ public function contain($associations = null, $override = false) {
 			return $this;
 		}
 
-		$normalizer = function($associations) use (&$normalizer) {
-			$result = [];
-			foreach ((array)$associations as $table => $options) {
-				if (is_int($table)) {
-					$table = $options;
-					$options = [];
-				} elseif (is_array($options) && !isset($this->_containOptions[$table])) {
-					$options = $normalizer($options);
-				}
-				$result[$table] = $options;
-			}
-			return $result;
-		};
-
 		$old = $this->_containments->getArrayCopy();
-		$associations = array_merge($old, $normalizer($associations));
+		$associations = array_merge($old, $this->_reformatContain($associations));
 		$this->_containments->exchangeArray($associations);
 		$this->_normalizedContainments = null;
 		$this->_dirty = true;
 		return $this;
 	}
 
+/**
+ * Formats the containments array so that associations are always set as keys
+ * in the array.
+ *
+ * @param array $associations user provided containments array
+ * @return array
+ */
+	protected function _reformatContain($associations) {
+		$result = [];
+		foreach ((array)$associations as $table => $options) {
+			if (is_int($table)) {
+				$table = $options;
+				$options = [];
+			} elseif (is_array($options) && !isset($this->_containOptions[$table])) {
+				$options = $this->_reformatContain($options);
+			}
+			$result[$table] = $options;
+		}
+		return $result;
+	}
+
 /**
  * Returns the fully normalized array of associations that should be eagerly
  * loaded. The normalized array will restructure the original one by sorting
@@ -275,7 +282,6 @@ public function contain($associations = null, $override = false) {
  * Additionally it will set an 'instance' key per association containing the
  * association instance from the corresponding source table
  *
- *
  * @return array
  */
 	public function normalizedContainments() {