From 779d582a31abab4f3d3720e2dafcbf4574b52e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Thu, 22 Oct 2015 02:47:14 -0200 Subject: [PATCH 1/2] remove else, and early return :D --- src/Methods/ArraysMethods.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Methods/ArraysMethods.php b/src/Methods/ArraysMethods.php index 4ff97c2..56e4072 100644 --- a/src/Methods/ArraysMethods.php +++ b/src/Methods/ArraysMethods.php @@ -396,10 +396,10 @@ public static function sortKeys($array, $direction = 'ASC') $direction = (strtolower($direction) === 'desc') ? SORT_DESC : SORT_ASC; if ($direction === SORT_ASC) { ksort($array); - } else { - krsort($array); + return $array; } + krsort($array); return $array; } @@ -458,9 +458,11 @@ public static function flatten($array, $separator = '.', $parent = null) foreach ($_flattened as $key => $value) { if (is_array($value)) { $flattened = array_merge($flattened, $value); - } else { - $flattened[$key] = $value; + continue; } + + $flattened[$key] = $value; + } return $flattened; @@ -532,10 +534,10 @@ public static function removeValue($array, $value) { $isNumericArray = true; foreach ($array as $key => $item) { + if (!is_int($key)) { + $isNumericArray = false; + } if ($item === $value) { - if (!is_int($key)) { - $isNumericArray = false; - } unset($array[$key]); } } From 32c126c7986ec03c10e9eb50c509fd47ae43b0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Thu, 22 Oct 2015 04:04:38 -0200 Subject: [PATCH 2/2] fix error --- src/Methods/ArraysMethods.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Methods/ArraysMethods.php b/src/Methods/ArraysMethods.php index 56e4072..f70caae 100644 --- a/src/Methods/ArraysMethods.php +++ b/src/Methods/ArraysMethods.php @@ -396,10 +396,10 @@ public static function sortKeys($array, $direction = 'ASC') $direction = (strtolower($direction) === 'desc') ? SORT_DESC : SORT_ASC; if ($direction === SORT_ASC) { ksort($array); - return $array; + } else { + krsort($array); } - krsort($array); return $array; } @@ -458,11 +458,9 @@ public static function flatten($array, $separator = '.', $parent = null) foreach ($_flattened as $key => $value) { if (is_array($value)) { $flattened = array_merge($flattened, $value); - continue; + } else { + $flattened[$key] = $value; } - - $flattened[$key] = $value; - } return $flattened;