ENHANCEMENT Use array_combine() instead of custom logic for ArrayLib::valuekey() (thanks paradigmincarnate!)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107380 467b73ca-7a2a-4603-9d3b-597d59a354a9

core/ArrayLib.php

@@ -62,11 +62,7 @@ class ArrayLib {
 	 * @return array
 	 */
 	static function valuekey($arr) {
-		$newArr = array();
+		return array_combine($arr, $arr);
-		foreach($arr as $val) {
-			$newArr[$val] = $val;
-		}
-		return $newArr;
 	}
 	
 	/**

tests/ArrayLibTest.php

@@ -30,4 +30,20 @@ class ArrayLibTest extends SapphireTest {
 			)
 		);
 	}
+
+	function testValuekey() {
+		$this->assertEquals(
+			ArrayLib::valuekey(
+				array(
+					'testkey1' => 'testvalue1',
+					'testkey2' => 'testvalue2'
+				)
+			),
+			array(
+				'testvalue1' => 'testvalue1',
+				'testvalue2' => 'testvalue2'
+			)
+		);
+	}
+
 }