Merge fb19916 into 03fd11a

sanmai · Jun 28, 2019 · be97b1f · be97b1f
2 parents 03fd11a + fb19916
commit be97b1f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "ext-libxml": "*",
         "guzzlehttp/guzzle": "^6.3",
         "psr/log": "^1.0",
-        "sanmai/cdek-sdk-serializer": "^0.1",
+        "sanmai/cdek-sdk-serializer": "^0.1 || ^0.2",
         "sanmai/pipeline": "^0.3.2 || ^2.0 || ^3.0.1"
     },
     "conflict": {},

diff --git a/src/CdekClient.php b/src/CdekClient.php
@@ -206,6 +206,9 @@ public function __call(string $name, array $arguments)
     /**
      * @psalm-suppress InvalidReturnStatement
      * @psalm-suppress InvalidReturnType
+     * @psalm-suppress LessSpecificReturnStatement
+     * @psalm-suppress ArgumentTypeCoercion
+     * @psalm-suppress MoreSpecificReturnType
      *
      * @param Request           $request
      * @param ResponseInterface $response

diff --git a/tests/Serialization/TestCase.php b/tests/Serialization/TestCase.php
@@ -35,6 +35,22 @@ abstract class TestCase extends DeserializationTestCase
 {
     protected function assertSameAsXML(string $xml, $request)
     {
-        $this->assertSame($xml, $this->getSerializer()->serialize($request, Request::SERIALIZATION_XML));
+        $serializedXml = $this->getSerializer()->serialize($request, Request::SERIALIZATION_XML);
+
+        $serializedXml = $this->fixXmlFloats($serializedXml);
+
+        $this->assertSame($xml, $serializedXml);
+    }
+
+    /**
+     * @deprecated remove this method after updating fixtures
+     */
+    private function fixXmlFloats(string $xml): string
+    {
+        if (!\interface_exists('\JMS\Serializer\Naming\AdvancedNamingStrategyInterface')) {
+            return \preg_replace('/([A-Z][a-z]+)="(\d+)\.0"/', '\1="\2"', $xml);
+        }
+
+        return $xml;
     }
 }