Merge remote-tracking branch 'mainline/develop' into bugfixes

Author: fascinosum

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

@@ -7,7 +7,7 @@
 
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
 use Magento\Analytics\Model\Connector;
-use Magento\Analytics\Model\FlagManager;
+use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 

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

@@ -6,8 +6,8 @@
 namespace Magento\Analytics\Cron;
 
 use Magento\Analytics\Model\Connector;
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
+use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 

app/code/Magento/Analytics/Model/FileInfoManager.php

@@ -6,6 +6,7 @@
 namespace Magento\Analytics\Model;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\FlagManager;
 
 /**
  * Manage saving and loading FileInfo object.

app/code/Magento/Analytics/Model/NotificationTime.php

@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Analytics\Model;
 
+use Magento\Framework\FlagManager;
+
 /**
  * Class NotificationTime
  *

app/code/Magento/Analytics/Model/Plugin/BaseUrlConfigPlugin.php

@@ -5,8 +5,8 @@
  */
 namespace Magento\Analytics\Model\Plugin;
 
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\SubscriptionStatusProvider;
+use Magento\Framework\FlagManager;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 
 /**

app/code/Magento/Analytics/Test/Unit/Cron/SignUpTest.php

@@ -8,9 +8,9 @@
 use Magento\Analytics\Cron\SignUp;
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
 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\Framework\FlagManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

app/code/Magento/Analytics/Test/Unit/Cron/UpdateTest.php

@@ -7,10 +7,10 @@
 
 use Magento\Analytics\Cron\Update;
 use Magento\Analytics\Model\Connector;
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
 
 /**
  * Class Update

app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Enabled/SubscriptionHandlerTest.php

@@ -9,9 +9,9 @@
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Config\Backend\CollectionTime;
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\NotificationTime;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**

app/code/Magento/Analytics/Test/Unit/Model/FileInfoManagerTest.php

@@ -8,7 +8,7 @@
 use Magento\Analytics\Model\FileInfo;
 use Magento\Analytics\Model\FileInfoFactory;
 use Magento\Analytics\Model\FileInfoManager;
-use Magento\Analytics\Model\FlagManager;
+use Magento\Framework\FlagManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**

app/code/Magento/Analytics/Test/Unit/Model/NotificationTimeTest.php

@@ -6,8 +6,8 @@
 
 namespace Magento\Analytics\Test\Unit\Model;
 
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\NotificationTime;
+use Magento\Framework\FlagManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**