Merge pull request #1186 from magento-engcom/develop-prs

Oleksii Korshenko · web-flow · commit e2feb2ed85ce · 2017-06-12T15:43:36.000-05:00
Public Pull Requests: #9157 #7405 #9824 #9810 #9823 #7780
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1228,15 +1228,15 @@ protected function _saveLinks()
                                         'linked_product_id' => $linkedId,
                                         'link_type_id' => $linkId,
                                     ];
-                                    if (!empty($linkPositions[$linkedKey])) {
-                                        $positionRows[] = [
-                                            'link_id' => $productLinkKeys[$linkKey],
-                                            'product_link_attribute_id' => $positionAttrId[$linkId],
-                                            'value' => $linkPositions[$linkedKey],
-                                        ];
-                                    }
-                                    $nextLinkId++;
                                 }
+                                if (!empty($linkPositions[$linkedKey])) {
+                                    $positionRows[] = [
+                                        'link_id' => $productLinkKeys[$linkKey],
+                                        'product_link_attribute_id' => $positionAttrId[$linkId],
+                                        'value' => $linkPositions[$linkedKey],
+                                    ];
+                                }
+                                $nextLinkId++;
                             }
                         }
                     }
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -154,25 +154,10 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
 
         $this->collectionProcessor->process($criteria, $collection);
 
-        $blocks = [];
-        /** @var Block $blockModel */
-        foreach ($collection as $blockModel) {
-            $blockData = $this->dataBlockFactory->create();
-            $this->dataObjectHelper->populateWithArray(
-                $blockData,
-                $blockModel->getData(),
-                \Magento\Cms\Api\Data\BlockInterface::class
-            );
-            $blocks[] = $this->dataObjectProcessor->buildOutputDataArray(
-                $blockData,
-                \Magento\Cms\Api\Data\BlockInterface::class
-            );
-        }
-
         /** @var Data\BlockSearchResultsInterface $searchResults */
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($criteria);
-        $searchResults->setItems($blocks);
+        $searchResults->setItems($collection->getItems());
         $searchResults->setTotalCount($collection->getSize());
         return $searchResults;
     }
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
@@ -157,25 +157,10 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
 
         $this->collectionProcessor->process($criteria, $collection);
 
-        $pages = [];
-        /** @var Page $pageModel */
-        foreach ($collection as $pageModel) {
-            $pageData = $this->dataPageFactory->create();
-            $this->dataObjectHelper->populateWithArray(
-                $pageData,
-                $pageModel->getData(),
-                \Magento\Cms\Api\Data\PageInterface::class
-            );
-            $pages[] = $this->dataObjectProcessor->buildOutputDataArray(
-                $pageData,
-                \Magento\Cms\Api\Data\PageInterface::class
-            );
-        }
-
         /** @var Data\PageSearchResultsInterface $searchResults */
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($criteria);
-        $searchResults->setItems($pages);
+        $searchResults->setItems($collection->getItems());
         $searchResults->setTotalCount($collection->getSize());
         return $searchResults;
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php b/app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php
@@ -263,22 +263,8 @@ public function testGetList()
             ->willReturnSelf();
         $this->blockSearchResult->expects($this->once())
             ->method('setItems')
-            ->with(['someData'])
+            ->with([$this->block])
             ->willReturnSelf();
-
-        $this->block->expects($this->once())
-            ->method('getData')
-            ->willReturn(['data']);
-
-        $this->dataHelper->expects($this->once())
-            ->method('populateWithArray')
-            ->with($this->blockData, ['data'], \Magento\Cms\Api\Data\BlockInterface::class);
-
-        $this->dataObjectProcessor->expects($this->once())
-            ->method('buildOutputDataArray')
-            ->with($this->blockData, \Magento\Cms\Api\Data\BlockInterface::class)
-            ->willReturn('someData');
-
         $this->assertEquals($this->blockSearchResult, $this->repository->getList($criteria));
     }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php
@@ -261,22 +261,8 @@ public function testGetList()
             ->willReturnSelf();
         $this->pageSearchResult->expects($this->once())
             ->method('setItems')
-            ->with(['someData'])
+            ->with([$this->page])
             ->willReturnSelf();
-
-        $this->page->expects($this->once())
-            ->method('getData')
-            ->willReturn(['data']);
-
-        $this->dataHelper->expects($this->once())
-            ->method('populateWithArray')
-            ->with($this->pageData, ['data'], \Magento\Cms\Api\Data\PageInterface::class);
-
-        $this->dataObjectProcessor->expects($this->once())
-            ->method('buildOutputDataArray')
-            ->with($this->pageData, \Magento\Cms\Api\Data\PageInterface::class)
-            ->willReturn('someData');
-
         $this->assertEquals($this->pageSearchResult, $this->repository->getList($criteria));
     }
 }
diff --git a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
@@ -13,7 +13,9 @@
             </action>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" template="Magento_SendFriend::send.phtml"/>
+            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" template="Magento_SendFriend::send.phtml">
+                <container name="form.additional.info" as="form_additional_info"/>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -104,6 +104,7 @@
             <?php endif; ?>
             </div>
         </div>
+        <?php echo $block->getChildHtml('form_additional_info'); ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -173,12 +173,14 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
         curl_setopt($this->_getResource(), CURLOPT_RETURNTRANSFER, true);
         if ($method == \Zend_Http_Client::POST) {
             curl_setopt($this->_getResource(), CURLOPT_POST, true);
+            curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, 'POST');
             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_CUSTOMREQUEST, 'PUT');
             curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
+        } elseif ($method == \Zend_Http_Client::GET) {
+            curl_setopt($this->_getResource(), CURLOPT_HTTPGET, true);
+            curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, 'GET');
         }
 
         if (is_array($headers)) {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
@@ -80,11 +80,17 @@ public function add($type, $key, $message = '')
      * Write entries
      *
      * @return void
+     * @throws \Magento\Framework\Validator\Exception
      */
     public function report()
     {
         $this->_successWriter->write($this->_successEntries);
         $this->_errorWriter->write($this->_errorEntries);
+        //do not take into account empty items since they are initialized in constructor.
+        $errors = array_filter($this->_errorEntries);
+        if (count($errors) > 0) {
+            throw new \Magento\Framework\Validator\Exception(__('Error during compilation'));
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1228,15 +1228,15 @@ protected function _saveLinks()`
`1228`	`1228`	`'linked_product_id' => $linkedId,`
`1229`	`1229`	`'link_type_id' => $linkId,`
`1230`	`1230`	`];`
`1231`		`- if (!empty($linkPositions[$linkedKey])) {`
`1232`		`- $positionRows[] = [`
`1233`		`- 'link_id' => $productLinkKeys[$linkKey],`
`1234`		`- 'product_link_attribute_id' => $positionAttrId[$linkId],`
`1235`		`- 'value' => $linkPositions[$linkedKey],`
`1236`		`- ];`
`1237`		`- }`
`1238`		`- $nextLinkId++;`
`1239`	`1231`	`}`
	`1232`	`+ if (!empty($linkPositions[$linkedKey])) {`
	`1233`	`+ $positionRows[] = [`
	`1234`	`+ 'link_id' => $productLinkKeys[$linkKey],`
	`1235`	`+ 'product_link_attribute_id' => $positionAttrId[$linkId],`
	`1236`	`+ 'value' => $linkPositions[$linkedKey],`
	`1237`	`+ ];`
	`1238`	`+ }`
	`1239`	`+ $nextLinkId++;`
`1240`	`1240`	`}`
`1241`	`1241`	`}`
`1242`	`1242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,17 @@ public function add($type, $key, $message = '')`
`80`	`80`	`* Write entries`
`81`	`81`	`*`
`82`	`82`	`* @return void`
	`83`	`+ * @throws \Magento\Framework\Validator\Exception`
`83`	`84`	`*/`
`84`	`85`	`public function report()`
`85`	`86`	`{`
`86`	`87`	`$this->_successWriter->write($this->_successEntries);`
`87`	`88`	`$this->_errorWriter->write($this->_errorEntries);`
	`89`	`+ //do not take into account empty items since they are initialized in constructor.`
	`90`	`+ $errors = array_filter($this->_errorEntries);`
	`91`	`+ if (count($errors) > 0) {`
	`92`	`+ throw new \Magento\Framework\Validator\Exception(__('Error during compilation'));`
	`93`	`+ }`
`88`	`94`	`}`
`89`	`95`
`90`	`96`	`/**`