kylefang/scribe
1
0
Fork 0
mirror of https://github.com/ambieco/scribe.git synced 2026-04-23 01:59:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into no_head

Browse Source
This commit is contained in:
Rudie Dirkx
2017-05-25 22:52:52 +02:00
parent 8c82799a65 db46be8edc
commit 888c53d5a2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mpociot/ApiDoc/Generators/AbstractGenerator.php
View File

@@ -93,7 +93,7 @@ abstract class AbstractGenerator
})->collapse()->toArray();
//Changes url with parameters like /users/{user} to /users/1
$uri = preg_replace('/{(.*)}/', 1, $uri);
$uri = preg_replace('/{(.*?)}/', 1, $uri);
return $this->callRoute(array_shift($methods), $uri, [], [], [], $headers);
}

4
src/resources/views/partials/route.blade.php
View File

@@ -10,7 +10,7 @@
> Example request:
```bash
curl -X {{$parsedRoute['methods'][0]}} "{{config('app.url')}}/{{$parsedRoute['uri']}}" \
curl -X {{$parsedRoute['methods'][0]}} "{{config('app.docs_url') ?: config('app.url')}}/{{$parsedRoute['uri']}}" \
-H "Accept: application/json"@if(count($parsedRoute['parameters'])) \
@foreach($parsedRoute['parameters'] as $attribute => $parameter)
-d "{{$attribute}}"="{{$parameter['value']}}" \
@@ -23,7 +23,7 @@ curl -X {{$parsedRoute['methods'][0]}} "{{config('app.url')}}/{{$parsedRoute['ur
var settings = {
"async": true,
"crossDomain": true,
"url": "{{config('app.url')}}/{{$parsedRoute['uri']}}",
"url": "{{config('app.docs_url') ?: config('app.url')}}/{{$parsedRoute['uri']}}",
"method": "{{$parsedRoute['methods'][0]}}",
@if(count($parsedRoute['parameters']))
"data": {!! str_replace(' ',' ',json_encode(array_combine(array_keys($parsedRoute['parameters']), array_map(function($param){ return $param['value']; },$parsedRoute['parameters'])), JSON_PRETTY_PRINT)) !!},