Merge branch 'master' of https://github.com/Mezatsong/laravel-swagger-docs

Author: Mezatsong

src/Parameters/QueryParametersGenerator.php

@@ -52,6 +52,7 @@ public function getParameters(): array {
                 $arrayTypes[$key] = $type;
                 continue;
             }
+            $parameter = $this->formatParameterName($parameter);
 
             $parameterObject = [
                 'in'            =>  $this->getParameterLocation(),
@@ -126,4 +127,20 @@ protected function addArrayTypes(array $parameters, array $arrayTypes): array {
         return $parameters;
     }
 
+    /**
+     * @param string $parameter
+     * @return string
+     */
+    protected function formatParameterName(string $parameter): string {
+        if (!strpos($parameter, '.')) {
+            return $parameter;
+        }
+        $parts = explode('.', $parameter);
+        for ($i = 1; $i < count($parts); $i++) {
+            $parts[$i] = "[$parts[$i]]";
+        }
+
+        return implode('', $parts);
+    }
+
 }

src/Parameters/Traits/GeneratesFromRules.php

@@ -119,7 +119,7 @@ protected function getParameterExtra(string $type, array $parameterRules): array
                 }
 
                 if (Str::startsWith($rule, 'regex')) {
-                    [$_, $value] = explode(':', $rule);
+                    [$_, $value] = explode(':', $rule, 2);
                     $extra['pattern'] = trim($value);
                 }
             }
@@ -177,7 +177,7 @@ protected function getEnumValues(array $parameterRules): array {
      */
     protected function getDefaultValue(array $parameterRules): ?string {
         foreach ($parameterRules as $rule) {
-            if (Str::startsWith($rule, 'swagger_default')) {
+            if ((is_string($rule) || method_exists($rule, '__toString')) && Str::startsWith($rule, 'swagger_default')) {
                 [$key, $value] = explode(':', $rule);
                 return trim($value);
             }
@@ -192,7 +192,7 @@ protected function getDefaultValue(array $parameterRules): ?string {
      */
     protected function getMinValue(array $parameterRules) {
         foreach ($parameterRules as $rule) {
-            if (Str::startsWith($rule, 'swagger_min')) {
+            if ((is_string($rule) || method_exists($rule, '__toString')) && Str::startsWith($rule, 'swagger_min')) {
                 [$key, $value] = explode(':', $rule);
                 return trim($value);
             }
@@ -207,7 +207,7 @@ protected function getMinValue(array $parameterRules) {
      */
     protected function getMaxValue(array $parameterRules) {
         foreach ($parameterRules as $rule) {
-            if (Str::startsWith($rule, 'swagger_max')) {
+            if ((is_string($rule) || method_exists($rule, '__toString')) && Str::startsWith($rule, 'swagger_max')) {
                 [$key, $value] = explode(':', $rule);
                 return trim($value);
             }