Merge branch '2.2-develop' into MAGETWO-92154

Author: Yevhen Miroshnychenko

app/code/Magento/Customer/view/frontend/templates/logout.phtml

@@ -7,13 +7,12 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <p><?= $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p>
-<script>
-require([
-    "jquery",
-    "mage/mage"
-], function($){
-
-    $($.mage.redirect("<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000));
-
-});
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Customer/js/logout-redirect": {
+                "url": "<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>"
+            }
+        }
+    }
 </script>

app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function ($) {
+    'use strict';
+
+    return function (data) {
+        $($.mage.redirect(data.url, 'assign', 5000));
+    };
+});

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

@@ -55,10 +55,10 @@ public function execute()
             $this->_initSession()->_processData();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->_reloadQuote();
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
             $this->_reloadQuote();
-            $this->messageManager->addException($e, $e->getMessage());
+            $this->messageManager->addExceptionMessage($e, $e->getMessage());
         }
 
         $asJson = $request->getParam('json');

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

@@ -3,23 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\PaymentException;
 
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
      * Saving quote and create order
      *
-     * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\ResultInterface
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-        $resultRedirect = $this->resultRedirectFactory->create();
+        $path = 'sales/*/';
+        $pathParams = [];
+
         try {
             // check if the creation of a new customer is allowed
             if (!$this->_authorization->isAllowed('Magento_Customer::manage')
@@ -49,31 +52,30 @@ public function execute()
                 ->createOrder();
 
             $this->_getSession()->clearStorage();
-            $this->messageManager->addSuccess(__('You created the order.'));
+            $this->messageManager->addSuccessMessage(__('You created the order.'));
             if ($this->_authorization->isAllowed('Magento_Sales::actions_view')) {
-                $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
+                $pathParams = ['order_id' => $order->getId()];
+                $path = 'sales/order/view';
             } else {
-                $resultRedirect->setPath('sales/order/index');
+                $path = 'sales/order/index';
             }
         } catch (PaymentException $e) {
             $this->_getOrderCreateModel()->saveQuote();
             $message = $e->getMessage();
             if (!empty($message)) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
-            $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());
+            $this->_getSession()->setCustomerId((int)$this->_getSession()->getQuote()->getCustomerId());
             $message = $e->getMessage();
             if (!empty($message)) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
-            $resultRedirect->setPath('sales/*/');
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Order saving error: %1', $e->getMessage()));
-            $resultRedirect->setPath('sales/*/');
+            $this->messageManager->addExceptionMessage($e, __('Order saving error: %1', $e->getMessage()));
         }
-        return $resultRedirect;
+
+        return $this->resultRedirectFactory->create()->setPath($path, $pathParams);
     }
 }

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -1948,21 +1948,17 @@ public function createOrder()
      */
     protected function _validate()
     {
-        $customerId = $this->getSession()->getCustomerId();
-        if ($customerId === null) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a customer'));
-        }
-
         if (!$this->getSession()->getStore()->getId()) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Please select a store'));
         }
         $items = $this->getQuote()->getAllItems();
 
-        if (count($items) == 0) {
+        if (count($items) === 0) {
             $this->_errors[] = __('Please specify order items.');
         }
 
         foreach ($items as $item) {
+            /** @var \Magento\Quote\Model\Quote\Item $item */
             $messages = $item->getMessage(false);
             if ($item->getHasError() && is_array($messages) && !empty($messages)) {
                 $this->_errors = array_merge($this->_errors, $messages);
@@ -1991,7 +1987,7 @@ protected function _validate()
         }
         if (!empty($this->_errors)) {
             foreach ($this->_errors as $error) {
-                $this->messageManager->addError($error);
+                $this->messageManager->addErrorMessage($error);
             }
             throw new \Magento\Framework\Exception\LocalizedException(__('Validation is failed.'));
         }

app/code/Magento/Ui/Component/Bookmark.php

@@ -82,11 +82,11 @@ public function prepare()
             }
         }
 
-        $this->setData('config', array_replace_recursive($config, $this->getConfiguration($this)));
+        $this->setData('config', array_replace_recursive($config, $this->getConfiguration()));
 
         parent::prepare();
 
-        $jsConfig = $this->getConfiguration($this);
+        $jsConfig = $this->getConfiguration();
         $this->getContext()->addComponentDefinition($this->getComponentName(), $jsConfig);
     }
 }

app/code/Magento/Ui/Test/Unit/Component/Control/ActionPoolTest.php

@@ -83,8 +83,7 @@ protected function setUp()
         $this->items[$this->key] = $this->createPartialMock(\Magento\Ui\Component\Control\Item::class, ['setData']);
         $this->actionPool = new ActionPool(
             $this->contextMock,
-            $this->itemFactoryMock,
-            $this->toolbarBlockMock
+            $this->itemFactoryMock
         );
     }
 

app/code/Magento/Webapi/Model/Soap/Fault.php

@@ -39,7 +39,9 @@ class Fault
     const NODE_DETAIL_WRAPPER = 'GenericFault';
     /**#@-*/
 
-    /**#@-*/
+    /**
+     * @var string
+     */
     protected $_soapFaultCode;
 
     /**
@@ -114,7 +116,7 @@ public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         State $appState
     ) {
-        $this->_soapCode = $exception->getOriginator();
+        $this->_soapFaultCode = $exception->getOriginator();
         $this->_parameters = $exception->getDetails();
         $this->_wrappedErrors = $exception->getErrors();
         $this->stackTrace = $exception->getStackTrace() ?: $exception->getTraceAsString();
@@ -194,7 +196,7 @@ public function getDetails()
      */
     public function getSoapCode()
     {
-        return $this->_soapCode;
+        return $this->_soapFaultCode;
     }
 
     /**

app/design/frontend/Magento/luma/etc/view.xml

@@ -231,6 +231,7 @@
             <var name="height"></var> <!-- Height of magnifier block -->
             <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
             <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
+            <var name="mode">outside</var> <!-- Zoom type (outside/inside) -->
         </var>
 
         <var name="breakpoints">

lib/web/mage/dropdowns.js

@@ -127,11 +127,9 @@ define([
             }
 
             elem.on('click.toggleDropdown', function () {
-                var el;
+                var el = actionElem;
 
                 if (options.autoclose === true) {
-                    el = actionElem;
-
                     actionElem = $();
                     $(document).trigger('click.hideDropdown');
                     actionElem = el;