Fix issue #88

Author: mpociot

src/Mpociot/ApiDoc/Generators/AbstractGenerator.php

@@ -41,7 +41,7 @@ protected function getParameters($routeData, $routeAction, $bindings)
         foreach ($validator->getRules() as $attribute => $rules) {
             $attributeData = [
                 'required' => false,
-                'type' => 'string',
+                'type' => null,
                 'default' => '',
                 'value' => '',
                 'description' => [],
@@ -235,7 +235,9 @@ protected function parseRule($rule, $ruleName, &$attributeData, $seed)
                 $attributeData['description'][] = Description::parse($rule)->with($parameters)->getDescription();
                 break;
             case 'between':
-                $attributeData['type'] = 'numeric';
+                if (!isset($attributeData['type'])) {
+                    $attributeData['type'] = 'numeric';
+                }
                 $attributeData['description'][] = Description::parse($rule)->with($parameters)->getDescription();
                 $attributeData['value'] = $faker->numberBetween($parameters[0], $parameters[1]);
                 break;
@@ -354,6 +356,10 @@ protected function parseRule($rule, $ruleName, &$attributeData, $seed)
         if ($attributeData['value'] === '') {
             $attributeData['value'] = $faker->word;
         }
+
+        if (is_null($attributeData['type'])) {
+            $attributeData['type'] = 'string';
+        }
     }
 
     /**

tests/ApiDocGeneratorTest.php

@@ -135,6 +135,12 @@ public function testCanParseFormRequestRules()
                     $this->assertCount(1, $attribute['description']);
                     $this->assertSame('Between: `5` and `200`', $attribute['description'][0]);
                     break;
+                case 'string_between':
+                    $this->assertFalse($attribute['required']);
+                    $this->assertSame('string', $attribute['type']);
+                    $this->assertCount(1, $attribute['description']);
+                    $this->assertSame('Between: `5` and `200`', $attribute['description'][0]);
+                    break;
                 case 'before':
                     $this->assertFalse($attribute['required']);
                     $this->assertSame('date', $attribute['type']);

tests/DingoGeneratorTest.php

@@ -138,6 +138,12 @@ public function testCanParseFormRequestRules()
                     $this->assertCount(1, $attribute['description']);
                     $this->assertSame('Between: `5` and `200`', $attribute['description'][0]);
                     break;
+                case 'string_between':
+                    $this->assertFalse($attribute['required']);
+                    $this->assertSame('string', $attribute['type']);
+                    $this->assertCount(1, $attribute['description']);
+                    $this->assertSame('Between: `5` and `200`', $attribute['description'][0]);
+                    break;
                 case 'before':
                     $this->assertFalse($attribute['required']);
                     $this->assertSame('date', $attribute['type']);

tests/Fixtures/DingoTestRequest.php

@@ -19,6 +19,7 @@ public function rules()
             'array' => 'array',
             'before' => 'before:2016-04-23 14:31:00',
             'between' => 'between:5,200',
+            'string_between' => 'string|between:5,200',
             'boolean' => 'boolean',
             'date' => 'date',
             'date_format' => 'date_format:j.n.Y H:iP',

tests/Fixtures/TestRequest.php

@@ -19,6 +19,7 @@ public function rules()
             'array' => 'array',
             'before' => 'before:2016-04-23 14:31:00',
             'between' => 'between:5,200',
+            'string_between' => 'string|between:5,200',
             'boolean' => 'boolean',
             'date' => 'date',
             'date_format' => 'date_format:j.n.Y H:iP',