Merge remote-tracking branch 'main-ce/develop' into MAGETWO-62783

Author: magicbunneh

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2195,16 +2195,22 @@ public function addMediaGalleryData()
         $linkField = $this->getProductEntityMetadata()->getLinkField();
         $items = $this->getItems();
 
-        $select->where('entity.' . $linkField . ' IN (?)', array_map(function ($item) {
-            return $item->getId();
-        }, $items));
-
+        $select->where(
+            'entity.' . $linkField . ' IN (?)',
+            array_map(
+                function ($item) use ($linkField) {
+                    return $item->getData($linkField);
+                },
+                $items
+            )
+        );
         foreach ($this->getConnection()->fetchAll($select) as $row) {
             $mediaGalleries[$row[$linkField]][] = $row;
         }
 
         foreach ($items as $item) {
-            $mediaEntries = isset($mediaGalleries[$item->getId()]) ? $mediaGalleries[$item->getId()] : [];
+            $mediaEntries = isset($mediaGalleries[$item->getData($linkField)]) ?
+                $mediaGalleries[$item->getData($linkField)] : [];
             $this->getGalleryReadHandler()->addMediaDataToProduct($item, $mediaEntries);
         }
 

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

@@ -224,11 +224,12 @@ public function testAddProductCategoriesFilter()
     public function testAddMediaGalleryData()
     {
         $attributeId = 42;
-        $itemId = 4242;
-        $linkField = 'entity_id';
-        $mediaGalleriesMock = [[$linkField => $itemId]];
+        $rowId = 4;
+        $linkField = 'row_id';
+        $mediaGalleriesMock = [[$linkField => $rowId]];
         $itemMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
+            ->setMethods(['getData'])
             ->getMock();
         $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
             ->disableOriginalConstructor()
@@ -248,13 +249,13 @@ public function testAddMediaGalleryData()
         $this->galleryResourceMock->expects($this->once())->method('createBatchBaseSelect')->willReturn($selectMock);
         $attributeMock->expects($this->once())->method('getAttributeId')->willReturn($attributeId);
         $this->entityMock->expects($this->once())->method('getAttribute')->willReturn($attributeMock);
-        $itemMock->expects($this->atLeastOnce())->method('getId')->willReturn($itemId);
-        $selectMock->expects($this->once())->method('where')->with('entity.' . $linkField . ' IN (?)', [$itemId]);
+        $itemMock->expects($this->atLeastOnce())->method('getData')->willReturn($rowId);
+        $selectMock->expects($this->once())->method('where')->with('entity.' . $linkField . ' IN (?)', [$rowId]);
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadataMock);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn($linkField);
 
         $this->connectionMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn(
-            [['entity_id' => $itemId]]
+            [['row_id' => $rowId]]
         );
         $this->galleryReadHandlerMock->expects($this->once())->method('addMediaDataToProduct')
             ->with($itemMock, $mediaGalleriesMock);

app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml

@@ -23,6 +23,7 @@
                 <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="order/view/tab/info.phtml">
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+                    <container name="order_additional_info"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="order/view/items.phtml">
                         <arguments>
                             <argument name="columns" xsi:type="array">

app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml

@@ -40,6 +40,8 @@
     </div>
 </section>
 
+<?php echo $block->getChildHtml('order_additional_info') ?>
+
 <?php echo $block->getGiftOptionsHtml() ?>
 
 <section class="admin__page-section">

app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less

@@ -0,0 +1,13 @@
+// /**
+//  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Case Info
+//  ---------------------------------------------
+
+.order-case-table {
+  &:extend(.abs-order-tables all);
+  &:extend(.abs-order-tbody-border all);
+}

app/etc/di.xml

@@ -18,6 +18,8 @@
     <preference for="Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface" type="Magento\Framework\Search\Adapter\Mysql\Field\Field"/>
     <preference for="Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface" type="Magento\Framework\Search\Adapter\Aggregation\AggregationResolver"/>
     <preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="Magento\Framework\App\PlainTextRequestInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="Magento\Framework\App\RequestContentInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
     <preference for="Magento\Framework\App\ResponseInterface" type="Magento\Framework\App\Response\Http" />
     <preference for="Magento\Framework\App\RouterListInterface" type="Magento\Framework\App\RouterList" />

lib/internal/Magento/Framework/App/PlainTextRequestInterface.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+/**
+ * Interface provides low-level access to Magento Application Request and represent it as a simple string.
+ * This interface does not define format of the request content.
+ * Clients of this interface must be able to validate syntax of request and parse it.
+ *
+ * To read already parsed request data use \Magento\Framework\App\RequestInterface.
+ *
+ * @api
+ */
+interface PlainTextRequestInterface
+{
+    /**
+     * Returns textual representation of request to Magento.
+     *
+     * @return string
+     */
+    public function getContent();
+}

lib/internal/Magento/Framework/App/Request/Http.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Request;
 
-use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\RequestContentInterface;
 use Magento\Framework\App\RequestSafetyInterface;
 use Magento\Framework\App\Route\ConfigInterface\Proxy as ConfigInterface;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
@@ -16,7 +16,7 @@
 /**
  * Http request
  */
-class Http extends Request implements RequestInterface, RequestSafetyInterface
+class Http extends Request implements RequestContentInterface, RequestSafetyInterface
 {
     /**#@+
      * HTTP Ports

lib/internal/Magento/Framework/App/RequestContentInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+/**
+ * Interface provides access to parsed request data as well as to the request textual representation.
+ * This interface exists to provide backward compatibility.
+ * Direct usage of RequestInterface and PlainTextRequestInterface is preferable.
+ *
+ * @api
+ */
+interface RequestContentInterface extends RequestInterface, PlainTextRequestInterface
+{
+
+}

lib/internal/Magento/Framework/HTTP/Adapter/Curl.php

@@ -178,6 +178,9 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
             curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
         } elseif ($method == \Zend_Http_Client::GET) {
             curl_setopt($this->_getResource(), CURLOPT_HTTPGET, true);
+        } elseif ($method == \Zend_Http_Client::PUT) {
+            curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, \Zend_Http_Client::PUT);
+            curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
         }
 
         if (is_array($headers)) {