Permalink
Browse files

Fixed coding standard violations.

  • Loading branch information...
hperrin committed Oct 1, 2014
1 parent 050e368 commit be8c591dd868a6f923507e261605bfc2249be281
Showing with 6 additions and 6 deletions.
  1. +6 −6 lib/Cake/Utility/Hash.php
View
@@ -643,11 +643,11 @@ public static function expand($data, $separator = '.') {
while (!empty($stack)) {
foreach ($stack as $curKey => &$curMerge) {
foreach ($curMerge[0] as $key => &$val) {
if (!empty($curMerge[1][$key]) && (array)$curMerge[1][$key]===$curMerge[1][$key] && (array)$val===$val) {
if (!empty($curMerge[1][$key]) && (array)$curMerge[1][$key] === $curMerge[1][$key] && (array)$val === $val) {
$stack[] = array(&$val, &$curMerge[1][$key]);
} elseif ((int)$key===$key && isset($curMerge[1][$key])) {
} elseif ((int)$key === $key && isset($curMerge[1][$key])) {
$curMerge[1][] = $val;
} else {
} else {
$curMerge[1][$key] = $val;
}
}
@@ -685,11 +685,11 @@ public static function merge(array $data, $merge) {
while (!empty($stack)) {
foreach ($stack as $curKey => &$curMerge) {
foreach ($curMerge[0] as $key => &$val) {
if (!empty($curMerge[1][$key]) && (array)$curMerge[1][$key]===$curMerge[1][$key] && (array)$val===$val) {
if (!empty($curMerge[1][$key]) && (array)$curMerge[1][$key] === $curMerge[1][$key] && (array)$val === $val) {
$stack[] = array(&$val, &$curMerge[1][$key]);
} elseif ((int)$key===$key && isset($curMerge[1][$key])) {
} elseif ((int)$key === $key && isset($curMerge[1][$key])) {
$curMerge[1][] = $val;
} else {
} else {
$curMerge[1][$key] = $val;
}
}

0 comments on commit be8c591

Please sign in to comment.