From 4efeb173baf6fbb3f098086ae0bdf470ad4f9ff4 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 17 Oct 2016 18:30:48 -0500
Subject: [PATCH] MAGETWO-59444: Create serializer interface and json class in
 framework

---
 lib/internal/Magento/Framework/Serialize/README.md        | 4 ++--
 .../Magento/Framework/Serialize/SerializerInterface.php   | 8 ++++----
 .../Framework/Serialize/Test/Unit/Serializer/JsonTest.php | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Serialize/README.md b/lib/internal/Magento/Framework/Serialize/README.md
index f724a87bc3b..e636fc79818 100644
--- a/lib/internal/Magento/Framework/Serialize/README.md
+++ b/lib/internal/Magento/Framework/Serialize/README.md
@@ -1,5 +1,5 @@
 # Serialize
 
-**Serialize** provides *SerializerInterface* and a few serializers to support different kinds of needs of serializing/unserializing of data. Here are list of serializers in this library:
+**Serialize** libaray provides *SerializerInterface* and multiple implementations of serializer to support different kinds of needs of serializing/unserializing of data. Here are list of serializers in this library:
 
- * **Json** (recommended) - It can be used to serialize string, integer, float, boolean, or array data to json string; it unserializes json string to string, integer, float, boolean, or array. This is the recommended serializer. 
\ No newline at end of file
+ * **Json** (default) - It can be used to serialize string, integer, float, boolean, or array data to json string; it unserializes json string to string, integer, float, boolean, or array. This is the recommended serializer. 
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Serialize/SerializerInterface.php b/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
index d3c856687f4..1dc70da80f3 100644
--- a/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
+++ b/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
@@ -10,16 +10,16 @@ interface SerializerInterface
     /**
      * Serialize data into string
      *
-     * @param string|integer|float|boolean|array|null $data
-     * @return string|boolean
+     * @param string|int|float|bool|array|null $data
+     * @return string|bool
      */
     public function serialize($data);
 
     /**
-     * Unserialize the given string into data
+     * Unserialize the given string
      *
      * @param string $string
-     * @return string|integer|float|boolean|array|null
+     * @return string|int|float|bool|array|null
      */
     public function unserialize($string);
 }
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
index 1f36b7b729e..38fa7d2a66f 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonTest.php
@@ -22,7 +22,6 @@ class JsonTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @param null|bool|array $value
-     * @param int $objectDecodeType
      * @dataProvider serializeUnserializeDataProvider
      */
     public function testSerializeUnserialize($value)
@@ -37,6 +36,7 @@ class JsonTest extends \PHPUnit_Framework_TestCase
     {
         return [
             [''],
+            ['string'],
             [null],
             [false],
             [['a' => 'b']],
-- 
GitLab