pass the path to the recurse method

FriendsOfCake · Aug 31, 2013 · 5dbc3f6 · 5dbc3f6
1 parent 2a38544
commit 5dbc3f6
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 1 deletion.
diff --git a/Controller/Crud/Listener/ApiTransformationListener.php b/Controller/Crud/Listener/ApiTransformationListener.php
@@ -175,7 +175,7 @@ protected function _recurse(&$variable, $key = null) {
 			}
 
 			foreach ($variable as $k => &$value) {
-				$this->_recurse($value, $key ? "$key.$k" : $k);
+				$this->_recurse($value, $key === null ? $k : "$key.$k");
 			}
 
 			return;

diff --git a/Test/Case/Controller/Crud/Listener/ApiTransformationListenerTest.php b/Test/Case/Controller/Crud/Listener/ApiTransformationListenerTest.php
@@ -1207,6 +1207,91 @@ public function testRecurseKeySpecificTransform() {
 		$this->assertSame($expected, $data);
 	}
 
+	public function testRecurseKeySpecificNestedTransform() {
+		$listener = $this
+			->getMockBuilder('ApiTransformationListener')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$callback = function($variable, $key) {
+			if (preg_match('@^\d+.User\.changeme$@', $key)) {
+				return 'changed';
+			}
+			return $variable;
+		};
+
+		$settings = array(
+			'changeNesting' => true,
+			'changeKeys' => false,
+			'changeTime' => false,
+			'castNumbers' => false,
+			'keyMethods' => array(),
+			'valueMethods' => array($callback),
+			'replaceMap' => array()
+		);
+
+		$this->setReflectionClassInstance($listener);
+		$this->setProtectedProperty('_settings', $settings, $listener);
+
+		$data = array(
+			'changeme' => 'no change',
+			array(
+				'changeme' => 'no change',
+				'User' => array(
+					'id' => '5',
+					'name' => 'FriendsOfCake',
+					'changeme' => 'old'
+				),
+				'Profile' => array(
+					'id' => '987',
+					'twitter' => '@FriendsOfCake'
+				)
+			),
+			array(
+				'User' => array(
+					'id' => '6',
+					'name' => 'FriendsOfCake',
+					'changeme' => 'old two'
+				),
+				'Profile' => array(
+					'id' => '987',
+					'twitter' => '@FriendsOfCake'
+				)
+			)
+		);
+
+		$expected = array(
+			'changeme' => 'no change',
+			array(
+				'changeme' => 'no change',
+				'User' => array(
+					'id' => '5',
+					'name' => 'FriendsOfCake',
+					'changeme' => 'changed'
+				),
+				'Profile' => array(
+					'id' => '987',
+					'twitter' => '@FriendsOfCake'
+				)
+			),
+			array(
+				'User' => array(
+					'id' => '6',
+					'name' => 'FriendsOfCake',
+					'changeme' => 'changed'
+				),
+				'Profile' => array(
+					'id' => '987',
+					'twitter' => '@FriendsOfCake'
+				)
+			)
+		);
+
+		$this->callProtectedMethod('_recurse', array(&$data), $listener);
+
+		$this->assertSame($expected, $data);
+	}
+
 /**
  * testGetReplaceMapFromAssociationsEndlessLoopPrevention
  *