Merge pull request #746 from simonsolutions/patch-2

Update Deserializes.php Timezone problems
jlevers · Jul 9, 2024 · 286be85 · 286be85
2 parents 40d5bf2 + 5986baa
commit 286be85
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/Traits/Deserializes.php b/src/Traits/Deserializes.php
@@ -5,6 +5,7 @@
 namespace SellingPartnerApi\Traits;
 
 use DateTime;
+use DateTimeZone;
 use DateTimeInterface;
 use ReflectionClass;
 use SellingPartnerApi\Exceptions\InvalidAttributeTypeException;
@@ -121,7 +122,11 @@ protected static function convertValueToDateTime(string $value): DateTime
     {
         foreach (static::$validDatetimeFormats as $validDatetimeFormat) {
             try {
-                $returnValue = DateTime::createFromFormat($validDatetimeFormat, $value);
+                $returnValue = DateTime::createFromFormat(
+                    $validDatetimeFormat, 
+                    $value, 
+                    new DateTimeZone('UTC')
+                );
                 // Only return a valid object, else try again until failure
                 if ($returnValue instanceof DateTimeInterface) {
                     return $returnValue;

diff --git a/tests/SerializationTest.php b/tests/SerializationTest.php
@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+use DateTime;
+use DateTimeZone;
+use DateTimeInterface;
 use PHPUnit\Framework\TestCase;
 use Saloon\Http\Faking\MockClient;
 use Saloon\Http\Faking\MockResponse;
@@ -14,6 +17,7 @@
 use SellingPartnerApi\Seller\ProductPricingV0\Dto\GetItemOffersBatchRequest;
 use SellingPartnerApi\Seller\ProductPricingV0\Dto\ItemOffersRequest;
 use SellingPartnerApi\Seller\ProductPricingV0\Requests\GetItemOffersBatch;
+use SellingPartnerApi\Seller\ProductFeesV0\Responses\GetMyFeesEstimateResponse;
 use SellingPartnerApi\Seller\SellerConnector;
 use SellingPartnerApi\SellingPartnerApi;
 
@@ -164,4 +168,24 @@ public function testDatesInBodyParametersAreSerializedInZuluFormat(): void
 
         $this->assertEquals('2024-01-01T00:00:00Z', $body['packageDetail']['shipDate']);
     }
+
+    public function testDeserializeDateTimeWithTimezone(): void
+    {
+        $now = new DateTime();
+        $now->setTimeZone(new DateTimeZone('+02:00'));
+
+        $result = GetMyFeesEstimateResponse::deserialize([
+            'payload' => [
+                'FeesEstimateResult' => [
+                    'status' => 'Success',
+                    'FeesEstimate' => [
+                        'TimeOfFeesEstimation' => $now->format(DateTimeInterface::ATOM),
+                    ],
+                ],
+            ],
+        ]);
+        $this->assertNotNull($result);
+        $this->assertInstanceOf(DateTimeInterface::class, $result->payload->feesEstimateResult->feesEstimate->timeOfFeesEstimation);
+        $this->assertEquals( (new DateTimeZone('+02:00')), $result->payload->feesEstimateResult->feesEstimate->timeOfFeesEstimation->getTimeZone() );
+    }
 }