accounting for empty content (#64)

* accounting for empty content * accounting for empty content * feat: fixing format Array * feat: fixing format Array --------- Co-authored-by: fernando <[email protected]>
specialtactics · May 14, 2023 · 3cf58a5 · 3cf58a5
1 parent 470d444
commit 3cf58a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Http/Controllers/Features/RestfulControllerTrait.php b/src/Http/Controllers/Features/RestfulControllerTrait.php
@@ -113,7 +113,7 @@ protected function shouldTransform()
     protected function prependResponseMessage($response, $message)
     {
         $content = $response->getOriginalContent();
-        $content['message'] = $message . $content['message'];
+        $content['message'] = $message . \Illuminate\Support\Arr::get($content, 'message', '');
         $response->setContent($content);
 
         return $response;

diff --git a/src/Http/Response/Format/Json.php b/src/Http/Response/Format/Json.php
@@ -2,6 +2,7 @@
 
 namespace Specialtactics\L5Api\Http\Response\Format;
 
+use Illuminate\Support\Collection;
 use Specialtactics\L5Api\APIBoilerplate;
 
 class Json extends \Dingo\Api\Http\Response\Format\Json
@@ -14,6 +15,10 @@ class Json extends \Dingo\Api\Http\Response\Format\Json
      */
     public function formatArray($content)
     {
+        if ($content instanceof Collection) {
+            $content = $content->toArray();
+        }
+
         if (array_key_exists('meta', $content) && is_array($content['meta'])) {
             // Change key-case of meta
             $content['meta'] = APIBoilerplate::formatKeyCaseAccordingToResponseFormat($content['meta']);