Merge pull request #1 from mpociot/master

update fork

composer.json

@@ -23,7 +23,6 @@
         "mpociot/documentarian": "^0.2.0",
         "mpociot/reflection-docblock": "^1.0.1",
         "ramsey/uuid": "^3.8",
-        "nunomaduro/collision": "^3.0",
         "league/flysystem": "^1.0"
     },
     "require-dev": {
@@ -34,7 +33,8 @@
         "league/fractal": "^0.17.0"
     },
     "suggest": {
-        "league/fractal": "Required for transformers support"
+        "league/fractal": "Required for transformers support",
+        "nunomaduro/collision": "For better reporting of errors that are thrpwn when generating docs"
     },
     "autoload": {
         "psr-4": {

src/Tools/ResponseStrategies/ResponseCallStrategy.php

@@ -8,8 +8,6 @@ use Illuminate\Http\Response;
 use Illuminate\Routing\Route;
 use Mpociot\ApiDoc\Tools\Flags;
 use Mpociot\ApiDoc\Tools\Utils;
-use Whoops\Exception\Inspector;
-use NunoMaduro\Collision\Handler;
 use Mpociot\ApiDoc\Tools\Traits\ParamHelpers;
 
 /**
@@ -41,10 +39,7 @@ class ResponseCallStrategy
         } catch (\Exception $e) {
             echo 'Exception thrown during response call for ['.implode(',', $route->methods)."] {$route->uri}.\n";
             if (Flags::$shouldBeVerbose) {
-                $handler = new Handler;
-                $handler->setInspector(new Inspector($e));
-                $handler->setException($e);
-                $handler->handle();
+                Utils::dumpException($e);
             } else {
                 echo "Run this again with the --verbose flag to see the exception.\n";
             }

src/Tools/Utils.php

@@ -66,6 +66,19 @@ class Utils
         return $uri;
     }
 
+    public function dumpException(\Exception $e)
+    {
+        if (class_exists(\NunoMaduro\Collision\Handler::class)) {
+            $handler = new \NunoMaduro\Collision\Handler;
+            $handler->setInspector(new \Whoops\Exception\Inspector($e));
+            $handler->setException($e);
+            $handler->handle();
+        } else {
+            dump($e);
+            echo "You can get better exception output by installing the library \nunomaduro/collision (PHP 7.1+ only).\n";
+        }
+    }
+
     public static function deleteDirectoryAndContents($dir)
     {
         $adapter = new Local(realpath(__DIR__.'/../../'));

tests/Fixtures/partial_resource_index.md

@@ -30,6 +30,7 @@ Welcome to the generated API reference.
 curl -X GET -G "http://localhost/api/users" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users");
 
@@ -46,6 +47,7 @@ fetch(url, {
     .then(json => console.log(json));
 ```
 
+
 > Example response (200):
 
 ```json
@@ -69,6 +71,7 @@ fetch(url, {
 curl -X GET -G "http://localhost/api/users/create" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users/create");
 
@@ -85,6 +88,7 @@ fetch(url, {
     .then(json => console.log(json));
 ```
 
+
 > Example response (200):
 
 ```json

tests/Fixtures/resource_index.md

@@ -30,6 +30,7 @@ Welcome to the generated API reference.
 curl -X GET -G "http://localhost/api/users" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users");
 
@@ -46,6 +47,7 @@ fetch(url, {
     .then(json => console.log(json));
 ```
 
+
 > Example response (200):
 
 ```json
@@ -69,6 +71,7 @@ fetch(url, {
 curl -X GET -G "http://localhost/api/users/create" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users/create");
 
@@ -85,6 +88,7 @@ fetch(url, {
     .then(json => console.log(json));
 ```
 
+
 > Example response (200):
 
 ```json
@@ -108,6 +112,7 @@ fetch(url, {
 curl -X POST "http://localhost/api/users" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users");
 
@@ -125,6 +130,7 @@ fetch(url, {
 ```
 
 
+
 ### HTTP Request
 `POST api/users`
 
@@ -140,6 +146,7 @@ fetch(url, {
 curl -X GET -G "http://localhost/api/users/1" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users/1");
 
@@ -156,6 +163,7 @@ fetch(url, {
     .then(json => console.log(json));
 ```
 
+
 > Example response (200):
 
 ```json
@@ -179,6 +187,7 @@ fetch(url, {
 curl -X GET -G "http://localhost/api/users/1/edit" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users/1/edit");
 
@@ -195,6 +204,7 @@ fetch(url, {
     .then(json => console.log(json));
 ```
 
+
 > Example response (200):
 
 ```json
@@ -218,6 +228,7 @@ fetch(url, {
 curl -X PUT "http://localhost/api/users/1" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users/1");
 
@@ -235,6 +246,7 @@ fetch(url, {
 ```
 
 
+
 ### HTTP Request
 `PUT api/users/{user}`
 
@@ -252,6 +264,7 @@ fetch(url, {
 curl -X DELETE "http://localhost/api/users/1" \
     -H "Accept: application/json"
 ```
+
 ```javascript
 const url = new URL("http://localhost/api/users/1");
 
@@ -269,6 +282,7 @@ fetch(url, {
 ```
 
 
+
 ### HTTP Request
 `DELETE api/users/{user}`