Fixed status type overriding

Author: Andrey Helldar

src/Services/Response.php

@@ -26,7 +26,7 @@ final class Response
     /** @var int */
     protected $status_code = 200;
 
-    /** @var string */
+    /** @var string|null */
     protected $status_type;
 
     /**
@@ -37,28 +37,33 @@ public static function init(): self
         return new self();
     }
 
+    public function exception(string $status_type = null): self
+    {
+        $this->status_type = $status_type;
+
+        return $this;
+    }
+
     /**
      * @param  mixed  $data
      * @param  int  $status_code
      * @param  bool  $use_data
-     * @param  string|null  $exception
      *
      * @throws \ReflectionException
      *
      * @return $this
      */
-    public function data($data = null, int $status_code = 200, bool $use_data = true, string $exception = BaseException::class): self
+    public function data($data = null, int $status_code = 200, bool $use_data = true): self
     {
         $this->use_data    = $use_data;
         $this->status_code = $status_code;
 
         if (Exception::isError($data)) {
             $this->status_code = Exception::getCode($data, $status_code);
-            $this->status_type = Exception::getType($data, $exception);
+            $this->status_type = Exception::getType($data, $this->status_type);
             $this->data        = Exception::getData($data);
         } else {
-            $this->status_type = Instance::basename($exception);
-            $this->data        = ResponseSupport::get($data);
+            $this->data = ResponseSupport::get($data);
         }
 
         return $this;
@@ -112,6 +117,13 @@ protected function e($value = null, $doubleEncode = true)
             : null;
     }
 
+    protected function getStatusType(): string
+    {
+        return Instance::basename(
+            $this->status_type ?: BaseException::class
+        );
+    }
+
     protected function getData()
     {
         $this->splitData();
@@ -127,7 +139,7 @@ protected function getErrorData(): array
     {
         return [
             'error' => [
-                'type' => $this->status_type,
+                'type' => $this->getStatusType(),
                 'data' => $this->e($this->data),
             ],
         ];

src/Support/Exception.php

@@ -56,7 +56,7 @@ public static function getCode($value, int $status_code = 400): int
 
     public static function getType(Throwable $class, string $exception = null): string
     {
-        return Instance::basename($exception ?: $class);
+        return $exception ?: Instance::classname($class);
     }
 
     public static function getData($exception)

src/Support/Instance.php

@@ -48,11 +48,16 @@ public static function of($haystack, $needles): bool
      */
     public static function basename($class): string
     {
-        $class = static::isObject($class) ? get_class($class) : $class;
+        $class = static::classname($class);
 
         return basename(str_replace('\\', '/', $class));
     }
 
+    public static function classname($class): string
+    {
+        return static::isObject($class) ? get_class($class) : $class;
+    }
+
     /**
      * @param  Throwable  $object
      * @param  string  $method

src/helpers.php

@@ -25,7 +25,8 @@ function api_response(
     string $exception = null
 ) {
     return Response::init()
-        ->data($data, $status_code, $use_data, $exception)
+        ->exception($exception)
+        ->data($data, $status_code, $use_data)
         ->with($with)
         ->headers($headers)
         ->response();