From fec94eafc222a2699d42bf8aa295201b642dd206 Mon Sep 17 00:00:00 2001
From: dylan_DPC <dylan.dpc@gmail.com>
Date: Fri, 17 Nov 2017 17:21:04 +0530
Subject: [PATCH 1/2] unwanted code removed

---
 src/Illuminate/Http/Resources/Json/Resource.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Illuminate/Http/Resources/Json/Resource.php b/src/Illuminate/Http/Resources/Json/Resource.php
index 6c842f970a37..0de0b10ea69d 100644
--- a/src/Illuminate/Http/Resources/Json/Resource.php
+++ b/src/Illuminate/Http/Resources/Json/Resource.php
@@ -91,12 +91,12 @@ public function resolve($request = null)
             $request = $request ?: Container::getInstance()->make('request')
         );
 
-        if (is_array($data)) {
-            $data = $data;
-        } elseif ($data instanceof Arrayable || $data instanceof Collection) {
-            $data = $data->toArray();
-        } elseif ($data instanceof JsonSerializable) {
-            $data = $data->jsonSerialize();
+        if (! is_array($data)) {
+            if ($data instanceof Arrayable || $data instanceof Collection) {
+                $data = $data->toArray();
+            } elseif ($data instanceof JsonSerializable) {
+                $data = $data->jsonSerialize();
+            }
         }
 
         return $this->filter((array) $data);

From 3ed9a72a982c91fc4a0c274b0edad8be9b75530a Mon Sep 17 00:00:00 2001
From: dylan_DPC <dylan.dpc@gmail.com>
Date: Fri, 17 Nov 2017 22:21:42 +0530
Subject: [PATCH 2/2] if condition removed

---
 src/Illuminate/Http/Resources/Json/Resource.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Illuminate/Http/Resources/Json/Resource.php b/src/Illuminate/Http/Resources/Json/Resource.php
index 0de0b10ea69d..316b26e29e83 100644
--- a/src/Illuminate/Http/Resources/Json/Resource.php
+++ b/src/Illuminate/Http/Resources/Json/Resource.php
@@ -91,12 +91,10 @@ public function resolve($request = null)
             $request = $request ?: Container::getInstance()->make('request')
         );
 
-        if (! is_array($data)) {
-            if ($data instanceof Arrayable || $data instanceof Collection) {
-                $data = $data->toArray();
-            } elseif ($data instanceof JsonSerializable) {
-                $data = $data->jsonSerialize();
-            }
+        if ($data instanceof Arrayable || $data instanceof Collection) {
+            $data = $data->toArray();
+        } elseif ($data instanceof JsonSerializable) {
+            $data = $data->jsonSerialize();
         }
 
         return $this->filter((array) $data);