MAGETWO-66047: Remove usages of unserialize in module Magento/Framework/App/PageCache

Author: rganin

lib/internal/Magento/Framework/App/PageCache/Identifier.php

@@ -45,6 +45,6 @@ public function getValue()
             $this->request->get(\Magento\Framework\App\Response\Http::COOKIE_VARY_STRING)
                 ?: $this->context->getVaryString()
         ];
-        return md5(serialize($data));
+        return md5(json_encode($data));
     }
 }

lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php

@@ -13,19 +13,29 @@
 
 class IdentifierTest extends \PHPUnit_Framework_TestCase
 {
-    /** Test value for cache vary string */
+    /**
+     * Test value for cache vary string
+     */
     const VARY = '123';
 
-    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
     private $objectManager;
 
-    /** @var Context */
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
     private $contextMock;
 
-    /** @var HttpRequest */
+    /**
+     * @var HttpRequest|\PHPUnit_Framework_MockObject_MockObject
+     */
     private $requestMock;
 
-    /** @var Identifier */
+    /**
+     * @var Identifier
+     */
     private $model;
 
     /**
@@ -48,6 +58,7 @@ protected function setUp()
                 'context' => $this->contextMock,
             ]
         );
+        return parent::setUp();
     }
 
     public function testSecureDifferentiator()
@@ -115,4 +126,35 @@ public function trueFalseDataProvider()
     {
         return [[true], [false]];
     }
+
+    /**
+     * Test get identifier value
+     */
+    public function testGetValue()
+    {
+        $this->requestMock->expects($this->any())
+            ->method('isSecure')
+            ->will($this->returnValue(true));
+
+        $this->requestMock->expects($this->any())
+            ->method('getUriString')
+            ->willReturn('http://example.com/path1/');
+
+        $this->contextMock->expects($this->any())
+            ->method('getVaryString')
+            ->will($this->returnValue(self::VARY));
+
+        $this->assertEquals(
+            md5(
+                json_encode(
+                    [
+                        true,
+                        'http://example.com/path1/',
+                        self::VARY
+                    ]
+                )
+            ),
+            $this->model->getValue()
+        );
+    }
 }