tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Implemented improved associative array check

Browse Source
This commit is contained in:
Andreas Gerhards 2018-06-18 08:45:22 +12:00
parent f03d5e8d19
commit f45cf75407
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ORM/ArrayLib.php
View File

@ -123,25 +123,19 @@ class ArrayLib
* Determines if an array is associative by checking for existing keys via
* array_key_exists().
*
* @see http://nz.php.net/manual/en/function.is-array.php#76188
* @see http://nz.php.net/manual/en/function.is-array.php#121692
*
* @param array $arr
* @param array $array
*
* @return boolean
*/
public static function is_associative($arr)
public static function is_associative($array)
{
if (is_array($arr) && !empty($arr)) {
for ($iterator = count($arr) - 1; $iterator; $iterator--) {
if (!array_key_exists($iterator, $arr)) {
return true;
}
}
$isAssociative = !empty($array)
&& is_array($array)
&& ($array !== array_values($array));
return !array_key_exists(0, $arr);
}
return false;
return $isAssociative;
}
/**