Applying patch from 'mcurry' Fixes Set::extract with mixed numeric an…

…d stringKeys. Tests added. Fixes #6072

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8038 3807eeeb-6ff5-0310-8944-8be069107fe0

cake/libs/set.php

@@ -449,6 +449,8 @@ function extract($path, $data = null, $options = array()) {
 									'item' => $item,
 								);
 								break;
+							} else {
+								array_unshift($tokens, $token);
 							}
 						} else {
 							$key = $token;

cake/tests/cases/libs/set.test.php

@@ -435,10 +435,6 @@ function testExtract() {
 		$result = Set::extract('/User/id', $nonZero);
 		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
 
-		// $expected = array(
-		// 	array('id' => 1), array('id' => 2), array('id' => 3), array('id' => 4), array('id' => 5)
-		// );
-
 		$expected = array(1, 2, 3, 4, 5);
 		$this->assertEqual(Set::extract('/User/id', $a), $expected);
 		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
@@ -859,6 +855,24 @@ function testExtract() {
 		$expected = array(array('children' => $tree[1]['children'][0]), array('children' => $tree[1]['children'][1]));
 		$r = Set::extract('/Category[name=Category 2]/../children', $tree);
 		$this->assertEqual($r, $expected);
+
+		$mixedKeys = array(
+			'User' => array(
+				0 => array(
+					'id' => 4,
+					'name' => 'Neo'
+				),
+				1 => array(
+					'id' => 5,
+					'name' => 'Morpheus'
+				),
+				'stringKey' => array()
+			)
+		);
+
+		$expected = array('Neo', 'Morpheus');
+		$r = Set::extract('/User/name', $mixedKeys);
+		$this->assertEqual($r, $expected);
 	}
 /**
  * testMatches method