Merge remote-tracking branch 'origin/MAGETWO-63022' into BUGS

Author: VladimirZaets

dev/tests/integration/testsuite/Magento/Theme/Model/Theme/Domain/VirtualTest.php

@@ -19,20 +19,23 @@ class VirtualTest extends \PHPUnit_Framework_TestCase
             'theme_title' => 'Test physical theme',
             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
             'type' => ThemeInterface::TYPE_PHYSICAL,
+            'code' => 'physical',
         ],
         'virtual' => [
             'parent_id' => null,
             'theme_path' => '',
             'theme_title' => 'Test virtual theme',
             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
             'type' => ThemeInterface::TYPE_VIRTUAL,
+            'code' => 'virtual',
         ],
         'staging' => [
             'parent_id' => null,
             'theme_path' => '',
             'theme_title' => 'Test staging theme',
             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
             'type' => ThemeInterface::TYPE_STAGING,
+            'code' => 'staging',
         ],
     ];
 

lib/internal/Magento/Framework/View/Design/Theme/FlyweightFactory.php

@@ -44,11 +44,15 @@ public function __construct(ThemeProviderInterface $themeProvider)
     /**
      * Creates or returns a shared model of theme
      *
-     * @param string $themeKey
-     * @param string $area
-     * @return \Magento\Framework\View\Design\ThemeInterface|null
-     * @throws \InvalidArgumentException
-     * @throws \LogicException
+     * Search for theme in File System by specific path or load theme from DB
+     * by specific path (e.g. adminhtml/Magento/backend) or by identifier (theme primary key) and return it
+     * Can be used to deploy static or in other setup commands, even if Magento is not installed yet.
+     *
+     * @param string $themeKey Should looks like Magento/backend or should be theme primary key
+     * @param string $area Can be adminhtml, frontend, etc...
+     * @return \Magento\Framework\View\Design\ThemeInterface
+     * @throws \InvalidArgumentException when incorrect themeKey was specified
+     * @throws \LogicException when theme with appropriate themeKey was not found
      */
     public function create($themeKey, $area = \Magento\Framework\View\DesignInterface::DEFAULT_AREA)
     {
@@ -61,7 +65,7 @@ public function create($themeKey, $area = \Magento\Framework\View\DesignInterfac
         } else {
             $themeModel = $this->_loadByPath($themeKey, $area);
         }
-        if (!$themeModel->getId()) {
+        if (!$themeModel->getCode()) {
             throw new \LogicException("Unable to load theme by specified key: '{$themeKey}'");
         }
         $this->_addTheme($themeModel);

lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php

@@ -34,10 +34,10 @@ protected function setUp()
     public function testCreateById($path, $expectedId)
     {
         $theme = $this->getMock(\Magento\Theme\Model\Theme::class, [], [], '', false);
-        $theme->expects($this->exactly(3))->method('getId')->will($this->returnValue($expectedId));
+        $theme->expects($this->exactly(2))->method('getId')->will($this->returnValue($expectedId));
 
         $theme->expects($this->once())->method('getFullPath')->will($this->returnValue(null));
-
+        $theme->expects($this->once())->method('getCode')->willReturn($expectedId);
         $this->themeProviderMock->expects(
             $this->once()
         )->method(
@@ -70,10 +70,10 @@ public function testCreateByPath()
         $path = 'frontend/Magento/luma';
         $themeId = 7;
         $theme = $this->getMock(\Magento\Theme\Model\Theme::class, [], [], '', false);
-        $theme->expects($this->exactly(3))->method('getId')->will($this->returnValue($themeId));
+        $theme->expects($this->exactly(2))->method('getId')->will($this->returnValue($themeId));
 
         $theme->expects($this->once())->method('getFullPath')->will($this->returnValue($path));
-
+        $theme->expects($this->once())->method('getCode')->willReturn('Magento/luma');
         $this->themeProviderMock->expects(
             $this->once()
         )->method(
@@ -95,7 +95,6 @@ public function testCreateDummy()
     {
         $themeId = 0;
         $theme = $this->getMock(\Magento\Theme\Model\Theme::class, [], [], '', false);
-        $theme->expects($this->once())->method('getId')->will($this->returnValue($themeId));
 
         $this->themeProviderMock->expects(
             $this->once()