MAGETWO-63020: [2.1 backport] SCD does not work when multiple languages are specified.

Author: OlgaVasyltsun

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

@@ -7,6 +7,9 @@
 
 use Magento\Framework\View\Design\ThemeInterface;
 
+/**
+ * Virtual theme test
+ */
 class VirtualTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -19,20 +22,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',
         ],
     ];
 
@@ -54,21 +60,21 @@ public function testGetPhysicalTheme()
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         //1. set up fixture
         /** @var $physicalTheme \Magento\Framework\View\Design\ThemeInterface */
-        $physicalTheme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
+        $physicalTheme = $objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class);
         $physicalTheme->setData($this->_themes['physical']);
         $physicalTheme->save();
 
         $this->_themes['virtual']['parent_id'] = $physicalTheme->getId();
 
         /** @var $virtualTheme \Magento\Framework\View\Design\ThemeInterface */
-        $virtualTheme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
+        $virtualTheme = $objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class);
         $virtualTheme->setData($this->_themes['virtual']);
         $virtualTheme->save();
 
         $this->_themes['staging']['parent_id'] = $virtualTheme->getId();
 
         /** @var $stagingTheme \Magento\Framework\View\Design\ThemeInterface */
-        $stagingTheme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
+        $stagingTheme = $objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class);
         $stagingTheme->setData($this->_themes['staging']);
         $stagingTheme->save();
 
@@ -77,7 +83,7 @@ public function testGetPhysicalTheme()
 
         //2. run test
         /** @var $virtualTheme \Magento\Framework\View\Design\ThemeInterface */
-        $virtualTheme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
+        $virtualTheme = $objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class);
         $virtualTheme->load($this->_virtualThemeId);
 
         $this->assertEquals(

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

@@ -7,6 +7,9 @@
 
 use \Magento\Framework\View\Design\Theme\FlyweightFactory;
 
+/**
+ * FlyweightFactory test class
+ */
 class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -21,7 +24,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->themeProviderMock = $this->getMock('Magento\Framework\View\Design\Theme\ThemeProviderInterface');
+        $this->themeProviderMock = $this->getMock(\Magento\Framework\View\Design\Theme\ThemeProviderInterface::class);
         $this->factory = new FlyweightFactory($this->themeProviderMock);
     }
 
@@ -33,10 +36,11 @@ protected function setUp()
      */
     public function testCreateById($path, $expectedId)
     {
-        $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
-        $theme->expects($this->exactly(3))->method('getId')->will($this->returnValue($expectedId));
+        $theme = $this->getMock(\Magento\Theme\Model\Theme::class, [], [], '', false);
+        $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()
@@ -69,10 +73,11 @@ public function testCreateByPath()
     {
         $path = 'frontend/Magento/luma';
         $themeId = 7;
-        $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
-        $theme->expects($this->exactly(3))->method('getId')->will($this->returnValue($themeId));
+        $theme = $this->getMock(\Magento\Theme\Model\Theme::class, [], [], '', false);
+        $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()
@@ -94,8 +99,7 @@ public function testCreateByPath()
     public function testCreateDummy()
     {
         $themeId = 0;
-        $theme = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
-        $theme->expects($this->once())->method('getId')->will($this->returnValue($themeId));
+        $theme = $this->getMock(\Magento\Theme\Model\Theme::class, [], [], '', false);
 
         $this->themeProviderMock->expects(
             $this->once()