Merge branch 'MAGETWO-58633-eav' of github.com:magento-jackalopes/magento2ce into MAGETWO-58633-eav

Author: Igor Melnikov

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/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml

@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="shipment_items">
-            <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="shipment_item_bundle" as="shipment_item_bundle" template="sales/shipment/view/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="bundle" as="bundle" template="sales/shipment/view/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php

@@ -162,7 +162,7 @@ public function execute()
                         $this->attributeHelper->getStoreWebsiteId($storeId)
                     );
                     if (!$stockItemDo->getProductId()) {
-                        $inventoryData[] = $productId;
+                        $inventoryData['product_id'] = $productId;
                     }
 
                     $stockItemId = $stockItemDo->getId();

app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

@@ -50,11 +50,6 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
      */
     protected $searchCriteriaBuilder;
 
-    /**
-     * @var \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
-     */
-    private $optionManagement;
-
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Attribute $attributeResource
      * @param \Magento\Catalog\Helper\Product $productHelper
@@ -177,13 +172,31 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
             );
             $attribute->setIsUserDefined(1);
         }
-        $this->attributeResource->save($attribute);
-
         if (!empty($attribute->getData(AttributeInterface::OPTIONS))) {
+            $options = [];
+            $sortOrder = 0;
+            $default = [];
+            $optionIndex = 0;
             foreach ($attribute->getOptions() as $option) {
-                $this->getOptionManagement()->add($attribute->getAttributeCode(), $option);
+                $optionIndex++;
+                $optionId = $option->getValue() ?: 'option_' . $optionIndex;
+                $options['value'][$optionId][0] = $option->getLabel();
+                $options['order'][$optionId] = $option->getSortOrder() ?: $sortOrder++;
+                if (is_array($option->getStoreLabels())) {
+                    foreach ($option->getStoreLabels() as $label) {
+                        $options['value'][$optionId][$label->getStoreId()] = $label->getLabel();
+                    }
+                }
+                if ($option->getIsDefault()) {
+                    $default[] = $optionId;
+                }
+            }
+            $attribute->setDefault($default);
+            if (count($options)) {
+                $attribute->setOption($options);
             }
         }
+        $this->attributeResource->save($attribute);
         return $this->get($attribute->getAttributeCode());
     }
 
@@ -262,16 +275,4 @@ protected function validateFrontendInput($frontendInput)
             throw InputException::invalidFieldValue('frontend_input', $frontendInput);
         }
     }
-
-    /**
-     * @return \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
-     */
-    private function getOptionManagement()
-    {
-        if (null === $this->optionManagement) {
-            $this->optionManagement = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Api\ProductAttributeOptionManagementInterface::class);
-        }
-        return $this->optionManagement;
-    }
 }

app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml

@@ -110,7 +110,7 @@ switch ($type = $block->getType()) {
 
     case 'crosssell':
         /** @var \Magento\Catalog\Block\Product\ProductList\Crosssell $block */
-        if ($exist = $block->getItemCount()) {
+        if ($exist = count($block->getItems())) {
             $type = 'crosssell';
             $class = $type;
 

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1015,7 +1015,7 @@ protected function _initAttributeSets()
     protected function _initSkus()
     {
         $this->skuProcessor->setTypeModels($this->_productTypeModels);
-        $this->_oldSku = $this->skuProcessor->getOldSkus();
+        $this->_oldSku = $this->skuProcessor->reloadOldSkus()->getOldSkus();
         return $this;
     }
 

app/code/Magento/CatalogImportExport/Model/Import/Uploader.php

@@ -6,6 +6,7 @@
 namespace Magento\CatalogImportExport\Model\Import;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\DriverPool;
 
 /**
@@ -15,6 +16,14 @@
  */
 class Uploader extends \Magento\MediaStorage\Model\File\Uploader
 {
+
+    /**
+     * HTTP scheme
+     * used to compare against the filename and select the proper DriverPool adapter
+     * @var string
+     */
+    private $httpScheme = 'http://';
+
     /**
      * Temp directory.
      *
@@ -145,7 +154,13 @@ public function move($fileName, $renameFileOff = false)
         }
         if (preg_match('/\bhttps?:\/\//i', $fileName, $matches)) {
             $url = str_replace($matches[0], '', $fileName);
-            $read = $this->_readFactory->create($url, DriverPool::HTTP);
+
+            if ($matches[0] === $this->httpScheme) {
+                $read = $this->_readFactory->create($url, DriverPool::HTTP);
+            } else {
+                $read = $this->_readFactory->create($url, DriverPool::HTTPS);
+            }
+
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
             $this->_directory->writeFile(
                 $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName),

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

@@ -516,6 +516,7 @@ protected function _initTypeModels()
     protected function _initSkus()
     {
         $this->skuProcessor->expects($this->once())->method('setTypeModels');
+        $this->skuProcessor->expects($this->once())->method('reloadOldSkus')->willReturnSelf();
         $this->skuProcessor->expects($this->once())->method('getOldSkus');
         return $this;
     }