瀏覽代碼

Merge branch 'master' of github.com:mpociot/laravel-apidoc-generator

Marcel Pociot 9 年之前
父節點
當前提交
b8b6557db6

+ 0 - 1
README.md

@@ -43,7 +43,6 @@ Option | Description
 `output` | The output path used for the generated documentation. Default: `public/docs`
 `routePrefix` | The route prefix to use for generation - `*` can be used as a wildcard
 `routes` | The route names to use for generation - Required if no routePrefix is provided
-`routes` | The route names to use for generation - Required if no routePrefix is provided
 `actAsUserId` | The user ID to use for authenticated API response calls
 `router` | The router to use, when processing the route files (can be Laravel or Dingo - defaults to Laravel)
 `bindings` | List of route bindings that should be replaced when trying to retrieve route results. Syntax format: `binding_one,id|binding_two,id` 

+ 0 - 1
src/Mpociot/ApiDoc/Generators/AbstractGenerator.php

@@ -5,7 +5,6 @@ namespace Mpociot\ApiDoc\Generators;
 use Faker\Factory;
 use ReflectionClass;
 use Illuminate\Support\Str;
-use Illuminate\Routing\Route;
 use phpDocumentor\Reflection\DocBlock;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Http\FormRequest;

+ 1 - 1
src/Mpociot/ApiDoc/Generators/DingoGenerator.php

@@ -16,7 +16,7 @@ class DingoGenerator extends AbstractGenerator
     {
         try {
             $response = $this->getRouteResponse($route, $bindings);
-        } catch( Exception $e){
+        } catch (Exception $e) {
             $response = '';
         }
         $routeAction = $route->getAction();

+ 1 - 3
tests/DingoGeneratorTest.php

@@ -3,13 +3,11 @@
 namespace Mpociot\ApiDoc\Tests;
 
 use Dingo\Api\Provider\LaravelServiceProvider;
-use Illuminate\Routing\Route;
 use Mpociot\ApiDoc\Tests\Fixtures\DingoTestController;
 use Orchestra\Testbench\TestCase;
 use Mpociot\ApiDoc\Generators\DingoGenerator;
 use Mpociot\ApiDoc\Tests\Fixtures\TestRequest;
 use Mpociot\ApiDoc\Tests\Fixtures\TestController;
-use Illuminate\Support\Facades\Route as RouteFacade;
 
 class DingoGeneratorTest extends TestCase
 {
@@ -21,7 +19,7 @@ class DingoGeneratorTest extends TestCase
     protected function getPackageProviders($app)
     {
         return [
-            LaravelServiceProvider::class
+            LaravelServiceProvider::class,
         ];
     }
 

+ 0 - 1
tests/Fixtures/DingoTestController.php

@@ -6,7 +6,6 @@ use Illuminate\Routing\Controller;
 
 class DingoTestController extends Controller
 {
-
     public function dummy()
     {
         return '';

+ 0 - 1
tests/Fixtures/DingoTestRequest.php

@@ -6,7 +6,6 @@ use Dingo\Api\Http\FormRequest;
 
 class DingoTestRequest extends FormRequest
 {
-
     public function rules()
     {
         return [