Improved coverage data

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": "^7.2.5|^8.0",
         "ext-json": "*",
-        "andrey-helldar/support": "^1.30.1",
+        "andrey-helldar/support": "^2.0",
         "symfony/http-foundation": "^4.0|^5.0"
     },
     "require-dev": {

src/Concerns/Errors.php

@@ -2,7 +2,7 @@
 
 namespace Helldar\ApiResponse\Concerns;
 
-use Helldar\Support\Facades\Is;
+use Helldar\Support\Facades\Helpers\Is;
 
 trait Errors
 {

src/Contracts/Parseable.php

@@ -2,7 +2,7 @@
 
 namespace Helldar\ApiResponse\Contracts;
 
-/** @mixin \Helldar\Support\Traits\Makeable */
+/** @mixin \Helldar\Support\Concerns\Makeable */
 interface Parseable
 {
     public function setData($data): self;

src/Contracts/Wrapper.php

@@ -2,7 +2,7 @@
 
 namespace Helldar\ApiResponse\Contracts;
 
-/** @mixin \Helldar\Support\Traits\Makeable */
+/** @mixin \Helldar\Support\Concerns\Makeable */
 interface Wrapper
 {
     public function wrap(bool $wrap = true): self;

src/Exceptions/Laravel/BaseHandler.php

@@ -2,7 +2,7 @@
 
 namespace Helldar\ApiResponse\Exceptions\Laravel;
 
-use Helldar\Support\Facades\Arr;
+use Helldar\Support\Facades\Helpers\Arr;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Validation\ValidationException;
@@ -38,6 +38,17 @@ protected function prepareJsonResponse($request, Throwable $e)
         );
     }
 
+    protected function convertValidationExceptionToResponse(ValidationException $e, $request)
+    {
+        if ($e->response) {
+            return $e->response;
+        }
+
+        return $this->isJson($request)
+            ? $this->invalidJson($request, $e)
+            : $this->invalid($request, $e);
+    }
+
     protected function getExceptionMessage(Throwable $e)
     {
         $converted = parent::convertExceptionToArray($e);

src/Exceptions/Laravel/Eight/ApiHandler.php

@@ -2,7 +2,6 @@
 
 namespace Helldar\ApiResponse\Exceptions\Laravel\Eight;
 
-use Helldar\ApiResponse\Concerns\Exceptions\Laravel\Api;
 use Helldar\ApiResponse\Exceptions\Laravel\BaseHandler;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Support\Responsable;
@@ -13,8 +12,6 @@
 
 abstract class ApiHandler extends BaseHandler
 {
-    use Api;
-
     public function render($request, Throwable $e)
     {
         if (method_exists($e, 'render') && $response = $e->render($request)) {
@@ -47,4 +44,9 @@ public function render($request, Throwable $e)
 
         return $this->prepareJsonResponse($request, $e);
     }
+
+    protected function convertValidationExceptionToResponse(ValidationException $e, $request)
+    {
+        return $this->response($e);
+    }
 }

src/Exceptions/Laravel/Eight/Handler.php

@@ -2,7 +2,6 @@
 
 namespace Helldar\ApiResponse\Exceptions\Laravel\Eight;
 
-use Helldar\ApiResponse\Concerns\Exceptions\Laravel\Web;
 use Helldar\ApiResponse\Exceptions\Laravel\BaseHandler;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Support\Responsable;
@@ -13,8 +12,6 @@
 
 abstract class Handler extends BaseHandler
 {
-    use Web;
-
     public function render($request, Throwable $e)
     {
         if (method_exists($e, 'render') && $response = $e->render($request)) {

src/Exceptions/Laravel/Seven/ApiHandler.php

@@ -2,7 +2,6 @@
 
 namespace Helldar\ApiResponse\Exceptions\Laravel\Seven;
 
-use Helldar\ApiResponse\Concerns\Exceptions\Laravel\Api;
 use Helldar\ApiResponse\Exceptions\Laravel\BaseHandler;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Support\Responsable;
@@ -13,8 +12,6 @@
 
 abstract class ApiHandler extends BaseHandler
 {
-    use Api;
-
     public function render($request, Throwable $e)
     {
         if (method_exists($e, 'render') && $response = $e->render($request)) {
@@ -37,4 +34,9 @@ public function render($request, Throwable $e)
 
         return $this->prepareJsonResponse($request, $e);
     }
+
+    protected function convertValidationExceptionToResponse(ValidationException $e, $request)
+    {
+        return $this->response($e);
+    }
 }

src/Exceptions/Laravel/Seven/Handler.php

@@ -2,7 +2,6 @@
 
 namespace Helldar\ApiResponse\Exceptions\Laravel\Seven;
 
-use Helldar\ApiResponse\Concerns\Exceptions\Laravel\Web;
 use Helldar\ApiResponse\Exceptions\Laravel\BaseHandler;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Support\Responsable;
@@ -13,8 +12,6 @@
 
 abstract class Handler extends BaseHandler
 {
-    use Web;
-
     public function render($request, Throwable $e)
     {
         if (method_exists($e, 'render') && $response = $e->render($request)) {

src/Parsers/Exception.php

@@ -3,23 +3,17 @@
 namespace Helldar\ApiResponse\Parsers;
 
 use Exception as BaseException;
-use Helldar\Support\Facades\Instance;
+use Helldar\Support\Facades\Helpers\Instance;
 use Throwable;
 
-/**
- * @property \Exception|\Throwable $data
- */
+/** @property \Exception|\Throwable $data */
 final class Exception extends Parser
 {
     protected $is_error = true;
 
     public function getData()
     {
-        if ($data = $this->getThrowableContent()) {
-            return $data;
-        }
-
-        return $this->data;
+        return $this->getThrowableContent() ?: $this->data;
     }
 
     public function getStatusCode(): int
@@ -28,20 +22,34 @@ public function getStatusCode(): int
             return $this->status_code;
         }
 
-        if ($code = Instance::callsWhenNotEmpty($this->data, ['getStatusCode', 'getCode'], 400)) {
-            return $code;
-        }
-
-        return parent::getStatusCode();
+        return $this->callStatusCode() ?: parent::getStatusCode();
     }
 
     /**
      * @return array|int|string|null
      */
     protected function getThrowableContent()
     {
-        return Instance::of($this->data, [BaseException::class, Throwable::class])
-            ? Instance::callsWhenNotEmpty($this->data, ['getOriginalContent', 'getContent', 'getResponse', 'getMessage'])
-            : null;
+        return $this->isThrowable() ? $this->callContent() : null;
+    }
+
+    protected function callStatusCode(): ?int
+    {
+        return $this->call(['getStatusCode', 'getCode']);
+    }
+
+    protected function callContent()
+    {
+        return $this->call(['getOriginalContent', 'getContent', 'getResponse', 'getMessage']);
+    }
+
+    protected function isThrowable(): bool
+    {
+        return Instance::of($this->data, [BaseException::class, Throwable::class]);
+    }
+
+    protected function call(array $methods)
+    {
+        return Instance::callWhen($this->data, $methods);
     }
 }

src/Parsers/Laravel/Resource.php

@@ -3,7 +3,7 @@
 namespace Helldar\ApiResponse\Parsers\Laravel;
 
 use Helldar\ApiResponse\Parsers\Parser;
-use Helldar\Support\Facades\Arr;
+use Helldar\Support\Facades\Helpers\Arr;
 use Illuminate\Http\JsonResponse;
 
 /** @property \Illuminate\Http\Resources\Json\JsonResource $data */

src/Parsers/Parser.php

@@ -6,9 +6,9 @@
 use Helldar\ApiResponse\Concerns\Errors;
 use Helldar\ApiResponse\Contracts\Parseable;
 use Helldar\ApiResponse\Services\Response;
-use Helldar\Support\Facades\Instance;
-use Helldar\Support\Facades\Is;
-use Helldar\Support\Traits\Makeable;
+use Helldar\Support\Concerns\Makeable;
+use Helldar\Support\Facades\Helpers\Instance;
+use Helldar\Support\Facades\Helpers\Is;
 
 abstract class Parser implements Parseable
 {

src/Services/Response.php

@@ -9,7 +9,7 @@
 use Helldar\ApiResponse\Wrappers\Error;
 use Helldar\ApiResponse\Wrappers\Resolver;
 use Helldar\ApiResponse\Wrappers\Success;
-use Helldar\Support\Traits\Makeable;
+use Helldar\Support\Concerns\Makeable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 final class Response implements Responsable

src/Support/Parser.php

@@ -9,9 +9,9 @@
 use Helldar\ApiResponse\Parsers\Laravel\Resource as LaravelResourceParser;
 use Helldar\ApiResponse\Parsers\Laravel\Validation as LaravelValidationParser;
 use Helldar\ApiResponse\Parsers\Main;
-use Helldar\Support\Facades\Instance;
-use Helldar\Support\Facades\Is;
-use Helldar\Support\Traits\Makeable;
+use Helldar\Support\Concerns\Makeable;
+use Helldar\Support\Facades\Helpers\Instance;
+use Helldar\Support\Facades\Helpers\Is;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Validation\ValidationException;
 use Throwable;

src/Wrappers/Resolver.php

@@ -3,8 +3,8 @@
 namespace Helldar\ApiResponse\Wrappers;
 
 use Helldar\ApiResponse\Contracts\Resolver as ResolverContract;
-use Helldar\Support\Facades\Arr;
-use Helldar\Support\Traits\Makeable;
+use Helldar\Support\Concerns\Makeable;
+use Helldar\Support\Facades\Helpers\Arr;
 
 final class Resolver implements ResolverContract
 {

src/Wrappers/Wrapper.php

@@ -5,8 +5,8 @@
 use Helldar\ApiResponse\Contracts\Parseable;
 use Helldar\ApiResponse\Contracts\Resolver;
 use Helldar\ApiResponse\Contracts\Wrapper as WrapperContract;
-use Helldar\Support\Facades\Arr;
-use Helldar\Support\Traits\Makeable;
+use Helldar\Support\Concerns\Makeable;
+use Helldar\Support\Facades\Helpers\Arr;
 
 abstract class Wrapper implements WrapperContract
 {

tests/Fixtures/Concerns/Laravel/Application.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Fixtures\Concerns\Laravel;
 
-use Helldar\Support\Facades\Str;
+use Helldar\Support\Facades\Helpers\Str;
 use Illuminate\Foundation\Application as LaravelApp;
 
 trait Application

tests/Fixtures/Entities/Response.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Fixtures\Entities;
 
-use Helldar\Support\Facades\Instance;
+use Helldar\Support\Facades\Helpers\Instance;
 use Illuminate\Testing\TestResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response as MainResponse;