Fix order of operations in serialization and deserialization

Author: stevebauman

src/Models/ActiveDirectory/Entry.php

@@ -143,7 +143,7 @@ protected function convertAttributesForJson(array $attributes = []): array
         $attributes = parent::convertAttributesForJson($attributes);
 
         // If the model has a SID set, we need to convert it to its
-        // string format, due to it being in binary. Otherwise
+        // string format, due to it being in binary. Otherwise,
         // we will receive a JSON serialization exception.
         if (isset($attributes[$this->sidKey])) {
             $attributes[$this->sidKey] = [$this->getConvertedSid(
@@ -161,15 +161,6 @@ protected function convertAttributesFromJson(array $attributes = []): array
     {
         $attributes = parent::convertAttributesFromJson($attributes);
 
-        // Here we are converting the model's GUID and SID attributes
-        // back to their original values from serialization, so that
-        // their original value may be used and compared against.
-        if (isset($attributes[$this->guidKey])) {
-            $attributes[$this->guidKey] = [$this->getBinaryGuid(
-                Arr::first($attributes[$this->guidKey])
-            )];
-        }
-
         if (isset($attributes[$this->sidKey])) {
             $attributes[$this->sidKey] = [$this->getBinarySid(
                 Arr::first($attributes[$this->sidKey])

src/Models/Concerns/HasAttributes.php

@@ -113,9 +113,9 @@ public function attributesToArray(): array
      */
     public function arrayToOriginal(array $attributes): array
     {
-        return $this->decodeAttributes(
-            $this->convertAttributesFromJson($attributes)
-        );
+        $attributes = $this->decodeAttributes($attributes);
+
+        return $this->convertAttributesFromJson($attributes);
     }
 
     /**
@@ -125,9 +125,9 @@ public function arrayToAttributes(array $attributes): array
     {
         $attributes = $this->restoreDateAttributesFromArray($attributes);
 
-        return $this->decodeAttributes(
-            $this->convertAttributesFromJson($attributes)
-        );
+        $attributes = $this->decodeAttributes($attributes);
+
+        return $this->convertAttributesFromJson($attributes);
     }
 
     /**

src/Models/Model.php

@@ -527,6 +527,15 @@ protected function convertAttributesForJson(array $attributes = []): array
      */
     protected function convertAttributesFromJson(array $attributes = []): array
     {
+        // Here we are converting the model's GUID and SID attributes
+        // back to their original values from serialization, so that
+        // their original value may be used and compared against.
+        if (isset($attributes[$this->guidKey])) {
+            $attributes[$this->guidKey] = [$this->getBinaryGuid(
+                Arr::first($attributes[$this->guidKey])
+            )];
+        }
+
         return $attributes;
     }