Merge pull request #2207 from magento-plankton/forwardports

[Plankton] Forwardports

Author: Alexander Akimov

app/code/Magento/Config/Block/System/Config/Form.php

@@ -8,6 +8,7 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
 use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
@@ -425,23 +426,21 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
         if ($placeholderValue) {
             $data = $placeholderValue;
         }
-        if ($data === null) {
-            if (array_key_exists($path, $this->_configData)) {
-                $data = $this->_configData[$path];
-            } elseif ($field->getConfigPath() !== null) {
-                $data = $this->getConfigValue($field->getConfigPath());
-            } else {
-                $data = $this->getConfigValue($path);
-            }
 
+        if ($data === null) {
+            $path = $field->getConfigPath() !== null ? $field->getConfigPath() : $path;
+            $data = $this->getConfigValue($path);
             if ($field->hasBackendModel()) {
                 $backendModel = $field->getBackendModel();
-                $backendModel->setPath($path)
-                    ->setValue($data)
-                    ->setWebsite($this->getWebsiteCode())
-                    ->setStore($this->getStoreCode())
-                    ->afterLoad();
-                $data = $backendModel->getValue();
+                // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
+                if (!$backendModel instanceof ProcessorInterface) {
+                    $backendModel->setPath($path)
+                        ->setValue($data)
+                        ->setWebsite($this->getWebsiteCode())
+                        ->setStore($this->getStoreCode())
+                        ->afterLoad();
+                    $data = $backendModel->getValue();
+                }
             }
         }
 

app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php

@@ -546,8 +546,8 @@ public function initFieldsDataProvider()
         return [
             [
                 ['section1/group1/field1' => 'some_value'],
-                false,
-                null,
+                'some_value',
+                'section1/group1/field1',
                 false,
                 'some_value',
                 null,

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php

@@ -63,6 +63,8 @@ public function execute()
             }
             $resultRedirect->setPath('sales/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            // customer can be created before place order flow is completed and should be stored in current session
+            $this->_getSession()->setCustomerId($this->_getSession()->getQuote()->getCustomerId());
             $message = $e->getMessage();
             if (!empty($message)) {
                 $this->messageManager->addError($message);

dev/tests/integration/testsuite/Magento/Config/Block/System/Config/FieldArray.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Block\System\Config;
+
+use Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray;
+
+/**
+ * Backend system config array field renderer for integration test.
+ */
+class FieldArray extends AbstractFieldArray
+{
+    /**
+     * @inheritdoc
+     */
+    protected function _toHtml()
+    {
+        $value = '';
+        $element = $this->getElement();
+        if ($element->getValue() && is_array($element->getValue())) {
+            $value = implode('|', $element->getValue());
+        }
+
+        return sprintf(
+            '<input id="%s" name="%s" value="%s" />',
+            $element->getId(),
+            $element->getName(),
+            $value
+        );
+    }
+}