Merge pull request #1482 from magento-engcom/2.1-develop-prs

[EngCom] Public Pull Requests - 2.1
 - MAGETWO-72254: Backport PR-9713 for Magento 2.1 - stringify cookie value to fix #5596 #10749

Author: ishakhsuvarov

app/code/Magento/Cookie/Helper/Cookie.php

@@ -69,11 +69,22 @@ public function __construct(
     public function isUserNotAllowSaveCookie()
     {
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
+        return $this->isCookieRestrictionModeEnabled() &&
+            empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
+    }
+
+    /**
+     * Check if cookie restriction mode is enabled for this store
+     *
+     * @return bool
+     */
+    public function isCookieRestrictionModeEnabled()
+    {
         return $this->scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
-        ) && empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
+        );
     }
 
     /**

app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml

@@ -8,7 +8,7 @@
 
 ?>
 <?php /** @var \Magento\Cookie\Block\Html\Notices $block */ ?>
-<?php if ($this->helper('Magento\Cookie\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
+<?php if ($this->helper('Magento\Cookie\Helper\Cookie')->isCookieRestrictionModeEnabled()): ?>
     <div class="message global cookie" id="notice-cookie-block" style="display: none">
         <div class="content">
             <p>

app/code/Magento/Cookie/view/frontend/web/js/notices.js

@@ -20,7 +20,10 @@ define([
             $(this.options.cookieAllowButtonSelector).on('click', $.proxy(function() {
                 var cookieExpires = new Date(new Date().getTime() + this.options.cookieLifetime * 1000);
 
-                $.mage.cookies.set(this.options.cookieName, this.options.cookieValue, {expires: cookieExpires});
+                $.mage.cookies.set(this.options.cookieName, JSON.stringify(this.options.cookieValue), {
+                    expires: cookieExpires
+                });
+
                 if ($.mage.cookies.get(this.options.cookieName)) {
                     window.location.reload();
                 } else {

dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php

@@ -116,7 +116,7 @@ protected function _getAdapter($adapterType)
     {
         try {
             $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-            $adapter = $objectManager->get('Magento\Framework\Image\AdapterFactory')->create($adapterType);
+            $adapter = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create($adapterType);
             return $adapter;
         } catch (\Exception $e) {
             $this->markTestSkipped($e->getMessage());
@@ -547,15 +547,15 @@ public function cropDataProvider()
      */
     public function testCreatePngFromString($pixel1, $expectedColor1, $pixel2, $expectedColor2, $adapterType)
     {
-        if (!function_exists('imagettfbbox')) {
-            $this->markTestSkipped('Workaround of problem with imagettfbbox function on Travis');
+        if (!function_exists('imagettfbbox') || (getenv('TRAVIS'))) {
+            $this->markTestSkipped('Workaround for problem with imagettfbbox() function on Travis');
         }
 
         $adapter = $this->_getAdapter($adapterType);
 
         /** @var \Magento\Framework\Filesystem\Directory\ReadFactory readFactory */
         $readFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Filesystem\Directory\ReadFactory'
+            \Magento\Framework\Filesystem\Directory\ReadFactory::class
         );
         $reader = $readFactory->create(BP);
         $path = $reader->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf');
@@ -611,7 +611,7 @@ public function createPngFromStringDataProvider()
     public function testValidateUploadFile()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $imageAdapter = $objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
+        $imageAdapter = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create();
         $this->assertTrue($imageAdapter->validateUploadFile($this->_getFixture('magento_thumbnail.jpg')));
     }
 
@@ -621,7 +621,7 @@ public function testValidateUploadFile()
     public function testValidateUploadFileException()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $imageAdapter = $objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
+        $imageAdapter = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create();
         $imageAdapter->validateUploadFile(__FILE__);
     }
 }