adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed coding standard violations.

Browse source
This commit is contained in:
Hunter Perrin 2014-10-01 12:40:22 -07:00
parent 050e368bd0
commit be8c591dd8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Cake/Utility/Hash.php
View file

@ -643,11 +643,11 @@ class Hash {
while (!empty($stack)) { while (!empty($stack)) {
foreach ($stack as $curKey => &$curMerge) { foreach ($stack as $curKey => &$curMerge) {
foreach ($curMerge[0] as $key => &$val) { 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]); $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; $curMerge[1][] = $val;
} else { } else {
$curMerge[1][$key] = $val; $curMerge[1][$key] = $val;
} }
} }
@ -685,11 +685,11 @@ class Hash {
while (!empty($stack)) { while (!empty($stack)) {
foreach ($stack as $curKey => &$curMerge) { foreach ($stack as $curKey => &$curMerge) {
foreach ($curMerge[0] as $key => &$val) { 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]); $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; $curMerge[1][] = $val;
} else { } else {
$curMerge[1][$key] = $val; $curMerge[1][$key] = $val;
} }
} }