Added support for Laravel < 5.2

mpociot · May 4, 2016 · 6e7c50f · 6e7c50f
1 parent 589014e
commit 6e7c50f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/src/Mpociot/ApiDoc/Commands/GenerateDocumentation.php b/src/Mpociot/ApiDoc/Commands/GenerateDocumentation.php
@@ -62,9 +62,15 @@ public function handle()
         }
 
         if ($actAs !== null) {
-            $userModel = config('auth.providers.users.model');
-            $user = $userModel::find($actAs);
-            $this->laravel['auth']->guard()->setUser($user);
+            if (version_compare($this->laravel->version(),'5.2.0', '<')) {
+                $userModel = config('auth.model');
+                $user = $userModel::find($actAs);
+                $this->laravel['auth']->setUser($user);
+            } else {
+                $userModel = config('auth.providers.users.model');
+                $user = $userModel::find($actAs);
+                $this->laravel['auth']->guard()->setUser($user);
+            }
         }
 
         $routes = Route::getRoutes();

diff --git a/tests/ApiDocGeneratorTest.php b/tests/ApiDocGeneratorTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Routing\Controller;
 use Illuminate\Routing\Route;
 use Mpociot\ApiDoc\ApiDocGenerator;
@@ -55,6 +56,21 @@ public function testCanParseRouteMethods()
         $this->assertEquals(['DELETE'], $parsed['methods']);
     }
 
+    public function testCanParseFormRequestRules()
+    {
+        \Illuminate\Support\Facades\Route::post('/post', 'TestController@parseFormRequestRules');
+        $route = new Route(['POST'], '/post', ['uses' => 'TestController@parseFormRequestRules']);
+        $parsed = $this->generator->processRoute($route);
+        $parameters = $parsed['parameters'];
+        $this->assertArrayHasKey('required_attribute', $parameters);
+
+        $required_attribute = $parameters['required_attribute'];
+
+        $this->assertTrue( $required_attribute['required'] );
+        $this->assertEquals( 'string', $required_attribute['type'] );
+        $this->assertCount( 0, $required_attribute['description'] );
+    }
+
 }
 
 class TestController extends Controller
@@ -76,4 +92,19 @@ public function parseMethodDescription()
         return '';
     }
 
+    public function parseFormRequestRules(TestRequest $request)
+    {
+        return '';
+    }
+
+}
+
+class TestRequest extends FormRequest 
+{
+    public function rules()
+    {
+        return [
+            'required_attribute' => 'required'
+        ];
+    }
 }