Merge pull request #43 from magento/develop

Merge develop into MAGETWO-62660

Author: victorgugo

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/Theme/Model/Theme.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Theme\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
 
@@ -78,6 +79,11 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
      */
     protected $_customFactory;
 
+    /**
+     * @var ThemeFactory
+     */
+    private $themeModelFactory;
+
     /**
      * @var ThemeInterface[]
      */
@@ -96,7 +102,7 @@ class Theme extends \Magento\Framework\Model\AbstractModel implements ThemeInter
      * @param \Magento\Theme\Model\ResourceModel\Theme $resource
      * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $resourceCollection
      * @param array $data
-     *
+     * @param ThemeFactory $themeModelFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -109,14 +115,16 @@ public function __construct(
         \Magento\Framework\View\Design\Theme\CustomizationFactory $customizationFactory,
         \Magento\Theme\Model\ResourceModel\Theme $resource = null,
         ThemeCollection $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        ThemeFactory $themeModelFactory = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->_themeFactory = $themeFactory;
         $this->_domainFactory = $domainFactory;
         $this->_imageFactory = $imageFactory;
         $this->_validator = $validator;
         $this->_customFactory = $customizationFactory;
+        $this->themeModelFactory = $themeModelFactory ?: ObjectManager::getInstance()->get(ThemeFactory::class);
         $this->addData(['type' => self::TYPE_VIRTUAL]);
     }
 
@@ -377,52 +385,54 @@ public function getInheritedThemes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function __sleep()
+    public function toArray(array $keys = [])
     {
-        $properties = parent::__sleep();
-        $key =  array_search('_logger', $properties);
-        if (false !== $key) {
-            unset($properties[$key]);
+        $data = parent::toArray($keys);
+        if (isset($data['parent_theme'])) {
+            $data['parent_theme'] = $this->getParentTheme()->toArray();
         }
-        return array_diff(
-            $properties,
-            [
-                '_resource',
-                '_resourceCollection',
-                '_themeFactory',
-                '_domainFactory',
-                '_imageFactory',
-                '_validator',
-                '_customFactory'
-            ]
-        );
+
+        if (isset($data['inherited_themes'])) {
+            foreach ($data['inherited_themes'] as $key => $inheritedTheme) {
+                $data['inherited_themes'][$key] = $inheritedTheme->toArray();
+            }
+        }
+
+        return $data;
     }
 
     /**
-     * {@inheritdoc}
+     * Populate Theme object from an array
+     *
+     * @param array $data
+     * @return Theme
      */
-    public function __wakeup()
+    public function populateFromArray(array $data)
     {
-        parent::__wakeup();
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->_resource = $objectManager->get(\Magento\Theme\Model\ResourceModel\Theme::class);
-        $this->_resourceCollection = $objectManager->get(\Magento\Theme\Model\ResourceModel\Theme\Collection::class);
-        $this->_themeFactory = $objectManager->get(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
-        $this->_domainFactory = $objectManager->get(\Magento\Framework\View\Design\Theme\Domain\Factory::class);
-        $this->_imageFactory = $objectManager->get(\Magento\Framework\View\Design\Theme\ImageFactory::class);
-        $this->_validator = $objectManager->get(\Magento\Framework\View\Design\Theme\Validator::class);
-        $this->_customFactory = $objectManager->get(\Magento\Framework\View\Design\Theme\CustomizationFactory::class);
+        $this->_data = $data;
+        if (isset($data['parent_theme'])) {
+            $this->_data['parent_theme'] = $this->createThemeInstance()->populateFromArray($data['parent_theme']);
+        }
+
+        if (isset($data['inherited_themes'])) {
+            foreach ($data['inherited_themes'] as $key => $inheritedTheme) {
+                $themeInstance = $this->createThemeInstance()->populateFromArray($inheritedTheme);
+                $this->_data['inherited_themes'][$key] = $themeInstance;
+            }
+        }
+
+        return $this;
     }
 
     /**
-     * @param int $modelId
-     * @param null $field
-     * @return $this
+     * Create Theme instance
+     *
+     * @return \Magento\Theme\Model\Theme
      */
-    public function load($modelId, $field = null)
+    private function createThemeInstance()
     {
-        return parent::load($modelId, $field); // TODO: Change the autogenerated stub
+        return $this->themeModelFactory->create();
     }
 }