Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-85113-analytics-mftf

Author: Joan He

.gitignore

@@ -34,7 +34,6 @@ atlassian*
 /.php_cs.cache
 /grunt-config.json
 /dev/tools/grunt/configs/local-themes.js
-
 /pub/media/*.*
 !/pub/media/.htaccess
 /pub/media/attribute/*

app/code/Magento/Analytics/Api/Data/LinkInterface.php

@@ -6,8 +6,6 @@
 namespace Magento\Analytics\Api\Data;
 
 /**
- * Interface LinkInterface
- *
  * Represents link with collected data and initialized vector for decryption.
  */
 interface LinkInterface

app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php

@@ -9,8 +9,6 @@
 use Magento\Backend\Block\Template\Context;
 
 /**
- * Class SubscriptionStatusLabel.
- *
  * Provides labels for subscription status
  * Status can be reviewed in System Configuration
  */
@@ -22,8 +20,6 @@ class SubscriptionStatusLabel extends \Magento\Config\Block\System\Config\Form\F
     private $subscriptionStatusProvider;
 
     /**
-     * SubscriptionStatusLabel constructor.
-     *
      * @param Context $context
      * @param SubscriptionStatusProvider $labelStatusProvider
      * @param array $data
@@ -59,6 +55,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
      */
     private function prepareLabelValue()
     {
-        return __('Subscription status') . ': ' . __($this->subscriptionStatusProvider->getStatus());
+        return __('Subscription status') . ': ' . $this->subscriptionStatusProvider->getStatus();
     }
 }

app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php

@@ -10,8 +10,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
- * Class SignUp
- *
  * Provides link to BI Essentials signup
  */
 class SignUp extends Action
@@ -28,6 +26,11 @@ class SignUp extends Action
      */
     private $config;
 
+    /**
+     * @inheritdoc
+     */
+    const ADMIN_RESOURCE = 'Magento_Analytics::bi_essentials';
+
     /**
      * @param Context $context
      * @param ScopeConfigInterface $config
@@ -40,16 +43,6 @@ public function __construct(
         parent::__construct($context);
     }
 
-    /**
-     * Check admin permissions for this controller
-     *
-     * @return boolean
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Analytics::bi_essentials');
-    }
-
     /**
      * Provides link to BI Essentials signup
      *

app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

@@ -23,6 +23,11 @@ class Show extends Action
      */
     private $reportUrlProvider;
 
+    /**
+     * @inheritdoc
+     */
+    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+
     /**
      * @param Context $context
      * @param ReportUrlProvider $reportUrlProvider
@@ -35,16 +40,6 @@ public function __construct(
         parent::__construct($context);
     }
 
-    /**
-     * Check admin permissions for this controller.
-     *
-     * @return boolean
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Analytics::analytics_settings');
-    }
-
     /**
      * Redirect to resource with reports.
      *

app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php

@@ -25,6 +25,11 @@ class Retry extends Action
      */
     private $subscriptionHandler;
 
+    /**
+     * @inheritdoc
+     */
+    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+
     /**
      * @param Context $context
      * @param SubscriptionHandler $subscriptionHandler
@@ -37,16 +42,6 @@ public function __construct(
         parent::__construct($context);
     }
 
-    /**
-     * Check admin permissions for this controller
-     *
-     * @return boolean
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Analytics::analytics_settings');
-    }
-
     /**
      * Retry process of subscription.
      *

app/code/Magento/Analytics/Cron/SignUp.php

@@ -12,7 +12,7 @@
 use Magento\Framework\App\Config\Storage\WriterInterface;
 
 /**
- * Class SignUp
+ * Cron class for the Advanced Reporting signup process
  */
 class SignUp
 {

app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php

@@ -8,7 +8,7 @@
 use Magento\Analytics\Model\Connector\Http\ConverterInterface;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\HTTP\Adapter\CurlFactory;
-use Magento\Analytics\Model\Connector\Http\ResponseFactory;
+use Magento\Framework\HTTP\ResponseFactory;
 
 /**
  * A CURL HTTP client.

app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php

@@ -7,6 +7,8 @@
 
 /**
  * Represents converter interface for http request and response body.
+ *
+ * @api
  */
 interface ConverterInterface
 {

app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Analytics\Model\Connector\Http;
 
+use Magento\Framework\Serialize\Serializer\Json;
+
 /**
  * Represents JSON converter for http request and response body.
  */
@@ -15,25 +17,35 @@ class JsonConverter implements ConverterInterface
      */
     const CONTENT_TYPE_HEADER = 'Content-Type: application/json';
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
     /**
      * @param string $body
      *
      * @return array
      */
     public function fromBody($body)
     {
-        $decodedBody = json_decode($body, 1);
+        $decodedBody = $this->serializer->unserialize($body);
         return $decodedBody === null ? [$body] : $decodedBody;
     }
 
-    /**
+    /**c
      * @param array $data
      *
      * @return string
      */
     public function toBody(array $data)
     {
-        return json_encode($data);
+        return $this->serializer->serialize($data);
     }
 
     /**