adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-10 05:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix coding standards warnings.

Browse source
This commit is contained in:
mark_story 2012-04-10 22:16:14 -04:00
parent 9f9feec222
commit a4f0399f74
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,12 +38,12 @@ class Set {
* Note: This function will work with an unlimited amount of arguments and typecasts non-array
* parameters into arrays.
*
* @param array $arr1 Array to be merged
* @param array $arr2 Array to merge with
* @param array $data Array to be merged
* @param array $merge Array to merge with
* @return array Merged array
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::merge
*/
public static function merge($arr1, $arr2 = null) {
public static function merge($data, $merge = null) {
$args = func_get_args();
if (empty($args[1])) {
return (array)$args[0];