Remove bonus intval()

It caused issues when getting numeric keys that exceeded PHP_INT_MAX. Fixes #2897
cakephp · May 23, 2012 · 5270721 · 5270721 · lorenzo · May 23, 2012
1 parent c26df70
commit 5270721
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/Cake/Test/Case/Utility/SetTest.php b/lib/Cake/Test/Case/Utility/SetTest.php
@@ -1657,6 +1657,20 @@ public function testClassicExtract() {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test classicExtract with keys that exceed 32bit max int.
+ *
+ * @return void
+ */
+	public function testClassicExtractMaxInt() {
+		$data = array(
+			'Data' => array(
+				'13376924712' => 'abc'
+			)
+		);
+		$this->assertEquals('abc', Set::classicExtract($data, 'Data.13376924712'));
+	}
+
 /**
  * testInsert method
  *

diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php
@@ -603,8 +603,8 @@ public static function classicExtract($data, $path = null) {
 
 		foreach ($path as $i => $key) {
 			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
-				if (isset($data[intval($key)])) {
-					$data = $data[intval($key)];
+				if (isset($data[$key])) {
+					$data = $data[$key];
 				} else {
 					return null;
 				}