Refactor value setting of UserProperty

Author: Alex Westergaard

src/Helper/AbstractUserProperty.php

@@ -33,13 +33,12 @@ public function toArray(): array
         }
 
         $value = isset($this->value) ? $this->value : null;
-
-        $return[$this->name] = $value;
-
         if (!is_array($value)) {
-            $return[$this->name] = ['value' => $value];
+            $value = ['value' => $value];
         }
 
+        $return[$this->name] = $value;
+
         return $return;
     }