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

[EngCom] Public Pull Requests

Public Pull Requests:

#8418
#8416
#8414
#8373
#8397
#8419
#8151

Author: Oleksii Korshenko

app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php

@@ -6,16 +6,17 @@
  */
 namespace Magento\Backup\Controller\Adminhtml\Index;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Grid extends \Magento\Backup\Controller\Adminhtml\Index
 {
     /**
      * Backup list action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml

@@ -14,7 +14,7 @@
 ?>
 <?php
     $_helper = $this->helper('Magento\Catalog\Helper\Output');
-    $_product = $block->getProduct()
+    $_product = $block->getProduct();
 ?>
 <?php if ($_additional = $block->getAdditionalData()): ?>
     <div class="additional-attributes-wrapper table-wrapper">

app/code/Magento/CatalogSearch/Controller/Advanced/Index.php

@@ -6,14 +6,15 @@
  */
 namespace Magento\CatalogSearch\Controller\Advanced;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php

@@ -84,19 +84,6 @@ public function setAggregations($aggregations)
         $this->aggregations = $aggregations;
     }
 
-    /**
-     * Retrieve all ids for collection
-     * Backward compatibility with EAV collection
-     *
-     * @param int $limit
-     * @param int $offset
-     * @return array
-     */
-    public function getAllIds($limit = null, $offset = null)
-    {
-        return $this->getConnection()->fetchCol($this->_getAllIdsSelect($limit, $offset), $this->_bindParams);
-    }
-
     /**
      * Get search criteria.
      *

app/code/Magento/Contact/Controller/Index/Index.php

@@ -6,16 +6,17 @@
  */
 namespace Magento\Contact\Controller\Index;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Index extends \Magento\Contact\Controller\Index
 {
     /**
      * Show Contact Us page
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Contact/Test/Unit/Controller/Index/IndexTest.php

@@ -6,6 +6,9 @@
 
 namespace Magento\Contact\Test\Unit\Controller\Index;
 
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+
 class IndexTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -25,7 +28,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
      * View mock
      * @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_view;
+    protected $resultFactory;
 
     /**
      * Url mock
@@ -43,7 +46,7 @@ protected function setUp()
         );
         $context = $this->getMock(
             \Magento\Framework\App\Action\Context::class,
-            ['getRequest', 'getResponse', 'getView', 'getUrl'],
+            ['getRequest', 'getResponse', 'getResultFactory', 'getUrl'],
             [],
             '',
             false
@@ -67,17 +70,17 @@ protected function setUp()
                 $this->getMockForAbstractClass(\Magento\Framework\App\ResponseInterface::class, [], '', false)
             ));
 
-        $this->_view = $this->getMock(
-            \Magento\Framework\App\ViewInterface::class,
+        $this->resultFactory = $this->getMock(
+            ResultFactory::class,
             [],
             [],
             '',
             false
         );
 
         $context->expects($this->once())
-            ->method('getView')
-            ->will($this->returnValue($this->_view));
+            ->method('getResultFactory')
+            ->will($this->returnValue($this->resultFactory));
 
         $this->_controller = new \Magento\Contact\Controller\Index\Index(
             $context,
@@ -90,12 +93,12 @@ protected function setUp()
 
     public function testExecute()
     {
-        $this->_view->expects($this->once())
-            ->method('loadLayout');
-
-        $this->_view->expects($this->once())
-            ->method('renderLayout');
+        $resultStub = $this->getMockForAbstractClass(ResultInterface::class);
+        $this->resultFactory->expects($this->once())
+            ->method('create')
+            ->with(ResultFactory::TYPE_PAGE)
+            ->willReturn($resultStub);
 
-        $this->_controller->execute();
+        $this->assertSame($resultStub, $this->_controller->execute());
     }
 }

app/code/Magento/User/Controller/Adminhtml/User/Role/Editrolegrid.php

@@ -6,16 +6,17 @@
  */
 namespace Magento\User\Controller\Adminhtml\User\Role;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Editrolegrid extends \Magento\User\Controller\Adminhtml\User\Role
 {
     /**
      * Action for ajax request from assigned users grid
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php

@@ -284,20 +284,10 @@ protected function _assignProducts()
             $productCollection->setVisibility($this->_productVisibility->getVisibleInSiteIds());
         }
 
-        $attributesToSelect = [
-            'name',
-            'visibility',
-            'small_image',
-            'thumbnail',
-            'links_purchased_separately',
-            'links_title',
-            'price_type'
-        ];
-
         $productCollection->addPriceData()
             ->addTaxPercents()
             ->addIdFilter($this->_productIds)
-            ->addAttributeToSelect($attributesToSelect)
+            ->addAttributeToSelect($this->_wishlistConfig->getProductAttributes())
             ->addOptionsToResult()
             ->addUrlRewrite();
 

app/code/Magento/Wishlist/etc/catalog_attributes.xml

@@ -7,6 +7,12 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd">
     <group name="wishlist_item">
+        <attribute name="name"/>
+        <attribute name="small_image"/>
+        <attribute name="thumbnail"/>
+        <attribute name="links_purchased_separately"/>
+        <attribute name="links_title"/>
+        <attribute name="price_type"/>
         <attribute name="visibility"/>
         <attribute name="url_path"/>
         <attribute name="url_key"/>

composer.json

@@ -43,12 +43,12 @@
         "tubalmartin/cssmin": "2.4.8-p4",
         "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.7.0",
-        "symfony/console": "~2.3 <2.7",
+        "symfony/console": "~2.3, !=2.7.0",
         "symfony/event-dispatcher": "~2.1",
         "symfony/process": "~2.1",
         "phpseclib/phpseclib": "2.0.*",
         "tedivm/jshrink": "~1.0.1",
-        "magento/composer": "~1.0.0",
+        "magento/composer": "~1.1.0",
         "lib-libxml": "*",
         "ext-ctype": "*",
         "ext-gd": "*",