Fix property conflict; Add ShowsTrace contract

Author: Maxim Lanin

src/ApiException.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
+use Lanin\Laravel\ApiExceptions\Contracts\ShowsTrace;
 use Symfony\Component\Debug\Exception\FlattenException;
 
 abstract class ApiException extends IdException implements Jsonable, \JsonSerializable, Arrayable
@@ -79,7 +80,7 @@ public function toArray()
             }
         }
 
-        if (env('APP_DEBUG')) {
+        if (env('APP_DEBUG') && $this instanceof ShowsTrace) {
             $return['trace'] = FlattenException::create($e)->getTrace();
         }
 

src/Contracts/ShowsTrace.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Lanin\Laravel\ApiExceptions\Contracts;
+
+interface ShowsTrace
+{
+
+}

src/ExceptionHandlerTrait.php

@@ -6,29 +6,12 @@
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Session\TokenMismatchException;
 use Illuminate\Validation\ValidationException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 trait ExceptionHandlerTrait
 {
-    /**
-     * A list of the exception types that should not be reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        AuthenticationException::class,
-        AuthorizationException::class,
-        HttpException::class,
-        ModelNotFoundException::class,
-        TokenMismatchException::class,
-        ValidationException::class,
-        Contracts\DontReport::class,
-    ];
-
     /**
      * Report or log an exception.
      *

src/InternalServerErrorApiException.php

@@ -3,8 +3,9 @@
 namespace Lanin\Laravel\ApiExceptions;
 
 use Exception;
+use Lanin\Laravel\ApiExceptions\Contracts\ShowsTrace;
 
-class InternalServerErrorApiException extends ApiException
+class InternalServerErrorApiException extends ApiException implements ShowsTrace
 {
     /**
      * @param string $message

src/LaravelExceptionHandler.php

@@ -2,9 +2,30 @@
 
 namespace Lanin\Laravel\ApiExceptions;
 
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Foundation\Testing\HttpException;
+use Illuminate\Session\TokenMismatchException;
+use Illuminate\Validation\ValidationException;
 
 class LaravelExceptionHandler extends ExceptionHandler
 {
     use ExceptionHandlerTrait;
+
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        AuthenticationException::class,
+        AuthorizationException::class,
+        HttpException::class,
+        ModelNotFoundException::class,
+        TokenMismatchException::class,
+        ValidationException::class,
+        Contracts\DontReport::class,
+    ];
 }

src/LumenExceptionHandler.php

@@ -2,9 +2,31 @@
 
 namespace Lanin\Laravel\ApiExceptions;
 
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Foundation\Testing\HttpException;
+use Illuminate\Session\TokenMismatchException;
+use Illuminate\Validation\ValidationException;
 use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
 
+
 class LumenExceptionHandler extends ExceptionHandler
 {
     use ExceptionHandlerTrait;
+
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        AuthenticationException::class,
+        AuthorizationException::class,
+        HttpException::class,
+        ModelNotFoundException::class,
+        TokenMismatchException::class,
+        ValidationException::class,
+        Contracts\DontReport::class,
+    ];
 }