Merge all JS attributes of Address into Location

Author: jissereitsma

Location/Address.php

@@ -243,7 +243,7 @@ public function getVatId(): string
 
     public function getAttributes(): array
     {
-        $attributes = [
+        return [
             'street' => $this->getStreet(),
             'houseNumber' => $this->getHouseNumber(),
             'houseNumberAddition' => $this->getHouseNumberAddition(),
@@ -266,8 +266,6 @@ public function getAttributes(): array
             'addressLine' => $this->getAddressLine(),
             'addressHtml' => $this->getAddressHtml(),
         ];
-
-        return $attributes;
     }
 
     #[\ReturnTypeWillChange]

Location/Location.php

@@ -65,7 +65,7 @@ public function getValue(): array
     public function getAttributes(): array
     {
         $attributes = [
-            'address' => $this->getAddress(),
+            ...$this->getAddress()->getAttributes(),
             'id' => $this->getId(),
             'label' => $this->getLabel(),
             'value' => $this->getValue(),