Merge f00e2e8 into efd9696

sanmai · Sep 5, 2019 · 9bc93fe · 9bc93fe
2 parents efd9696 + f00e2e8
commit 9bc93fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4snapshot
 env:
   - GROUP=default
 

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "ext-SimpleXML": "*",
         "ext-json": "*",
         "ext-libxml": "*",
-        "jms/serializer": "^3.0.1"
+        "jms/serializer": "^3.2"
     },
     "conflict": {},
     "require-dev": {

diff --git a/src/Serialization/Serializer.php b/src/Serialization/Serializer.php
@@ -161,7 +161,7 @@ private function getLastSeenSimpleXMLElement(): \SimpleXMLElement
      * @see \JMS\Serializer\SerializerInterface::serialize()
      * @psalm-suppress MoreSpecificImplementedParamType
      *
-     * {@inheritdoc}
+     * @param mixed $data
      */
     public function serialize($data, string $format, SerializationContext $context = null, string $type = null): string
     {
@@ -171,8 +171,6 @@ public function serialize($data, string $format, SerializationContext $context =
     /**
      * @see \JMS\Serializer\SerializerInterface::deserialize()
      * @psalm-suppress MoreSpecificImplementedParamType
-     *
-     * {@inheritdoc}
      */
     public function deserialize(string $data, string $type, string $format, DeserializationContext $context = null)
     {