Skip to content

Commit b70c0f2

Browse files
authored
Update ValidatorList.php
1 parent b4defa8 commit b70c0f2

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

src/ValidatorList.php

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public static function isArray($val)
518518
}
519519

520520
/**
521-
* 验证值是否是一个非自然数组 map (key - value 形式的)
521+
* 验证值是否是一个非自然数组 map (key不是自然增长的 OR key - value 形式的)
522522
* @param mixed $val
523523
* @return bool
524524
*/
@@ -529,13 +529,9 @@ public static function isMap($val)
529529
}
530530

531531
/** @var array $val */
532-
foreach ($val as $k => $v) {
533-
if (\is_string($k)) {
534-
return true;
535-
}
536-
}
537-
538-
return false;
532+
$keys = array_keys($val);
533+
534+
return array_keys($keys) !== $keys;
539535
}
540536

541537
/**
@@ -549,22 +545,10 @@ public static function isList($val)
549545
return false;
550546
}
551547

552-
$prevKey = 0;
553-
554548
/** @var array $val */
555-
foreach ($val as $k => $v) {
556-
if (!\is_int($k)) {
557-
return false;
558-
}
559-
560-
if ($k !== $prevKey) {
561-
return false;
562-
}
563-
564-
$prevKey++;
565-
}
549+
$keys = array_keys($val);
566550

567-
return true;
551+
return array_keys($keys) === $keys;
568552
}
569553

570554
/**

0 commit comments

Comments
 (0)