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

Author: YevSent

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

@@ -16,6 +16,8 @@
 use Magento\Payment\Model\IframeConfigProvider;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Place
@@ -44,26 +46,36 @@ class Place extends Payment
      */
     protected $jsonHelper;
 
+    /**
+     * Logger for exception details
+     *
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Context $context
      * @param Registry $coreRegistry
      * @param DataFactory $dataFactory
      * @param CartManagementInterface $cartManagement
      * @param Onepage $onepageCheckout
      * @param JsonHelper $jsonHelper
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         Registry $coreRegistry,
         DataFactory $dataFactory,
         CartManagementInterface $cartManagement,
         Onepage $onepageCheckout,
-        JsonHelper $jsonHelper
+        JsonHelper $jsonHelper,
+        LoggerInterface $logger = null
     ) {
         $this->eventManager = $context->getEventManager();
         $this->cartManagement = $cartManagement;
         $this->onepageCheckout = $onepageCheckout;
         $this->jsonHelper = $jsonHelper;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
         parent::__construct($context, $coreRegistry, $dataFactory);
     }
 
@@ -127,9 +139,11 @@ protected function placeCheckoutOrder()
                 ]
             );
         } catch (LocalizedException $exception) {
+            $this->logger->critical($exception);
             $result->setData('error', true);
             $result->setData('error_messages', $exception->getMessage());
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $result->setData('error', true);
             $result->setData(
                 'error_messages',

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

@@ -20,6 +20,7 @@
 use Magento\Payment\Model\IframeConfigProvider;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class PlaceTest
@@ -94,6 +95,11 @@ class PlaceTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     /**
      * @var CheckoutSession|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -152,6 +158,9 @@ protected function setUp()
             ->getMockBuilder(\Magento\Framework\App\Response\Http::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->loggerMock = $this
+            ->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->getMock();
 
         $this->objectManager = new ObjectManager($this);
         $this->placeOrderController = $this->objectManager->getObject(
@@ -165,6 +174,7 @@ protected function setUp()
                 'cartManagement' => $this->cartManagementMock,
                 'onepageCheckout' => $this->onepageCheckout,
                 'jsonHelper' => $this->jsonHelperMock,
+                'logger' => $this->loggerMock,
             ]
         );
     }
@@ -214,13 +224,15 @@ public function testExecute(
      * @param $controller
      * @param $quoteId
      * @param $result
+     * @param \Exception $exception Exception to check
      * @dataProvider textExecuteFailedPlaceOrderDataProvider
      */
     public function testExecuteFailedPlaceOrder(
         $paymentMethod,
         $controller,
         $quoteId,
-        $result
+        $result,
+        $exception
     ) {
         $this->requestMock->expects($this->at(0))
             ->method('getParam')
@@ -238,7 +250,11 @@ public function testExecuteFailedPlaceOrder(
 
         $this->cartManagementMock->expects($this->once())
             ->method('placeOrder')
-            ->willThrowException(new \Exception());
+            ->willThrowException($exception);
+
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->with($exception);
 
         $this->jsonHelperMock->expects($this->any())
             ->method('jsonEncode')
@@ -278,19 +294,35 @@ public function textExecuteDataProvider()
      */
     public function textExecuteFailedPlaceOrderDataProvider()
     {
-        $objectFailed = new \Magento\Framework\DataObject();
-        $objectFailed->setData('error', true);
-        $objectFailed->setData(
-            'error_messages',
-            __('An error occurred on the server. Please try to place the order again.')
+        $objectFailed1 = new \Magento\Framework\DataObject(
+            [
+                'error' => true,
+                'error_messages' => __('An error occurred on the server. Please try to place the order again.')
+            ]
+        );
+        $generalException = new \Exception('Exception logging will save the world!');
+        $localizedException = new LocalizedException(__('Electronic payments save the trees.'));
+        $objectFailed2 = new \Magento\Framework\DataObject(
+            [
+                'error' => true,
+                'error_messages' => $localizedException->getMessage()
+            ]
         );
 
         return [
             [
                 ['method' => 'authorizenet_directpost'],
                 IframeConfigProvider::CHECKOUT_IDENTIFIER,
                 1,
-                $objectFailed
+                $objectFailed1,
+                $generalException,
+            ],
+            [
+                ['method' => 'authorizenet_directpost'],
+                IframeConfigProvider::CHECKOUT_IDENTIFIER,
+                1,
+                $objectFailed2,
+                $localizedException,
             ],
         ];
     }

app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php

@@ -11,6 +11,8 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class PlaceOrder
@@ -22,22 +24,32 @@ class PlaceOrder extends AbstractAction
      */
     private $orderPlace;
 
+    /**
+     * Logger for exception details
+     *
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor
      *
      * @param Context $context
      * @param Config $config
      * @param Session $checkoutSession
      * @param Helper\OrderPlace $orderPlace
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         Config $config,
         Session $checkoutSession,
-        Helper\OrderPlace $orderPlace
+        Helper\OrderPlace $orderPlace,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context, $config, $checkoutSession);
         $this->orderPlace = $orderPlace;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -58,6 +70,7 @@ public function execute()
             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
             return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
         } catch (\Exception $e) {
+            $this->logger->critical($e);
             $this->messageManager->addExceptionMessage($e, $e->getMessage());
         }
 

app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php

@@ -60,6 +60,11 @@ class PlaceOrderTest extends \PHPUnit_Framework_TestCase
      */
     private $placeOrder;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
@@ -94,11 +99,15 @@ protected function setUp()
             ->method('getMessageManager')
             ->willReturn($this->messageManagerMock);
 
+        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->placeOrder = new PlaceOrder(
             $contextMock,
             $this->configMock,
             $this->checkoutSessionMock,
-            $this->orderPlaceMock
+            $this->orderPlaceMock,
+            $this->loggerMock
         );
     }
 

app/code/Magento/Catalog/Setup/UpgradeData.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Eav\Model\Entity\AttributeCache;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -34,16 +35,26 @@ class UpgradeData implements UpgradeDataInterface
      */
     private $eavSetupFactory;
 
+    /**
+     * @var AttributeCache
+     */
+    private $attributeCache;
+
     /**
      * Init
      *
      * @param CategorySetupFactory $categorySetupFactory
      * @param EavSetupFactory $eavSetupFactory
+     * @param AttributeCache $attributeCache
      */
-    public function __construct(CategorySetupFactory $categorySetupFactory, EavSetupFactory $eavSetupFactory)
-    {
+    public function __construct(
+        CategorySetupFactory $categorySetupFactory,
+        EavSetupFactory $eavSetupFactory,
+        AttributeCache $attributeCache
+    ) {
         $this->categorySetupFactory = $categorySetupFactory;
         $this->eavSetupFactory = $eavSetupFactory;
+        $this->attributeCache = $attributeCache;
     }
 
     /**
@@ -135,19 +146,24 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         }
 
         if (version_compare($context->getVersion(), '2.0.4') < 0) {
+            $mediaBackendType = 'static';
+            $mediaBackendModel = null;
             /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
             $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
             $categorySetup->updateAttribute(
                 'catalog_product',
                 'media_gallery',
                 'backend_type',
-                'static'
+                $mediaBackendType
             );
             $categorySetup->updateAttribute(
                 'catalog_product',
                 'media_gallery',
-                'backend_model'
+                'backend_model',
+                $mediaBackendModel
             );
+
+            $this->changeMediaGalleryAttributeInCache($mediaBackendType, $mediaBackendModel);
         }
 
         if (version_compare($context->getVersion(), '2.0.5', '<')) {
@@ -340,10 +356,10 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 ]
             );
         }
-        
+
         if (version_compare($context->getVersion(), '2.0.7') < 0) {
             /** @var EavSetup $eavSetup */
-            $eavSetup= $this->eavSetupFactory->create(['setup' => $setup]);
+            $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
 
             $eavSetup->updateAttribute(
                 ProductAttributeInterface::ENTITY_TYPE_CODE,
@@ -381,4 +397,25 @@ private function changePriceAttributeDefaultScope($categorySetup)
 
         }
     }
+
+    /**
+     * @param string $mediaBackendType
+     * @param string $mediaBackendModel
+     * @return void
+     */
+    private function changeMediaGalleryAttributeInCache($mediaBackendType, $mediaBackendModel)
+    {
+        // need to do, because media_gallery has backend model in cache.
+        $catalogProductAttributes = $this->attributeCache->getAttributes('catalog_product', '0-0');
+
+        if (is_array($catalogProductAttributes)) {
+            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $catalogProductAttribute */
+            foreach ($catalogProductAttributes as $catalogProductAttribute) {
+                if ($catalogProductAttribute->getAttributeCode() == 'media_gallery') {
+                    $catalogProductAttribute->setBackendModel($mediaBackendModel);
+                    $catalogProductAttribute->setBackendType($mediaBackendType);
+                }
+            }
+        }
+    }
 }

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -337,7 +337,6 @@ window.setRowVisibility = setRowVisibility;
 window.showDefaultRows = showDefaultRows;
 window.switchDefaultValueField = switchDefaultValueField;
 window.switchIsFilterable = switchIsFilterable;
-window.switchIsFilterable = switchIsFilterable;
 window.bindAttributeInputType = bindAttributeInputType;
 window.checkOptionsPanelVisibility = checkOptionsPanelVisibility;
 window.getFrontTab = getFrontTab;

app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml

@@ -19,14 +19,14 @@
         <?php echo($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
         data-price-amount="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>"
         data-price-type="<?php /* @escapeNotVerified */ echo $block->getPriceType(); ?>"
-        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>"
-        <?php echo $block->getSchema() ? ' itemprop="price"' : '' ?>>
+        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
         <?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
+        <meta itemprop="price" content="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>" />
         <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $block->getDisplayCurrencyCode()?>" />
     <?php endif; ?>
 </span>

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -57,7 +57,10 @@ define([
 
     return Component.extend({
         defaults: {
-            template: 'Magento_Checkout/shipping'
+            template: 'Magento_Checkout/shipping',
+            shippingFormTemplate: 'Magento_Checkout/shipping-address/form',
+            shippingMethodListTemplate: 'Magento_Checkout/shipping-address/shipping-method-list',
+            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item'
         },
         visible: ko.observable(!quote.isVirtual()),
         errorValidationMessage: ko.observable(false),