Merge pull request #34 from tg-bot-api/bugfix/33

Bugfix/33

Author: greenplugin

CHANGELOG.md

@@ -22,6 +22,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 ### Security
 - Nothing
 --->
+
+## 1.5.1 - 2020-05-28
+
+### Fixed
+- fixed SendInvoiceMethod normalization #33.
+
 ## 1.5.0 - 2020-04-24
 
 #### April 24, 2020

src/BotApiNormalizer.php

@@ -16,6 +16,7 @@
 use TgBotApi\BotApiBase\Normalizer\EditMessageResponseNormalizer;
 use TgBotApi\BotApiBase\Normalizer\InputFileNormalizer;
 use TgBotApi\BotApiBase\Normalizer\InputMediaNormalizer;
+use TgBotApi\BotApiBase\Normalizer\InvoiceNormalizer;
 use TgBotApi\BotApiBase\Normalizer\JsonSerializableNormalizer;
 use TgBotApi\BotApiBase\Normalizer\LegacyObjectNormalizerWrapper;
 use TgBotApi\BotApiBase\Normalizer\MediaGroupNormalizer;
@@ -76,6 +77,7 @@ public function normalize($method): BotApiRequestInterface
 
         $serializer = new Serializer([
             new PollNormalizer($objectNormalizer),
+            new InvoiceNormalizer($objectNormalizer),
             new SetMyCommandsNormalizer($objectNormalizer),
             new InputFileNormalizer($files),
             new MediaGroupNormalizer(new InputMediaNormalizer($objectNormalizer, $files), $objectNormalizer),

src/Normalizer/InvoiceNormalizer.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TgBotApi\BotApiBase\Normalizer;
+
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Serializer;
+use TgBotApi\BotApiBase\Method\SendInvoiceMethod;
+
+class InvoiceNormalizer implements NormalizerInterface
+{
+    /**
+     * @var NormalizerInterface
+     */
+    private $objectNormalizer;
+
+    /**
+     * JsonSerializableNormalizer constructor.
+     */
+    public function __construct(NormalizerInterface $objectNormalizer)
+    {
+        $this->objectNormalizer = $objectNormalizer;
+    }
+
+    /**
+     * @param SendInvoiceMethod $topic
+     * @param null              $format
+     *
+     * @throws ExceptionInterface
+     *
+     * @return array|bool|false|float|int|string
+     */
+    public function normalize($topic, $format = null, array $context = [])
+    {
+        $serializer = new Serializer([
+            new JsonSerializableNormalizer($this->objectNormalizer),
+            $this->objectNormalizer,
+        ]);
+
+        $topic->prices = \json_encode($serializer->normalize($topic->prices, null, ['skip_null_values' => true]));
+
+        return $serializer->normalize($topic, null, ['skip_null_values' => true]);
+    }
+
+    /**
+     * @param mixed $data
+     * @param null  $format
+     */
+    public function supportsNormalization($data, $format = null): bool
+    {
+        return $data instanceof SendInvoiceMethod;
+    }
+}

tests/Method/SendInvoiceMethodTest.php

@@ -23,9 +23,6 @@ public function testEncode()
         $this->getApi()->send($this->getMethod());
     }
 
-    /**
-     * @return BotApiComplete
-     */
     private function getApi(): BotApiComplete
     {
         return $this->getBot('sendInvoice', [
@@ -52,13 +49,11 @@ private function getApi(): BotApiComplete
             'disable_notification' => true,
             'reply_to_message_id' => 1,
             'reply_markup' => $this->buildInlineMarkupArray(),
-        ], [], ['reply_markup']);
+        ], [], ['reply_markup', 'prices']);
     }
 
     /**
      * @throws \TgBotApi\BotApiBase\Exception\BadArgumentException
-     *
-     * @return SendInvoiceMethod
      */
     private function getMethod(): SendInvoiceMethod
     {