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

Author: Mezatsong

README.md

@@ -33,9 +33,9 @@ Laravel Swagger Docs works based on recommended practices by Laravel. It will pa
 One thing to note is this library leans on being explicit. It will choose to include keys even if they have a default. For example it chooses to say a route has a deprecated value of false rather than leaving it out. I believe this makes reading the documentation easier by not leaving important information out. The file can be easily cleaned up afterwards if the user chooses to leave out the defaults.
 
 ### Command line
-Generating the swagger documentation is easy, simply run `php artisan laravel-swagger:generate` in your project root. The output of the command will be stored in your storage path linked in config file.
+Generating the swagger documentation is easy, simply run `php artisan swagger:generate` in your project root. The output of the command will be stored in your storage path linked in config file.
 
-If you wish to generate docs for a subset of your routes, you can pass a filter using `--filter`, for example: `php artisan laravel-swagger:generate --filter="/api"`
+If you wish to generate docs for a subset of your routes, you can pass a filter using `--filter`, for example: `php artisan swagger:generate --filter="/api"`
 
 You can also configure your swagger.php file to always generate schema when accessing Swagger UI or just by adding this line in your .env: `SWAGGER_GENERATE_ALWAYS=true`
 

src/Definitions/DefinitionGenerator.php

@@ -94,18 +94,23 @@ function generateSchemas(): array {
                     ->all();
 
                 $table = $obj->getTable();
-                $list = Schema::getColumnListing($table);
+                $list = Schema::connection($obj->getConnectionName())->getColumnListing($table);
                 $list = array_diff($list, $obj->getHidden());
 
                 $properties = [];
                 $required = [];
 
-                foreach ($list as $item) {
+                /**
+                * @var \Illuminate\Database\Connection
+                */
+                $conn = $obj->getConnection();
+                $prefix = $conn->getTablePrefix();
 
-                    /**
-                    * @var object
-                    */
-                    $conn = DB::connection();
+                if ($prefix !== '') {
+                    $table = $prefix . $table;
+                }
+
+                foreach ($list as $item) {
 
                     /**
                      * @var \Doctrine\DBAL\Schema\Column

src/Parameters/BodyParametersGenerator.php

@@ -1,8 +1,10 @@
 <?php namespace Mezatsong\SwaggerDocs\Parameters;
 
+use Exception;
 use Illuminate\Support\Arr;
 use Mezatsong\SwaggerDocs\Parameters\Traits\GeneratesFromRules;
 use Mezatsong\SwaggerDocs\Parameters\Interfaces\ParametersGenerator;
+use TypeError;
 
 /**
  * Class BodyParametersGenerator
@@ -42,12 +44,17 @@ public function getParameters(): array {
         $schema = [];
 
         foreach ($this->rules as $parameter => $rule) {
-            $parameterRules = $this->splitRules($rule);
-            $nameTokens = explode('.', $parameter);
-            $this->addToProperties($properties,  $nameTokens, $parameterRules);
-
-            if ($this->isParameterRequired($parameterRules)) {
-                $required[] = $parameter;
+            try {
+                $parameterRules = $this->splitRules($rule);
+                $nameTokens = explode('.', $parameter);
+                $this->addToProperties($properties,  $nameTokens, $parameterRules);
+
+                if ($this->isParameterRequired($parameterRules)) {
+                    $required[] = $parameter;
+                }
+            } catch (TypeError $e) {
+                $ruleStr = json_encode($rule);
+                throw new Exception("Rule `$parameter => $ruleStr` is not well formated", 0, $e);
             }
         }
 
@@ -159,3 +166,4 @@ protected function createNewPropertyObject(string $type, array $rules): array {
         return $propertyObject;
     }
 }
+