Skip to content

Commit bf2c3a1

Browse files
committed
Added Dingo tests
1 parent 097525f commit bf2c3a1

File tree

7 files changed

+418
-21
lines changed

7 files changed

+418
-21
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
},
2424
"require-dev": {
2525
"orchestra/testbench": "~3.0",
26-
"phpunit/phpunit": "~4.0 || ~5.0"
26+
"phpunit/phpunit": "~4.0 || ~5.0",
27+
"dingo/api": "1.0.*@dev"
2728
},
2829
"autoload": {
2930
"psr-0": {

src/Mpociot/ApiDoc/Generators/AbstractGenerator.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
abstract class AbstractGenerator
1414
{
1515
/**
16-
* @param Route $route
16+
* @param $route
1717
*
1818
* @return mixed
1919
*/
20-
abstract protected function getUri(Route $route);
20+
abstract protected function getUri($route);
2121

2222
/**
2323
* @param \Illuminate\Routing\Route $route
2424
* @param array $bindings
2525
*
2626
* @return array
2727
*/
28-
abstract public function processRoute(Route $route, $bindings = []);
28+
abstract public function processRoute($route, $bindings = []);
2929

3030
/**
3131
* @param array $routeData
@@ -54,11 +54,11 @@ protected function getParameters($routeData, $routeAction)
5454
}
5555

5656
/**
57-
* @param \Illuminate\Routing\Route $route
57+
* @param $route
5858
*
5959
* @return \Illuminate\Http\Response
6060
*/
61-
protected function getRouteResponse(Route $route, $bindings)
61+
protected function getRouteResponse($route, $bindings)
6262
{
6363
$uri = $this->addRouteModelBindings($route, $bindings);
6464

@@ -68,12 +68,12 @@ protected function getRouteResponse(Route $route, $bindings)
6868
}
6969

7070
/**
71-
* @param Route $route
71+
* @param $route
7272
* @param array $bindings
7373
*
7474
* @return mixed
7575
*/
76-
protected function addRouteModelBindings(Route $route, $bindings)
76+
protected function addRouteModelBindings($route, $bindings)
7777
{
7878
$uri = $this->getUri($route);
7979
foreach ($bindings as $model => $id) {

src/Mpociot/ApiDoc/Generators/DingoGenerator.php

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Mpociot\ApiDoc\Generators;
44

5-
use Illuminate\Support\Facades\App;
5+
use Exception;
66

77
class DingoGenerator extends AbstractGenerator
88
{
@@ -14,26 +14,23 @@ class DingoGenerator extends AbstractGenerator
1414
*/
1515
public function processRoute($route, $bindings = [])
1616
{
17-
$response = $this->getRouteResponse($route, $bindings);
18-
17+
try {
18+
$response = $this->getRouteResponse($route, $bindings);
19+
} catch( Exception $e){
20+
$response = '';
21+
}
1922
$routeAction = $route->getAction();
2023
$routeGroup = $this->getRouteGroup($routeAction['uses']);
2124
$routeDescription = $this->getRouteDescription($routeAction['uses']);
2225

23-
if ($response->headers->get('Content-Type') === 'application/json') {
24-
$content = json_encode(json_decode($response->getContent()), JSON_PRETTY_PRINT);
25-
} else {
26-
$content = $response->getContent();
27-
}
28-
2926
return $this->getParameters([
3027
'resource' => $routeGroup,
3128
'title' => $routeDescription['short'],
3229
'description' => $routeDescription['long'],
3330
'methods' => $route->getMethods(),
34-
'uri' => $route->getUri(),
31+
'uri' => $route->uri(),
3532
'parameters' => [],
36-
'response' => $content,
33+
'response' => $response,
3734
], $routeAction);
3835
}
3936

src/Mpociot/ApiDoc/Generators/LaravelGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class LaravelGenerator extends AbstractGenerator
1313
*
1414
* @return mixed
1515
*/
16-
protected function getUri(Route $route)
16+
protected function getUri($route)
1717
{
1818
return $route->getUri();
1919
}
@@ -24,7 +24,7 @@ protected function getUri(Route $route)
2424
*
2525
* @return array
2626
*/
27-
public function processRoute(Route $route, $bindings = [])
27+
public function processRoute($route, $bindings = [])
2828
{
2929
$response = $this->getRouteResponse($route, $bindings);
3030

0 commit comments

Comments
 (0)