From db4d1dbaf9bd472f5da0ff37aa90eb0c3751f342 Mon Sep 17 00:00:00 2001
From: Khan M Rashedun-Naby <naby88@gmail.com>
Date: Fri, 27 Apr 2018 00:14:59 +0600
Subject: [PATCH 1/4] get and has method else removed

---
 src/Illuminate/Support/Arr.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
index 616c030c5fe3..01ea32aaa15b 100755
--- a/src/Illuminate/Support/Arr.php
+++ b/src/Illuminate/Support/Arr.php
@@ -294,11 +294,11 @@ public static function get($array, $key, $default = null)
         }
 
         foreach (explode('.', $key) as $segment) {
-            if (static::accessible($array) && static::exists($array, $segment)) {
-                $array = $array[$segment];
-            } else {
-                return value($default);
+            if (!static::accessible($array) && !static::exists($array, $segment)) {
+	            return value($default);
             }
+
+	        $array = $array[$segment];
         }
 
         return $array;
@@ -335,11 +335,11 @@ public static function has($array, $keys)
             }
 
             foreach (explode('.', $key) as $segment) {
-                if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) {
-                    $subKeyArray = $subKeyArray[$segment];
-                } else {
-                    return false;
+                if (!static::accessible($subKeyArray) && !static::exists($subKeyArray, $segment)) {
+	                return false;
                 }
+
+	            $subKeyArray = $subKeyArray[$segment];
             }
         }
 

From c59227c306bb90c27fca59cacabf44c261b4479e Mon Sep 17 00:00:00 2001
From: Khan M Rashedun-Naby <naby88@gmail.com>
Date: Fri, 27 Apr 2018 09:18:28 +0600
Subject: [PATCH 2/4] Condition Fix

---
 src/Illuminate/Support/Arr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
index 01ea32aaa15b..8e988289e485 100755
--- a/src/Illuminate/Support/Arr.php
+++ b/src/Illuminate/Support/Arr.php
@@ -294,7 +294,7 @@ public static function get($array, $key, $default = null)
         }
 
         foreach (explode('.', $key) as $segment) {
-            if (!static::accessible($array) && !static::exists($array, $segment)) {
+            if (!static::accessible($array) || !static::exists($array, $segment)) {
 	            return value($default);
             }
 
@@ -335,7 +335,7 @@ public static function has($array, $keys)
             }
 
             foreach (explode('.', $key) as $segment) {
-                if (!static::accessible($subKeyArray) && !static::exists($subKeyArray, $segment)) {
+                if (!static::accessible($subKeyArray) || !static::exists($subKeyArray, $segment)) {
 	                return false;
                 }
 

From 75230c46f1e760288d48a3e70c84b6efd31a8442 Mon Sep 17 00:00:00 2001
From: Khan M Rashedun-Naby <naby88@gmail.com>
Date: Fri, 27 Apr 2018 13:26:44 +0600
Subject: [PATCH 3/4] Conditions positions inverted

---
 src/Illuminate/Support/Arr.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
index 8e988289e485..99910b4b87ae 100755
--- a/src/Illuminate/Support/Arr.php
+++ b/src/Illuminate/Support/Arr.php
@@ -294,7 +294,10 @@ public static function get($array, $key, $default = null)
         }
 
         foreach (explode('.', $key) as $segment) {
-            if (!static::accessible($array) || !static::exists($array, $segment)) {
+            if (
+            	!static::exists($array, $segment)
+	            || !static::accessible($array)
+            ) {
 	            return value($default);
             }
 
@@ -335,7 +338,10 @@ public static function has($array, $keys)
             }
 
             foreach (explode('.', $key) as $segment) {
-                if (!static::accessible($subKeyArray) || !static::exists($subKeyArray, $segment)) {
+                if (
+                	!static::exists($subKeyArray, $segment)
+	                || !static::accessible($subKeyArray)
+                ) {
 	                return false;
                 }
 

From 27d5f0aa3203dc2eb473a9ee6c307ec7489fe9f8 Mon Sep 17 00:00:00 2001
From: Khan M Rashedun-Naby <naby88@gmail.com>
Date: Fri, 27 Apr 2018 14:41:17 +0600
Subject: [PATCH 4/4] I forgot to test the changes.

---
 src/Illuminate/Support/Arr.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
index 99910b4b87ae..8e988289e485 100755
--- a/src/Illuminate/Support/Arr.php
+++ b/src/Illuminate/Support/Arr.php
@@ -294,10 +294,7 @@ public static function get($array, $key, $default = null)
         }
 
         foreach (explode('.', $key) as $segment) {
-            if (
-            	!static::exists($array, $segment)
-	            || !static::accessible($array)
-            ) {
+            if (!static::accessible($array) || !static::exists($array, $segment)) {
 	            return value($default);
             }
 
@@ -338,10 +335,7 @@ public static function has($array, $keys)
             }
 
             foreach (explode('.', $key) as $segment) {
-                if (
-                	!static::exists($subKeyArray, $segment)
-	                || !static::accessible($subKeyArray)
-                ) {
+                if (!static::accessible($subKeyArray) || !static::exists($subKeyArray, $segment)) {
 	                return false;
                 }