MAGETWO-66212: Re-subscribe after M2 token was lost at server-side

fascinosum · fascinosum · commit 0470c5b443c5 · 2017-04-10T12:32:23.000+03:00
-- resolve merge conflicts
diff --git a/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php b/app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php
@@ -7,10 +7,10 @@
 
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Config\Backend\CollectionTime;
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\NotificationTime;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\FlagManager;
 
 /**
  * Class for processing of activation/deactivation MBI subscription.
diff --git a/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php b/app/code/Magento/Analytics/Model/Connector/UpdateCommand.php
@@ -7,9 +7,9 @@
 
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
 use Magento\Config\Model\Config;
+use Magento\Framework\FlagManager;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Store\Model\Store;
 use Psr\Log\LoggerInterface;
diff --git a/app/code/Magento/Analytics/Model/SubscriptionStatusProvider.php b/app/code/Magento/Analytics/Model/SubscriptionStatusProvider.php
@@ -7,6 +7,7 @@
 
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
 
 /**
  * Provider of subscription status.
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
-use Magento\Analytics\Model\FlagManager;
+use Magento\Framework\FlagManager;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Config\Model\Config;
 use Psr\Log\LoggerInterface;
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/SubscriptionStatusProviderTest.php b/app/code/Magento/Analytics/Test/Unit/Model/SubscriptionStatusProviderTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
-use Magento\Analytics\Model\FlagManager;
 use Magento\Analytics\Model\SubscriptionStatusProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\FlagManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
diff --git a/app/code/Magento/Config/Model/PreparedValueFactory.php b/app/code/Magento/Config/Model/PreparedValueFactory.php
@@ -5,11 +5,12 @@
  */
 namespace Magento\Config\Model;
 
+use Magento\Config\Model\Config\BackendFactory;
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\StructureFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\RuntimeException;
@@ -39,23 +40,33 @@ class PreparedValueFactory
      * The factory for configuration value objects.
      *
      * @see ValueInterface
-     * @var ValueFactory
+     * @var BackendFactory
      */
     private $valueFactory;
 
+    /**
+     * The scope configuration.
+     *
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
     /**
      * @param ScopeResolverPool $scopeResolverPool The scope resolver pool
      * @param StructureFactory $structureFactory The manager for system configuration structure
-     * @param ValueFactory $valueFactory The factory for configuration value objects
+     * @param BackendFactory $valueFactory The factory for configuration value objects
+     * @param ScopeConfigInterface $config The scope configuration
      */
     public function __construct(
         ScopeResolverPool $scopeResolverPool,
         StructureFactory $structureFactory,
-        ValueFactory $valueFactory
+        BackendFactory $valueFactory,
+        ScopeConfigInterface $config
     ) {
         $this->scopeResolverPool = $scopeResolverPool;
         $this->structureFactory = $structureFactory;
         $this->valueFactory = $valueFactory;
+        $this->config = $config;
     }
 
     /**
@@ -75,13 +86,21 @@ public function create($path, $value, $scope, $scopeCode = null)
         try {
             /** @var Structure $structure */
             $structure = $this->structureFactory->create();
-            $backendModel = $this->valueFactory->create();
             /** @var Structure\ElementInterface $field */
             $field = $structure->getElement($path);
+            $configPath = $path;
+            /** @var string $backendModelName */
             if ($field instanceof Structure\Element\Field && $field->hasBackendModel()) {
-                $backendModel = $field->getBackendModel();
-                $path = $field->getConfigPath() ?: $path;
+                $backendModelName = $field->getData()['backend_model'];
+                $configPath = $field->getConfigPath() ?: $path;
+            } else {
+                $backendModelName = ValueInterface::class;
             }
+            /** @var ValueInterface $backendModel */
+            $backendModel = $this->valueFactory->create(
+                $backendModelName,
+                ['config' => $this->config]
+            );
 
             if ($backendModel instanceof Value) {
                 $scopeId = 0;
@@ -91,7 +110,7 @@ public function create($path, $value, $scope, $scopeCode = null)
                     $scopeId = $scopeResolver->getScope($scopeCode)->getId();
                 }
 
-                $backendModel->setPath($path);
+                $backendModel->setPath($configPath);
                 $backendModel->setScope($scope);
                 $backendModel->setScopeId($scopeId);
                 $backendModel->setValue($value);
diff --git a/app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php b/app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Config\Test\Unit\Model;
 
+use Magento\Config\Model\Config\BackendFactory;
 use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\ValueFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Config\Model\Config\StructureFactory;
 use Magento\Framework\App\Config\Value;
 use Magento\Config\Model\Config\Structure;
@@ -27,7 +28,7 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
     private $structureFactoryMock;
 
     /**
-     * @var ValueFactory|Mock
+     * @var BackendFactory|Mock
      */
     private $valueFactoryMock;
 
@@ -46,6 +47,11 @@ class PreparedValueFactoryTest extends \PHPUnit_Framework_TestCase
      */
     private $fieldMock;
 
+    /**
+     * @var ScopeConfigInterface|Mock
+     */
+    private $configMock;
+
     /**
      * @var ScopeResolverPool|Mock
      */
@@ -75,7 +81,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->valueFactoryMock = $this->getMockBuilder(ValueFactory::class)
+        $this->valueFactoryMock = $this->getMockBuilder(BackendFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -89,6 +95,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['setPath', 'setScope', 'setScopeId', 'setValue'])
             ->getMock();
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
         $this->scopeResolverPoolMock = $this->getMockBuilder(ScopeResolverPool::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -101,12 +109,14 @@ protected function setUp()
         $this->preparedValueFactory = new PreparedValueFactory(
             $this->scopeResolverPoolMock,
             $this->structureFactoryMock,
-            $this->valueFactoryMock
+            $this->valueFactoryMock,
+            $this->configMock
         );
     }
 
     /**
      * @param string $path
+     * @param string|null $configPath
      * @param string $value
      * @param string $scope
      * @param string|int|null $scopeCode
@@ -115,6 +125,7 @@ protected function setUp()
      */
     public function testCreate(
         $path,
+        $configPath,
         $value,
         $scope,
         $scopeCode,
@@ -143,15 +154,15 @@ public function testCreate(
         $this->fieldMock->expects($this->once())
             ->method('hasBackendModel')
             ->willReturn(true);
-        $this->fieldMock->expects($this->once())
-            ->method('getBackendModel')
-            ->willReturn($this->valueMock);
+        $this->fieldMock
+            ->method('getConfigPath')
+            ->willReturn($configPath);
         $this->valueFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->valueMock);
         $this->valueMock->expects($this->once())
             ->method('setPath')
-            ->with($path)
+            ->with($configPath ?: $path)
             ->willReturnSelf();
         $this->valueMock->expects($this->once())
             ->method('setScope')
@@ -180,13 +191,23 @@ public function createDataProvider()
         return [
             'standard flow' => [
                 '/some/path',
+                null,
+                'someValue',
+                'someScope',
+                'someScopeCode',
+                1,
+            ],
+            'standard flow with custom config path' => [
+                '/some/path',
+                '/custom/config_path',
                 'someValue',
                 'someScope',
                 'someScopeCode',
                 1,
             ],
             'default scope flow' => [
                 '/some/path',
+                null,
                 'someValue',
                 ScopeInterface::SCOPE_DEFAULT,
                 null,
