fix(export): export addresses consistently (#502)

* fix(export): export addresses consistently

* fix(export): export addresses consistently

Author: joerivanveen

src/Model/Consignment/AbstractConsignment.php

@@ -1168,17 +1168,6 @@ public function setBoxNumber(?string $boxNumber): self
      */
     public function encodeStreet(array $consignmentEncoded): array
     {
-        if ($this->getCountry() === self::CC_NL) {
-            return array_merge_recursive($consignmentEncoded, [
-                'recipient' => [
-                    'street'                 => $this->getStreet(true),
-                    'street_additional_info' => $this->getStreetAdditionalInfo(),
-                    'number'                 => $this->getNumber(),
-                    'number_suffix'          => (string) $this->getNumberSuffix(),
-                ],
-            ]);
-        }
-
         $consignmentEncoded['recipient']['street']                 = $this->getFullStreet(true);
         $consignmentEncoded['recipient']['street_additional_info'] = $this->getStreetAdditionalInfo();
 

src/Model/Consignment/BpostConsignment.php

@@ -44,30 +44,6 @@ class BpostConsignment extends AbstractConsignment
      */
     protected $validatorClass = BpostConsignmentValidator::class;
 
-    /**
-     * @param  array $consignmentEncoded
-     *
-     * @return array
-     * @throws \MyParcelNL\Sdk\src\Exception\MissingFieldException
-     */
-    public function encodeStreet(array $consignmentEncoded): array
-    {
-        if (self::CC_BE === $this->getCountry()) {
-            return array_merge_recursive($consignmentEncoded, [
-                'recipient' => [
-                    'street'                 => $this->getStreet(true),
-                    'street_additional_info' => $this->getStreetAdditionalInfo(),
-                    'number'                 => $this->getNumber(),
-                    'box_number'             => (string) $this->getBoxNumber(),
-                    'number_suffix'          => (string) $this->getNumberSuffix(),
-                ],
-            ]);
-        }
-
-        return parent::encodeStreet($consignmentEncoded);
-    }
-
-
     /**
      * @return string
      */

src/Model/Consignment/DPDConsignment.php

@@ -50,28 +50,6 @@ public function getAllowedPackageTypes(): array
         ];
     }
 
-    /**
-     * @param  array $consignmentEncoded
-     *
-     * @return array
-     * @throws \MyParcelNL\Sdk\src\Exception\MissingFieldException
-     */
-    public function encodeStreet(array $consignmentEncoded): array
-    {
-        if (self::CC_BE === $this->getCountry()) {
-            return array_merge_recursive($consignmentEncoded, [
-                'recipient' => [
-                    'street'                 => $this->getStreet(true),
-                    'street_additional_info' => $this->getStreetAdditionalInfo(),
-                    'number'                 => $this->getNumber(),
-                    'box_number'             => (string) $this->getBoxNumber(),
-                ],
-            ]);
-        }
-
-        return parent::encodeStreet($consignmentEncoded);
-    }
-
     /**
      * @return string
      */