Merge branch 'feat/laravel-7-support' of github.com:loonpwn/api into feat/phpunit-8

Author: Harlan Wilton

composer.json

@@ -14,6 +14,7 @@
     }],
     "require": {
         "php": "^7.2.5",
+        "dingo/blueprint": "^0.4",
         "illuminate/routing": "^5.5 || ^6.0 || ^7.0",
         "illuminate/support": "^5.5 || ^6.0 || ^7.0",
         "league/fractal": "^0.17"

src/Exception/Handler.php

@@ -5,17 +5,17 @@
 use Dingo\Api\Http\Request;
 use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use ReflectionFunction;
 use Illuminate\Support\Str;
 use Illuminate\Http\Response;
 use Dingo\Api\Contract\Debug\ExceptionHandler;
 use Dingo\Api\Contract\Debug\MessageBagErrors;
+use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
 use Illuminate\Validation\ValidationException;
+use ReflectionFunction;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpFoundation\Response as BaseResponse;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
 
 class Handler implements ExceptionHandler, IlluminateExceptionHandler
@@ -161,11 +161,11 @@ public function handle($exception)
                     $response = new Response($response, $this->getExceptionStatusCode($exception));
                 }
 
-                return $response;
+                return $response->withException($exception);
             }
         }
 
-        return $this->genericResponse($exception);
+        return $this->genericResponse($exception)->withException($exception);
     }
 
     /**

src/Http/Response/Factory.php

@@ -123,7 +123,12 @@ public function collection(Collection $collection, $transformer, $parameters = [
      */
     public function item($item, $transformer, $parameters = [], Closure $after = null)
     {
-        $class = get_class($item);
+        // Check for $item being null
+        if (! is_null($item)) {
+            $class = get_class($item);
+        } else {
+            $class = \StdClass::class;
+        }
 
         if ($parameters instanceof \Closure) {
             $after = $parameters;

src/Routing/Route.php

@@ -511,8 +511,8 @@ public function methods()
      */
     public function httpOnly()
     {
-        return in_array('https', $this->action, true)
-            || (array_key_exists('https', $this->action) && $this->action['https']);
+        return in_array('http', $this->action, true)
+            || (array_key_exists('http', $this->action) && $this->action['http']);
     }
 
     /**
@@ -532,7 +532,8 @@ public function httpsOnly()
      */
     public function secure()
     {
-        return in_array('https', $this->action, true);
+        return in_array('https', $this->action, true)
+            || (array_key_exists('https', $this->action) && $this->action['https']);
     }
 
     /**

tests/Exception/HandlerTest.php

@@ -50,6 +50,7 @@ public function testExceptionHandlerHandlesException()
 
         $this->assertSame('foo', $response->getContent());
         $this->assertSame(404, $response->getStatusCode());
+        $this->assertSame($exception, $response->exception);
     }
 
     public function testExceptionHandlerHandlesExceptionAndCreatesNewResponse()
@@ -137,6 +138,7 @@ public function testRegularExceptionsAreHandledByGenericHandler()
 
         $this->assertSame('{"message":"Uh oh","status_code":500}', $response->getContent());
         $this->assertSame(500, $response->getStatusCode());
+        $this->assertSame($exception, $response->exception);
     }
 
     public function testResourceExceptionErrorsAreIncludedInResponse()