参数检查，增加空数组检查

yeaha · Mar 13, 2015 · bc69ea8 · bc69ea8
1 parent 38241e6
commit bc69ea8
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 2 deletions.
diff --git a/src/Parameter/Checker.php b/src/Parameter/Checker.php
@@ -19,9 +19,11 @@
  *     'bar' => [],                             // 不指定任何配置就用默认配置
  *     'foobar' => [
  *         'type' => 'hash',                    // 字典类型
+ *         'allow_empty' => true,               // 是否允许空hash数组
  *         'keys' => [                          // 声明字典值配置
  *             'foo' => [                       // 字典和数组都可以任意嵌套
  *                 'type' => 'array',           // 数组类型
+ *                 'allow_empty' => true,       // 是否允许空数组
  *                 'element' => [               // 数组每个元素的值配置
  *                     'bar' => [],
  *                 ],
@@ -156,10 +158,18 @@ protected function checkLiteral($key, $value, array $option) {
      * @return void
      */
     protected function checkHash($key, $value, array $option) {
-        if (!is_array($value) || array_values($value) === $value) {
+        if (!is_array($value) || ($value && array_values($value) === $value)) {
             throw $this->exception($key, 'value is not hash type');
         }
 
+        if (!$value) {
+            if (!$option['allow_empty']) {
+                throw $this->exception($key, 'value not allow empty hash');
+            }
+
+            return;
+        }
+
         if (isset($option['keys']) && $option['keys']) {
             $this->path[] = $key;
             $this->execute($value, $option['keys'], $this->path);
@@ -175,10 +185,18 @@ protected function checkHash($key, $value, array $option) {
      * @return void
      */
     protected function checkArray($key, $value, array $option) {
-        if (!is_array($value) || array_values($value) !== $value) {
+        if (!is_array($value) || ($value && array_values($value) !== $value)) {
             throw $this->exception($key, 'value is not array type');
         }
 
+        if (!$value) {
+            if (!$option['allow_empty']) {
+                throw $this->exception($key, 'value not allow empty array');
+            }
+
+            return;
+        }
+
         if (isset($option['element']) && $option['element']) {
             $this->path[] = $key;
             foreach ($value as $element) {

diff --git a/tests/Parameter/CheckerTest.php b/tests/Parameter/CheckerTest.php
@@ -117,6 +117,30 @@ public function testHashTypeException() {
         );
     }
 
+    public function testEmptyHashException() {
+        $checker = new \Owl\Parameter\Checker;
+
+        $checker->execute(
+            array('foo' => array()),
+            array(
+                'foo' => array(
+                    'type' => 'hash',
+                    'allow_empty' => true,
+                ),
+            )
+        );
+
+        $this->setExpectedExceptionRegExp('\Owl\Parameter\Exception', '/not allow empty hash/');
+        $checker->execute(
+            array('foo' => array()),
+            array(
+                'foo' => array(
+                    'type' => 'hash',
+                ),
+            )
+        );
+    }
+
     public function testArrayType() {
         $checker = new \Owl\Parameter\Checker;
 
@@ -155,6 +179,30 @@ public function testArrayType() {
         ), $options);
     }
 
+    public function testEmptyArrayException() {
+        $checker = new \Owl\Parameter\Checker;
+
+        $checker->execute(
+            array('foo' => array()),
+            array(
+                'foo' => array(
+                    'type' => 'array',
+                    'allow_empty' => true,
+                ),
+            )
+        );
+
+        $this->setExpectedExceptionRegExp('\Owl\Parameter\Exception', '/not allow empty array/');
+        $checker->execute(
+            array('foo' => array()),
+            array(
+                'foo' => array(
+                    'type' => 'array',
+                ),
+            )
+        );
+    }
+
     public function testURLType() {
         $checker = new \Owl\Parameter\Checker;