Merge pull request #22 from tg-bot-api/bugfix/21-pool-normalization-bug

Bugfix/21 pool normalization bug

Author: greenplugin

CHANGELOG.md

@@ -23,6 +23,11 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Nothing
 --->
 
+## 1.3.2 - 2020-02-26
+
+### Fixed
+- fixed Poll normalization bug #21.
+
 ## 1.3.1 - 2020-01-30
 
 ### Fixed

src/BotApiNormalizer.php

@@ -19,6 +19,7 @@
 use TgBotApi\BotApiBase\Normalizer\JsonSerializableNormalizer;
 use TgBotApi\BotApiBase\Normalizer\LegacyObjectNormalizerWrapper;
 use TgBotApi\BotApiBase\Normalizer\MediaGroupNormalizer;
+use TgBotApi\BotApiBase\Normalizer\PollNormalizer;
 use TgBotApi\BotApiBase\Normalizer\UserProfilePhotosNormalizer;
 
 /**
@@ -73,6 +74,7 @@ public function normalize($method): BotApiRequestInterface
         }
 
         $serializer = new Serializer([
+            new PollNormalizer($objectNormalizer),
             new InputFileNormalizer($files),
             new MediaGroupNormalizer(new InputMediaNormalizer($objectNormalizer, $files), $objectNormalizer),
             new JsonSerializableNormalizer($objectNormalizer),

src/Normalizer/PollNormalizer.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\SendPollMethod;
+
+class PollNormalizer implements NormalizerInterface
+{
+    /**
+     * @var NormalizerInterface
+     */
+    private $objectNormalizer;
+
+    /**
+     * JsonSerializableNormalizer constructor.
+     */
+    public function __construct(NormalizerInterface $objectNormalizer)
+    {
+        $this->objectNormalizer = $objectNormalizer;
+    }
+
+    /**
+     * @param mixed $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->options = \json_encode($topic->options);
+
+        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 SendPollMethod;
+    }
+}

tests/Method/SendPollMethodTest.php

@@ -18,15 +18,12 @@ public function testEncode()
         $this->getApi()->sendPoll($this->getMethod());
     }
 
-    /**
-     * @return BotApiComplete
-     */
     private function getApi(): BotApiComplete
     {
         return $this->getBot('sendPoll', [
             'chat_id' => 'chat_id',
             'question' => 'poll_question',
-            'options' => ['q1', 'q2'],
+            'options' => '["q1","q2"]',
             'disable_notification' => true,
             'reply_to_message_id' => 1,
             'reply_markup' => '{"inline_keyboard":[]}',