Merge pull request #40 from tg-bot-api/bugfix/39-fix-normalization

Bugfix/39 fix normalization
tg-bot-api · Jul 13, 2020 · 1c867d9 · 1c867d9
2 parents fdd4b3f + e3032cd
commit 1c867d9
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Nothing
 --->
 
+## 1.6.2 - 2020-07-13
+
+### Fixed
+- fixed EditMessageMediaMethod normalization (#33).
+
+
 ## 1.6.1 - 2020-07-03
 
 ### Fixed

diff --git a/src/BotApiNormalizer.php b/src/BotApiNormalizer.php
@@ -13,6 +13,7 @@
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use TgBotApi\BotApiBase\Normalizer\AnswerInlineQueryNormalizer;
+use TgBotApi\BotApiBase\Normalizer\EditMessageMediaNormalizer;
 use TgBotApi\BotApiBase\Normalizer\EditMessageResponseNormalizer;
 use TgBotApi\BotApiBase\Normalizer\InputFileNormalizer;
 use TgBotApi\BotApiBase\Normalizer\InputMediaNormalizer;
@@ -81,6 +82,7 @@ public function normalize($method): BotApiRequestInterface
             new SetMyCommandsNormalizer($objectNormalizer),
             new InputFileNormalizer($files),
             new MediaGroupNormalizer(new InputMediaNormalizer($objectNormalizer, $files), $objectNormalizer),
+            new EditMessageMediaNormalizer(new InputMediaNormalizer($objectNormalizer, $files), $objectNormalizer),
             new JsonSerializableNormalizer($objectNormalizer),
             new AnswerInlineQueryNormalizer($objectNormalizer),
             new DateTimeNormalizer(),

diff --git a/src/Normalizer/EditMessageMediaNormalizer.php b/src/Normalizer/EditMessageMediaNormalizer.php
@@ -0,0 +1,67 @@
+<?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\EditMessageMediaMethod;
+
+/**
+ * Class MediaGroupNormalizer.
+ */
+class EditMessageMediaNormalizer implements NormalizerInterface
+{
+    /**
+     * @var InputMediaNormalizer
+     */
+    private $inputMediaNormalizer;
+    /**
+     * @var NormalizerInterface
+     */
+    private $objectNormalizer;
+
+    /**
+     * MediaGroupNormalizer constructor.
+     */
+    public function __construct(
+        InputMediaNormalizer $inputMediaNormalizer,
+        NormalizerInterface $objectNormalizer
+    ) {
+        $this->inputMediaNormalizer = $inputMediaNormalizer;
+        $this->objectNormalizer = $objectNormalizer;
+    }
+
+    /**
+     * @param EditMessageMediaMethod $topic
+     * @param null                   $format
+     *
+     * @throws ExceptionInterface
+     *
+     * @return array|bool|float|int|mixed|string
+     */
+    public function normalize($topic, $format = null, array $context = [])
+    {
+        $serializer = new Serializer([
+            $this->inputMediaNormalizer,
+            new JsonSerializableNormalizer($this->objectNormalizer),
+            $this->objectNormalizer,
+        ]);
+        $topic->media = \json_encode($serializer->normalize($topic->media, null, ['skip_null_values' => true]));
+
+        $topic->replyMarkup = $serializer->normalize($topic->replyMarkup, 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 EditMessageMediaMethod;
+    }
+}
diff --git a/src/Normalizer/InputMediaNormalizer.php b/src/Normalizer/InputMediaNormalizer.php
@@ -8,8 +8,7 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer;
 use TgBotApi\BotApiBase\Type\InputFileType;
-use TgBotApi\BotApiBase\Type\InputMedia\InputMediaPhotoType;
-use TgBotApi\BotApiBase\Type\InputMedia\InputMediaVideoType;
+use TgBotApi\BotApiBase\Type\InputMedia\InputMediaType;
 
 /**
  * Class InputMediaNormalizer.
@@ -28,7 +27,6 @@ class InputMediaNormalizer implements NormalizerInterface
     /**
      * InputMediaNormalizer constructor.
      *
-     * @param NormalizerInterface $objectNormalizer
      * @param $files
      */
     public function __construct(NormalizerInterface $objectNormalizer, &$files)
@@ -38,9 +36,8 @@ public function __construct(NormalizerInterface $objectNormalizer, &$files)
     }
 
     /**
-     * @param mixed $topic
-     * @param null  $format
-     * @param array $context
+     * @param InputMediaType $topic
+     * @param null           $format
      *
      * @throws ExceptionInterface
      *
@@ -68,12 +65,9 @@ public function normalize($topic, $format = null, array $context = [])
     /**
      * @param mixed $data
      * @param null  $format
-     *
-     * @return bool
      */
     public function supportsNormalization($data, $format = null): bool
     {
-        return $data instanceof InputMediaPhotoType ||
-            $data instanceof InputMediaVideoType;
+        return $data instanceof InputMediaType;
     }
 }
diff --git a/src/Normalizer/JsonSerializableNormalizer.php b/src/Normalizer/JsonSerializableNormalizer.php
@@ -25,8 +25,6 @@ class JsonSerializableNormalizer implements NormalizerInterface
 
     /**
      * JsonSerializableNormalizer constructor.
-     *
-     * @param NormalizerInterface $objectNormalizer
      */
     public function __construct(NormalizerInterface $objectNormalizer)
     {
@@ -36,11 +34,10 @@ public function __construct(NormalizerInterface $objectNormalizer)
     /**
      * @param mixed $topic
      * @param null  $format
-     * @param array $context
      *
      * @throws ExceptionInterface
      *
-     * @return array|bool|false|float|int|string
+     * @return string
      */
     public function normalize($topic, $format = null, array $context = [])
     {
@@ -52,8 +49,6 @@ public function normalize($topic, $format = null, array $context = [])
     /**
      * @param mixed $data
      * @param null  $format
-     *
-     * @return bool
      */
     public function supportsNormalization($data, $format = null): bool
     {

diff --git a/tests/Method/EditMessageMediaMethodTest.php b/tests/Method/EditMessageMediaMethodTest.php
@@ -159,18 +159,15 @@ public function testEncodeMediaAnimation()
     }
 
     /**
-     * @param array                  $excepted
-     * @param EditMessageMediaMethod $actual
-     *
      * @throws \TgBotApi\BotApiBase\Exception\ResponseException
      */
     private function queryApi(array $excepted, EditMessageMediaMethod $actual)
     {
         $this->getBotWithFiles(
             'editMessageMedia',
             $excepted,
-            ['media' => ['thumb' => true, 'media' => true]],
-            ['reply_markup'],
+            ['media' => ['media' => true, 'thumb' => true]],
+            ['media', 'reply_markup'],
             true
         )->editMessageMedia($actual);
     }