adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing tests.

Browse source 
Set::merge() accepts anything even non-array values.
This commit is contained in:
mark_story 2012-03-31 13:38:09 -04:00
parent a463033ee9
commit 6a9fdd841a
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Utility/Set.php
View file

@ -45,6 +45,12 @@ class Set {
*/ */
public static function merge($arr1, $arr2 = null) { public static function merge($arr1, $arr2 = null) {
$args = func_get_args(); $args = func_get_args();
if (empty($args[1])) {
return (array)$args[0];
}
if (!is_array($args[0])) {
$args[0] = (array)$args[0];
}
return call_user_func_array('Hash::merge', $args); return call_user_func_array('Hash::merge', $args);
} }