fix: options were wrongly filled

Author: kouinkouin

src/Bpost/Order/Box/AtIntlPugo.php

@@ -2,10 +2,10 @@
 namespace Bpost\BpostApiClient\Bpost\Order\Box;
 
 use Bpost\BpostApiClient\Bpost\Order\Box\National\ShopHandlingInstruction;
+use Bpost\BpostApiClient\Bpost\Order\Box\Option\Messaging;
 use Bpost\BpostApiClient\Bpost\Order\PugoAddress;
 use Bpost\BpostApiClient\Bpost\Order\Receiver;
 use Bpost\BpostApiClient\Bpost\ProductConfiguration\Product;
-use Bpost\BpostApiClient\Bpost\Order\Box\Option\Messaging;
 use Bpost\BpostApiClient\Exception\BpostLogicException\BpostInvalidValueException;
 use Bpost\BpostApiClient\Exception\BpostNotImplementedException;
 
@@ -266,7 +266,8 @@ public static function createFromXML(\SimpleXMLElement $xml)
                 ) {
                     $option = Messaging::createFromXML($optionData);
                 } else {
-                    $className = '\\Bpost\\BpostApiClient\\Bpost\\Order\\Box\\Option\\' . ucfirst($optionData->getName());
+                    $className = '\\Bpost\\BpostApiClient\\Bpost\\Order\\Box\\Option\\'
+                        . ucfirst($optionData->getName());
                     if (!method_exists($className, 'createFromXML')) {
                         throw new BpostNotImplementedException();
                     }

src/Bpost/Order/Box/Option/Messaging.php

@@ -236,11 +236,12 @@ public static function createFromXML(SimpleXMLElement $xml)
     {
         $messaging = new Messaging($xml->getName(), (string) $xml->attributes()->language);
 
-        if ((string) $xml->emailAddress !== '') {
-            $messaging->setEmailAddress((string) $xml->emailAddress);
+        $children = $xml->children('http://schema.post.be/shm/deepintegration/v3/common');
+        if ((string) $children->emailAddress !== '') {
+            $messaging->setEmailAddress((string) $children->emailAddress);
         }
-        if ((string) $xml->mobilePhone !== '') {
-            $messaging->setMobilePhone((string) $xml->mobilePhone);
+        if ((string) $children->mobilePhone !== '') {
+            $messaging->setMobilePhone((string) $children->mobilePhone);
         }
 
         return $messaging;

tests/BpostApiExamples/FetchOrder/AtIntlPugoTest.php

@@ -40,6 +40,7 @@ private function getXmlFromBpost()
                 <ns4:options>
                     <ns2:keepMeInformed language="FR">
                         <ns2:emailAddress>esolutions@bpost.be</ns2:emailAddress>
+                        <ns2:mobilePhone>0470000000</ns2:mobilePhone>
                     </ns2:keepMeInformed>
                 </ns4:options>
                 <ns4:receiver>
@@ -104,7 +105,6 @@ public function testCreateFromXml()
         $this->assertSame(11000, $internationalBox->getParcelWeight());
         $this->assertCount(0, $internationalBox->getParcelContents());
         $this->assertNotNull($internationalBox->getReceiver());
-        $this->assertCount(1, $internationalBox->getOptions());
 
         $receiver = $internationalBox->getReceiver();
 
@@ -119,12 +119,11 @@ public function testCreateFromXml()
         $this->assertSame('FR', $receiver->getAddress()->getCountryCode());
 
         $this->assertCount(1, $internationalBox->getOptions());
-
         $optionMessaging = current($internationalBox->getOptions());
         $this->assertInstanceOf('Bpost\BpostApiClient\Bpost\Order\Box\Option\Messaging', $optionMessaging);
         $this->assertSame(Box\Option\Messaging::MESSAGING_TYPE_KEEP_ME_INFORMED, $optionMessaging->getType());
         $this->assertSame(Box\Option\Messaging::MESSAGING_LANGUAGE_FR, $optionMessaging->getLanguage());
-        $this->assertNull($optionMessaging->getMobilePhone());
+        $this->assertSame('0470000000', $optionMessaging->getMobilePhone());
         $this->assertSame('esolutions@bpost.be', $optionMessaging->getEmailAddress());
     }
 }