#196 refactored method name

framework/helpers/base/ArrayHelper.php

@@ -95,7 +95,7 @@ class ArrayHelper
 	 * ~~~
 	 * // $array = array('type'=>'A', 'options'=>array(1,2));
 	 * // working with array
-	 * $type = \yii\helpers\ArrayHelper::popValue($array, 'type');
+	 * $type = \yii\helpers\ArrayHelper::remove($array, 'type');
 	 * // $array content
 	 * // $array = array('options'=>array(1,2));
 	 * ~~~
@@ -105,10 +105,10 @@ class ArrayHelper
 	 * @param mixed $default the default value to be returned if the specified key does not exist
 	 * @return mixed|null the value of the element if found, default value otherwise
 	 */
-	public static function popValue(&$array, $key, $default = null)
+	public static function remove(&$array, $key, $default = null)
 	{
-		if (is_array($array)) {
+		if (is_array($array) && (isset($array[$key]) || array_key_exists($key, $array))) {
-			$value = static::getValue($array, $key, $default);
+			$value = $array[$key];
 			unset($array[$key]);
 			return $value;
 		}

tests/unit/framework/helpers/ArrayHelperTest.php

@@ -12,10 +12,10 @@ class ArrayHelperTest extends \yii\test\TestCase
 
 	}
 
-	public function testPopvalue()
+	public function testRemove()
 	{
 		$array = array('name' => 'b', 'age' => 3);
-		$name = ArrayHelper::popValue($array, 'name');
+		$name = ArrayHelper::remove($array, 'name');
 
 		$this->assertEquals($name, 'b');
 		$this->assertEquals($array, array('age' => 3));