fixed rules array bug

mtrajano · Apr 2, 2018 · 63453a1 · 63453a1
1 parent 7865169
commit 63453a1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/src/Parameters/BodyParameterGenerator.php b/src/Parameters/BodyParameterGenerator.php
@@ -19,7 +19,7 @@ public function getParameters()
         ];
 
         foreach  ($this->rules as $param => $rule) {
-            $paramRules = explode('|', $rule);
+            $paramRules = $this->splitRules($rule);
 
             if ($this->isParamRequired($paramRules)) {
                 $required[] = $param;

diff --git a/src/Parameters/ParameterGenerator.php b/src/Parameters/ParameterGenerator.php
@@ -41,4 +41,13 @@ protected function isParamRequired(array $paramRules)
     {
         return in_array('required', $paramRules);
     }
+
+    protected function splitRules($rules)
+    {
+        if (is_string($rules)) {
+            return explode('|', $rules);
+        } else {
+            return $rules;
+        }
+    }
 }
diff --git a/src/Parameters/QueryParameterGenerator.php b/src/Parameters/QueryParameterGenerator.php
@@ -9,7 +9,7 @@ public function getParameters()
         $params = [];
 
         foreach  ($this->rules as $param => $rule) {
-            $paramRules = explode('|', $rule);
+            $paramRules = $this->splitRules($rule);
 
             $params[] = [
                 'in' => $this->getParamLocation(),

diff --git a/tests/Parameters/QueryParameterGeneratorTest.php b/tests/Parameters/QueryParameterGeneratorTest.php
@@ -7,6 +7,7 @@
 
 class QueryParameterGeneratorTest extends TestCase
 {
+
     public function testRequiredParameter()
     {
         $queryParameters = $this->getQueryParameters([
@@ -21,6 +22,20 @@ public function testRequiredParameter()
         ], $queryParameters[0]);
     }
 
+    public function testRulesAsArray()
+    {
+        $queryParameters = $this->getQueryParameters([
+            'id' => ['integer', 'required'],
+        ]);
+
+        $this->assertArraySubset([
+            'in' => 'query',
+            'type' => 'integer',
+            'name' => 'id',
+            'required' => true,
+        ], $queryParameters[0]);
+    }
+
     public function testOptionalParameter()
     {
         $queryParameters = $this->getQueryParameters([