Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-62168

Author: slopukhov

.gitignore

@@ -28,6 +28,7 @@ atlassian*
 
 /pub/media/*.*
 !/pub/media/.htaccess
+/pub/media/analytics/*
 /pub/media/catalog/*
 !/pub/media/catalog/.htaccess
 /pub/media/customer/*

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

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Api\Data;
+
+/**
+ * Interface LinkInterface
+ *
+ * Represents link with collected data and initialized vector for decryption.
+ */
+interface LinkInterface
+{
+    /**
+     * @return string
+     */
+    public function getUrl();
+
+    /**
+     * @return string
+     */
+    public function getInitializationVector();
+
+    /**
+     * @param string $url
+     * @return void
+     */
+    public function setUrl($url);
+
+    /**
+     * @param string $initializationVector
+     * @return void
+     */
+    public function setInitializationVector($initializationVector);
+}

app/code/Magento/Analytics/Api/LinkProviderInterface.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Api;
+
+/**
+ * Provides link to file with collected report data.
+ */
+interface LinkProviderInterface
+{
+    /**
+     * @return \Magento\Analytics\Api\Data\LinkInterface
+     */
+    public function get();
+}

app/code/Magento/Analytics/Controller/Adminhtml/Export/Example.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Cron;
+
+use Magento\Analytics\Model\ExportDataHandler;
+use Magento\Analytics\Model\SubscriptionStatusProvider;
+
+/**
+ * Cron for data collection by a schedule for MBI.
+ */
+class CollectData
+{
+    /**
+     * Resource for the handling of a new data collection.
+     *
+     * @var ExportDataHandler
+     */
+    private $exportDataHandler;
+
+    /**
+     * Resource which provides a status of subscription.
+     *
+     * @var SubscriptionStatusProvider
+     */
+    private $subscriptionStatus;
+
+    /**
+     * @param ExportDataHandler $exportDataHandler
+     * @param SubscriptionStatusProvider $subscriptionStatus
+     */
+    public function __construct(
+        ExportDataHandler $exportDataHandler,
+        SubscriptionStatusProvider $subscriptionStatus
+    ) {
+        $this->exportDataHandler = $exportDataHandler;
+        $this->subscriptionStatus = $subscriptionStatus;
+    }
+
+    /**
+     * @return bool
+     */
+    public function execute()
+    {
+        if ($this->subscriptionStatus->getStatus() === SubscriptionStatusProvider::ENABLED) {
+            $this->exportDataHandler->prepareExportData();
+        }
+
+        return true;
+    }
+}

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

@@ -5,7 +5,7 @@
  */
 namespace Magento\Analytics\Cron;
 
-use Magento\Analytics\Model\AnalyticsConnector;
+use Magento\Analytics\Model\Connector;
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
@@ -19,9 +19,9 @@
 class SignUp
 {
     /**
-     * @var AnalyticsConnector
+     * @var Connector
      */
-    private $analyticsConnector;
+    private $connector;
 
     /**
      * @var WriterInterface
@@ -53,22 +53,22 @@ class SignUp
     /**
      * SignUp constructor.
      *
-     * @param AnalyticsConnector $analyticsConnector
+     * @param Connector $connector
      * @param WriterInterface $configWriter
      * @param InboxFactory $inboxFactory
      * @param InboxResource $inboxResource
      * @param FlagManager $flagManager
      * @param ReinitableConfigInterface $reinitableConfig
      */
     public function __construct(
-        AnalyticsConnector $analyticsConnector,
+        Connector $connector,
         WriterInterface $configWriter,
         InboxFactory $inboxFactory,
         InboxResource $inboxResource,
         FlagManager $flagManager,
         ReinitableConfigInterface $reinitableConfig
     ) {
-        $this->analyticsConnector = $analyticsConnector;
+        $this->connector = $connector;
         $this->configWriter = $configWriter;
         $this->inboxFactory = $inboxFactory;
         $this->inboxResource = $inboxResource;
@@ -104,7 +104,7 @@ public function execute()
 
         $attemptsCount -= 1;
         $this->flagManager->saveFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);
-        $signUpResult = $this->analyticsConnector->execute('signUp');
+        $signUpResult = $this->connector->execute('signUp');
         if ($signUpResult === false) {
             return false;
         }

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

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Cron;
+
+use Magento\Analytics\Model\Connector;
+use Magento\Analytics\Model\FlagManager;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\AdminNotification\Model\ResourceModel\Inbox as InboxResource;
+use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
+
+/**
+ * Class Update
+ * Executes by cron schedule in case base url was changed
+ */
+class Update
+{
+    /**
+     * @var Connector
+     */
+    private $connector;
+
+    /**
+     * @var WriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * Reinitable Config Model.
+     *
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * Update constructor.
+     * @param Connector $connector
+     * @param WriterInterface $configWriter
+     * @param ReinitableConfigInterface $reinitableConfig
+     * @param FlagManager $flagManager
+     */
+    public function __construct(
+        Connector $connector,
+        WriterInterface $configWriter,
+        ReinitableConfigInterface $reinitableConfig,
+        FlagManager $flagManager
+    ) {
+        $this->connector = $connector;
+        $this->configWriter = $configWriter;
+        $this->reinitableConfig = $reinitableConfig;
+        $this->flagManager = $flagManager;
+    }
+
+    /**
+     * Execute scheduled update operation
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        $updateResult = $this->connector->execute('update');
+        if ($updateResult === false) {
+            return false;
+        }
+        $this->configWriter->delete(BaseUrlConfigPlugin::UPDATE_CRON_STRING_PATH);
+        $this->flagManager->deleteFlag(BaseUrlConfigPlugin::OLD_BASE_URL_FLAG_CODE);
+        $this->reinitableConfig->reinit();
+        return true;
+    }
+}